[warnings] Fix various SOS warnings
2008-08-15 Paul Jakma <paul.jakma@sun.com>
* */*: Fix various problems flagged by Sun Studio compiler.
- '<qualifier> <storage>' 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.
diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c
index 6f13974..d116c30 100644
--- a/bgpd/bgp_attr.c
+++ b/bgpd/bgp_attr.c
@@ -2298,8 +2298,6 @@
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 b639db0..4a642e3 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -9176,7 +9176,7 @@
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 78ad3f0..2d4a863 100644
--- a/bgpd/bgp_routemap.c
+++ b/bgpd/bgp_routemap.c
@@ -245,9 +245,8 @@
{
if (sockunion_same (su, &peer->su))
return RMAP_MATCH;
-
- return RMAP_NOMATCH;
}
+ return RMAP_NOMATCH;
}
}
return RMAP_NOMATCH;
@@ -2574,7 +2573,7 @@
"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 @@
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,