From 30a2231a4881f53deca61ef7a62b225a43dab4c5 Mon Sep 17 00:00:00 2001 From: Paul Jakma Date: Fri, 15 Aug 2008 14:05:22 +0100 Subject: [warnings] Fix various SOS warnings 2008-08-15 Paul Jakma * */*: Fix various problems flagged by Sun Studio compiler. - ' ' obsolescent in declarations - empty statements (';' after ALIAS definitions) - implicit declarations (e.g printstack in lib/log.c) - "\%" in printf string instead of "%%" - loops that return on the first iteration (legitimately, but compiler can't really know), e.g. bgp_routemap.c - internal declarations which mask prototypes. --- bgpd/bgp_attr.c | 2 -- bgpd/bgp_route.c | 2 +- bgpd/bgp_routemap.c | 7 +++---- 3 files changed, 4 insertions(+), 7 deletions(-) (limited to 'bgpd') diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c index 6f139742..d116c30f 100644 --- a/bgpd/bgp_attr.c +++ b/bgpd/bgp_attr.c @@ -2298,8 +2298,6 @@ bgp_packet_withdraw (struct peer *peer, struct stream *s, struct prefix *p, void bgp_attr_init (void) { - void attrhash_init (); - aspath_init (); attrhash_init (); community_init (); diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index b639db05..4a642e34 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -9176,7 +9176,7 @@ bgp_table_stats (struct vty *vty, struct bgp *bgp, afi_t afi, safi_t safi) vty_out (vty, "%12llu%s", ts.counts[i], VTY_NEWLINE); if (ts.counts[BGP_STATS_MAXBITLEN] < 9) break; - vty_out (vty, "%30s: ", "\% announced "); + vty_out (vty, "%30s: ", "%% announced "); vty_out (vty, "%12.2f%s", 100 * (float)ts.counts[BGP_STATS_SPACE] / (float)((uint64_t)1UL << ts.counts[BGP_STATS_MAXBITLEN]), diff --git a/bgpd/bgp_routemap.c b/bgpd/bgp_routemap.c index 78ad3f08..2d4a8630 100644 --- a/bgpd/bgp_routemap.c +++ b/bgpd/bgp_routemap.c @@ -245,9 +245,8 @@ route_match_peer (void *rule, struct prefix *prefix, route_map_object_t type, { if (sockunion_same (su, &peer->su)) return RMAP_MATCH; - - return RMAP_NOMATCH; } + return RMAP_NOMATCH; } } return RMAP_NOMATCH; @@ -2574,7 +2573,7 @@ ALIAS (no_match_ip_route_source, "Match advertising source address of route\n" "IP access-list number\n" "IP access-list number (expanded range)\n" - "IP standard access-list name\n"); + "IP standard access-list name\n") DEFUN (match_ip_address_prefix_list, match_ip_address_prefix_list_cmd, @@ -2685,7 +2684,7 @@ ALIAS (no_match_ip_route_source_prefix_list, IP_STR "Match advertising source address of route\n" "Match entries of prefix-lists\n" - "IP prefix-list name\n"); + "IP prefix-list name\n") DEFUN (match_metric, match_metric_cmd, -- cgit v1.2.1