[compiler] miscellaneous trivial compiler warning fixes

2006-01-19 Paul Jakma <paul.jakma@sun.com>

        * (general) various miscellaneous compiler warning fixes.
          Remove redundant break statements from switch clauses
          which return.
          return from main, not exit, cause it annoys SOS.
          Remove stray semi-colons which cause empty-statement
          warnings.
	* zebra/main.c: (sighup) remove private declaration of external
	  function.

diff --git a/bgpd/ChangeLog b/bgpd/ChangeLog
index 234ecb5dfe5454fc5482d79b1ca7ec708432ba87..c96bc649c64d9f276c20b18ae72a51ce7f2262b8 100644 (file)
--- a/bgpd/ChangeLog
+++ b/bgpd/ChangeLog
@@ -1,3 +1,12 @@
+2006-01-19 Paul Jakma <paul.jakma@sun.com>
+
+       * (general) various miscellaneous compiler warning fixes.
+          Remove redundant break statements from switch clauses
+          which return.
+          return from main, not exit, cause it annoys SOS.
+          Remove stray semi-colons which cause empty-statement
+          warnings.
+
 2006-01-17 Paul Jakma <paul.jakma@sun.com>
 
        * bgp_nexthop.c: (zlookup_read*) convert to new Zserv format.

diff --git a/bgpd/bgp_aspath.c b/bgpd/bgp_aspath.c
index e9a6d6a2894bb6499598634a0c31d703e024fd8d..2cc5ed3592c05cd18cc1938b0e8ca4f8387c62f3 100644 (file)
--- a/bgpd/bgp_aspath.c
+++ b/bgpd/bgp_aspath.c
@@ -1309,37 +1309,30 @@ aspath_gettoken (const char *buf, enum as_token *token, u_short *asno)
     {
     case '\0':
       return NULL;
-      break;
     case '{':
       *token = as_token_set_start;
       p++;
       return p;
-      break;
     case '}':
       *token = as_token_set_end;
       p++;
       return p;
-      break;
     case '(':
       *token = as_token_confed_seq_start;
       p++;
       return p;
-      break;
     case ')':
       *token = as_token_confed_seq_end;
       p++;
       return p;
-      break;
     case '[':
       *token = as_token_confed_set_start;
       p++;
       return p;
-      break;
     case ']':
       *token = as_token_confed_set_end;
       p++;
       return p;
-      break;
     }
 
   /* Check actual AS value. */
@@ -1423,7 +1416,6 @@ aspath_str2aspath (const char *str)
        default:
          aspath_free (aspath);
          return NULL;
-         break;
        }
     }
 

diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c
index 4b94b11e751944f729ce64db679481550f9928e0..3b27517d7b48d7ca789ffa33699b413cb472eece 100644 (file)
--- a/bgpd/bgp_attr.c
+++ b/bgpd/bgp_attr.c
@@ -983,7 +983,6 @@ bgp_mp_reach_parse (struct peer *peer, bgp_size_t length, struct attr *attr,
       zlog_info ("Wrong multiprotocol next hop length: %d", 
                 attr->mp_nexthop_len);
       return -1;
-      break;
     }
 
   snpa_num = stream_getc (s);

diff --git a/bgpd/bgp_clist.c b/bgpd/bgp_clist.c
index e5b4344edff2651db554f0b4a37014e72990e5b3..f75fc55b379ebed0cf4f6729462a97aed37b8734 100644 (file)
--- a/bgpd/bgp_clist.c
+++ b/bgpd/bgp_clist.c
@@ -41,7 +41,6 @@ community_list_master_lookup (struct community_list_handler *ch, int master)
       {
       case COMMUNITY_LIST_MASTER:
        return &ch->community_list;
-       break;
       case EXTCOMMUNITY_LIST_MASTER:
        return &ch->extcommunity_list;
       }

diff --git a/bgpd/bgp_community.c b/bgpd/bgp_community.c
index 35e644b1dd31498582e25a90494c0a3df64233af..3033db14e64ba26e29fb90c3558dbbf4fe7e1684 100644 (file)
--- a/bgpd/bgp_community.c
+++ b/bgpd/bgp_community.c
@@ -594,7 +594,6 @@ community_str2com (const char *str)
        default:
          if (com)
            community_free (com);
-         return NULL;
          break;
        }
     }

diff --git a/bgpd/bgp_ecommunity.c b/bgpd/bgp_ecommunity.c
index bcd37ea6ec7bcf2e5c33efbce757bc7f9c1a4bb1..64f4438f88787bae8a84712873652d99468c2e63 100644 (file)
--- a/bgpd/bgp_ecommunity.c
+++ b/bgpd/bgp_ecommunity.c
@@ -500,7 +500,6 @@ ecommunity_str2com (const char *str, int type, int keyword_included)
          if (ecom)
            ecommunity_free (ecom);
          return NULL;
-         break;
        }
     }
   return ecom;

diff --git a/bgpd/bgp_filter.c b/bgpd/bgp_filter.c
index de572c0a813402ec1eb5a50e008fe3b6a5e9fc17..ab7f07037fce61af852f9c6f5c4a35632337736f 100644 (file)
--- a/bgpd/bgp_filter.c
+++ b/bgpd/bgp_filter.c
@@ -303,13 +303,10 @@ filter_type_str (enum as_filter_type type)
     {
     case AS_FILTER_PERMIT:
       return "permit";
-      break;
     case AS_FILTER_DENY:
       return "deny";
-      break;
     default:
       return "";
-      break;
     }
 }
 

diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c
index f9f0373d23800486ecc04de487a7e7bec5386ed5..0baae3bfdb0be224488120b751b9f5c1cda312e7 100644 (file)
--- a/bgpd/bgp_main.c
+++ b/bgpd/bgp_main.c
@@ -313,5 +313,5 @@ main (int argc, char **argv)
     thread_call (&thread);
 
   /* Not reached. */
-  exit (0);
+  return (0);
 }

diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c
index fa218e2902a17706a88b28e67a1fada7bf872683..07c3cbb19e38e78216dea0c822aa4993646c4cc0 100644 (file)
--- a/bgpd/bgp_packet.c
+++ b/bgpd/bgp_packet.c
@@ -678,7 +678,6 @@ bgp_write (struct thread *thread)
          peer->status = Idle;
          bgp_timer_set (peer);
          return 0;
-         break;
        case BGP_MSG_KEEPALIVE:
          peer->keepalive_out++;
          break;

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index f2621c1f1c26671a46c5239fda88cdcafbad384e..e0d2a317fd9fcd061c5fef51b944d71601fb1e6a 100644 (file)
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -8100,7 +8100,7 @@ ALIAS (show_bgp_community_list,
        "Address family\n"
        "Display routes matching the community-list\n"
        "community-list number\n"
-       "community-list name\n");
+       "community-list name\n")
 
 /* old command */
 DEFUN (show_ipv6_bgp_community_list,

diff --git a/bgpd/bgp_routemap.c b/bgpd/bgp_routemap.c
index bc9b6f788d3949881959b0a5c8423ea603b02deb..15ba9452d27b49dc4f3ad52fd5fa30c4f0d6e879 100644 (file)
--- a/bgpd/bgp_routemap.c
+++ b/bgpd/bgp_routemap.c
@@ -2046,11 +2046,9 @@ bgp_route_match_add (struct vty *vty, struct route_map_index *index,
        case RMAP_RULE_MISSING:
          vty_out (vty, "%% Can't find rule.%s", VTY_NEWLINE);
          return CMD_WARNING;
-         break;
        case RMAP_COMPILE_ERROR:
          vty_out (vty, "%% Argument is malformed.%s", VTY_NEWLINE);
          return CMD_WARNING;
-         break;
        }
     }
   return CMD_SUCCESS;
@@ -2071,11 +2069,9 @@ bgp_route_match_delete (struct vty *vty, struct route_map_index *index,
        case RMAP_RULE_MISSING:
          vty_out (vty, "%% Can't find rule.%s", VTY_NEWLINE);
          return CMD_WARNING;
-         break;
        case RMAP_COMPILE_ERROR:
          vty_out (vty, "%% Argument is malformed.%s", VTY_NEWLINE);
          return CMD_WARNING;
-         break;
        }
     }
   return CMD_SUCCESS;
@@ -2096,11 +2092,9 @@ bgp_route_set_add (struct vty *vty, struct route_map_index *index,
        case RMAP_RULE_MISSING:
          vty_out (vty, "%% Can't find rule.%s", VTY_NEWLINE);
          return CMD_WARNING;
-         break;
        case RMAP_COMPILE_ERROR:
          vty_out (vty, "%% Argument is malformed.%s", VTY_NEWLINE);
          return CMD_WARNING;
-         break;
        }
     }
   return CMD_SUCCESS;
@@ -2121,11 +2115,9 @@ bgp_route_set_delete (struct vty *vty, struct route_map_index *index,
        case RMAP_RULE_MISSING:
          vty_out (vty, "%% Can't find rule.%s", VTY_NEWLINE);
          return CMD_WARNING;
-         break;
        case RMAP_COMPILE_ERROR:
          vty_out (vty, "%% Argument is malformed.%s", VTY_NEWLINE);
          return CMD_WARNING;
-         break;
        }
     }
   return CMD_SUCCESS;

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index c8d5b2ac8b1f5fd8ff2082080aab50b39e24f8e9..6ee48236e644ba286ce515db79b6554fb501a5a8 100644 (file)
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -324,17 +324,14 @@ DEFUN (router_bgp,
       vty_out (vty, "Please specify 'bgp multiple-instance' first%s", 
               VTY_NEWLINE);
       return CMD_WARNING;
-      break;
     case BGP_ERR_AS_MISMATCH:
       vty_out (vty, "BGP is already running; AS is %d%s", as, VTY_NEWLINE);
       return CMD_WARNING;
-      break;
     case BGP_ERR_INSTANCE_MISMATCH:
       vty_out (vty, "BGP view name and AS number mismatch%s", VTY_NEWLINE);
       vty_out (vty, "BGP instance is already running; AS is %d%s",
               as, VTY_NEWLINE);
       return CMD_WARNING;
-      break;
     }
 
   vty->node = BGP_NODE;
@@ -1276,11 +1273,9 @@ peer_remote_as_vty (struct vty *vty, const char *peer_str,
     case BGP_ERR_PEER_GROUP_MEMBER:
       vty_out (vty, "%% Peer-group AS %d. Cannot configure remote-as for member%s", as, VTY_NEWLINE);
       return CMD_WARNING;
-      break;
     case BGP_ERR_PEER_GROUP_PEER_TYPE_DIFFERENT:
       vty_out (vty, "%% The AS# can not be changed from %d to %s, peer-group members must be all internal or all external%s", as, as_str, VTY_NEWLINE);
       return CMD_WARNING;
-      break;
     }
   return bgp_vty_return (vty, ret);
 }
@@ -2671,7 +2666,7 @@ ALIAS (neighbor_disable_connected_check,
        NEIGHBOR_CMD2 "enforce-multihop",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
-       "Enforce EBGP neighbors perform multihop\n");
+       "Enforce EBGP neighbors perform multihop\n")
 
 /* Enforce multihop.  */
 ALIAS (no_neighbor_disable_connected_check,
@@ -2680,7 +2675,7 @@ ALIAS (no_neighbor_disable_connected_check,
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
-       "Enforce EBGP neighbors perform multihop\n");
+       "Enforce EBGP neighbors perform multihop\n")
 \f
 DEFUN (neighbor_description,
        neighbor_description_cmd,
@@ -3804,7 +3799,7 @@ ALIAS (no_neighbor_maximum_prefix,
        NEIGHBOR_ADDR_STR2
        "Maximum number of prefix accept from this peer\n"
        "maximum no. of prefix limit\n"
-       "Only give warning message when limit is exceeded\n");
+       "Only give warning message when limit is exceeded\n")
 
 ALIAS (no_neighbor_maximum_prefix,
        no_neighbor_maximum_prefix_threshold_warning_cmd,
@@ -3815,7 +3810,7 @@ ALIAS (no_neighbor_maximum_prefix,
        "Maximum number of prefix accept from this peer\n"
        "maximum no. of prefix limit\n"
        "Threshold value (%) at which to generate a warning msg\n"
-       "Only give warning message when limit is exceeded\n");
+       "Only give warning message when limit is exceeded\n")
 
 ALIAS (no_neighbor_maximum_prefix,
        no_neighbor_maximum_prefix_restart_cmd,
@@ -9646,13 +9641,10 @@ community_direct_str (int direct)
     {
     case COMMUNITY_DENY:
       return "deny";
-      break;
     case COMMUNITY_PERMIT:
       return "permit";
-      break;
     default:
       return "unknown";
-      break;
     }
 }
 

diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index ea365dec5c433788d1a0cc464b4529cc0fd4a12c..1f1b4fd2bcfb6501c880bdff4bdaa3c82af2796c 100644 (file)
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -85,7 +85,6 @@ bgp_option_set (int flag)
       break;
     default:
       return BGP_ERR_INVALID_FLAG;
-      break;
     }
   return 0;
 }
@@ -105,7 +104,6 @@ bgp_option_unset (int flag)
       break;
     default:
       return BGP_ERR_INVALID_FLAG;
-      break;
     }
   return 0;
 }

diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index e5f833782af76d57ddc96ca130d6dc3a03bee101..a5a1753aa2bd8594b3032c5e87a89ea6fc017022 100644 (file)
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -1,3 +1,12 @@
+2006-01-19 Paul Jakma <paul.jakma@sun.com>
+
+        * (general) various miscellaneous compiler warning fixes.
+           Remove redundant break statements from switch clauses
+           which return.
+           return from main, not exit, cause it annoys SOS.
+           Remove stray semi-colons which cause empty-statement
+           warnings.
+
 2006-01-18 Juergen Kammer <j.kammer@eurodata.de>
 
        * ospf_lsa.c: (ospf_router_lsa_new) dont take reference to the

diff --git a/ospfd/ospf_dump.c b/ospfd/ospf_dump.c
index 859e3bc972432649e840fd7ca6c93e84163025ba..95d24b1a91065a66b2158996d2f102aa169ccbfb 100644 (file)
--- a/ospfd/ospf_dump.c
+++ b/ospfd/ospf_dump.c
@@ -181,7 +181,6 @@ ospf_area_desc_string (struct ospf_area *area)
       break;
     default:
       return ospf_area_name_string (area);
-      break;
     }
 
   return buf;

diff --git a/ospfd/ospf_lsa.c b/ospfd/ospf_lsa.c
index 89e4d53588882f623ed87237b0387988205bb144..8ef4da66b1a23a93c99e16960de8e71cfe102b39 100644 (file)
--- a/ospfd/ospf_lsa.c
+++ b/ospfd/ospf_lsa.c
@@ -3219,13 +3219,11 @@ ospf_lsa_lookup (struct ospf_area *area, u_int32_t type,
     case OSPF_OPAQUE_AREA_LSA:
 #endif /* HAVE_OPAQUE_LSA */
       return ospf_lsdb_lookup_by_id (area->lsdb, type, id, adv_router);
-      break;
     case OSPF_AS_EXTERNAL_LSA:
 #ifdef HAVE_OPAQUE_LSA
     case OSPF_OPAQUE_AS_LSA:
 #endif /* HAVE_OPAQUE_LSA */
       return ospf_lsdb_lookup_by_id (ospf->lsdb, type, id, adv_router);
-      break;
     default:
       break;
     }
@@ -3244,7 +3242,6 @@ ospf_lsa_lookup_by_id (struct ospf_area *area, u_int32_t type,
     {
     case OSPF_ROUTER_LSA:
       return ospf_lsdb_lookup_by_id (area->lsdb, type, id, id);
-      break;
     case OSPF_NETWORK_LSA:
       for (rn = route_top (NETWORK_LSDB (area)); rn; rn = route_next (rn))
        if ((lsa = rn->info))
@@ -3259,7 +3256,6 @@ ospf_lsa_lookup_by_id (struct ospf_area *area, u_int32_t type,
       /* Currently not used. */
       assert (1);
       return ospf_lsdb_lookup_by_id (area->lsdb, type, id, id);
-      break;
     case OSPF_AS_EXTERNAL_LSA:
     case OSPF_AS_NSSA_LSA:
 #ifdef HAVE_OPAQUE_LSA

diff --git a/ospfd/ospf_main.c b/ospfd/ospf_main.c
index 3225d7d77313d524ad14f82a88bd51c171e17b57..c105f1926890c9b2f769fc4d27c6fd504c87d607 100644 (file)
--- a/ospfd/ospf_main.c
+++ b/ospfd/ospf_main.c
@@ -321,6 +321,6 @@ main (int argc, char **argv)
     thread_call (&thread);
 
   /* Not reached. */
-  exit (0);
+  return (0);
 }
 

diff --git a/ospfd/ospf_routemap.c b/ospfd/ospf_routemap.c
index 6c89b22afbd6e3f3aa904fba38c3d29eaf5f5912..adf8158395c8d848128176465dad04be2d74a41d 100644 (file)
--- a/ospfd/ospf_routemap.c
+++ b/ospfd/ospf_routemap.c
@@ -110,11 +110,9 @@ ospf_route_match_delete (struct vty *vty, struct route_map_index *index,
         case RMAP_RULE_MISSING:
           vty_out (vty, "%% Can't find rule.%s", VTY_NEWLINE);
           return CMD_WARNING;
-          break;
         case RMAP_COMPILE_ERROR:
           vty_out (vty, "%% Argument is malformed.%s", VTY_NEWLINE);
           return CMD_WARNING;
-          break;
         }
     }
 
@@ -135,11 +133,9 @@ ospf_route_match_add (struct vty *vty, struct route_map_index *index,
         case RMAP_RULE_MISSING:
           vty_out (vty, "%% Can't find rule.%s", VTY_NEWLINE);
           return CMD_WARNING;
-          break;
         case RMAP_COMPILE_ERROR:
           vty_out (vty, "%% Argument is malformed.%s", VTY_NEWLINE);
           return CMD_WARNING;
-          break;
         }
     }
 
@@ -160,11 +156,9 @@ ospf_route_set_add (struct vty *vty, struct route_map_index *index,
         case RMAP_RULE_MISSING:
           vty_out (vty, "%% Can't find rule.%s", VTY_NEWLINE);
           return CMD_WARNING;
-          break;
         case RMAP_COMPILE_ERROR:
           vty_out (vty, "%% Argument is malformed.%s", VTY_NEWLINE);
           return CMD_WARNING;
-          break;
         }
     }
 
@@ -186,11 +180,9 @@ ospf_route_set_delete (struct vty *vty, struct route_map_index *index,
         case RMAP_RULE_MISSING:
           vty_out (vty, "%% Can't find rule.%s", VTY_NEWLINE);
           return CMD_WARNING;
-          break;
         case RMAP_COMPILE_ERROR:
           vty_out (vty, "%% Argument is malformed.%s", VTY_NEWLINE);
           return CMD_WARNING;
-          break;
         }
     }
 

diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index 32dfdea055515c228c4ecbe20335c82b2605c219..0b74bdf195c77f444c44a9b657d7e03e70739142 100644 (file)
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -3870,7 +3870,7 @@ show_ip_ospf_database_summary (struct vty *vty, struct ospf *ospf, int self)
 #ifdef HAVE_OPAQUE_LSA
           case OSPF_OPAQUE_AS_LSA:
 #endif /* HAVE_OPAQUE_LSA */
-            break;;
+            break;
           default:
             continue;
         }

diff --git a/ripd/ChangeLog b/ripd/ChangeLog
index 2b79a61d1443cff874d358979f7b326b5eddb20d..c979a11df4b58f16cdd50ba065e1e75c80b00c44 100644 (file)
--- a/ripd/ChangeLog
+++ b/ripd/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-19 Paul Jakma <paul.jakma@sun.com>
+
+        * ripd.c: (main) return from main, not exit, cause it annoys SOS.
+
 2006-01-17 Paul Jakma <paul.jakma@sun.com>
 
        * ripd.c: (rip_auth_md5) remove pdigest, not needed.

diff --git a/ripd/rip_main.c b/ripd/rip_main.c
index 88e636789b3eb25340ae21befd8d5047e44e65a1..c9d564b7cc4426053345ea96ea3c0c3a8bc0206b 100644 (file)
--- a/ripd/rip_main.c
+++ b/ripd/rip_main.c
@@ -298,5 +298,5 @@ main (int argc, char **argv)
     thread_call (&thread);
 
   /* Not reached. */
-  exit (0);
+  return (0);
 }

diff --git a/ripngd/ChangeLog b/ripngd/ChangeLog
index 46d4f9f73df5363b7e7c37f8c40fd9409d103de8..556ca8b4442305ae9fe5106d5fd10271d1729c10 100644 (file)
--- a/ripngd/ChangeLog
+++ b/ripngd/ChangeLog
@@ -1,3 +1,12 @@
+2006-01-19 Paul Jakma <paul.jakma@sun.com>
+
+        * (general) various miscellaneous compiler warning fixes.
+          Remove redundant break statements from switch clauses 
+          which return. 
+          return from main, not exit, cause it annoys SOS. 
+          Remove stray semi-colons which cause empty-statement 
+          warnings.
+
 2005-10-01 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
 
        * ripng_zebra.c: (ripng_redistribute_write) Remove local hard-coded

diff --git a/ripngd/ripng_main.c b/ripngd/ripng_main.c
index 5885f47c8403bdd773f33a14dd4689385b3558be..e6276c1be709c8c69353d7c2c9daf627f98c94cc 100644 (file)
--- a/ripngd/ripng_main.c
+++ b/ripngd/ripng_main.c
@@ -299,5 +299,5 @@ main (int argc, char **argv)
     thread_call (&thread);
 
   /* Not reached. */
-  exit (0);
+  return 0;
 }

diff --git a/ripngd/ripng_routemap.c b/ripngd/ripng_routemap.c
index 1c17e6c3c3cd6e4449ebd91a0862b1a6ca28058f..abaa61e1906c77c62f58b2a85417e1b8cdf15734 100644 (file)
--- a/ripngd/ripng_routemap.c
+++ b/ripngd/ripng_routemap.c
@@ -57,11 +57,9 @@ ripng_route_match_add (struct vty *vty, struct route_map_index *index,
        case RMAP_RULE_MISSING:
          vty_out (vty, "Can't find rule.%s", VTY_NEWLINE);
          return CMD_WARNING;
-         break;
        case RMAP_COMPILE_ERROR:
          vty_out (vty, "Argument is malformed.%s", VTY_NEWLINE);
          return CMD_WARNING;
-         break;
        }
     }
   return CMD_SUCCESS;
@@ -81,11 +79,9 @@ ripng_route_match_delete (struct vty *vty, struct route_map_index *index,
        case RMAP_RULE_MISSING:
          vty_out (vty, "Can't find rule.%s", VTY_NEWLINE);
          return CMD_WARNING;
-         break;
        case RMAP_COMPILE_ERROR:
          vty_out (vty, "Argument is malformed.%s", VTY_NEWLINE);
          return CMD_WARNING;
-         break;
        }
     }
   return CMD_SUCCESS;
@@ -105,11 +101,9 @@ ripng_route_set_add (struct vty *vty, struct route_map_index *index,
        case RMAP_RULE_MISSING:
          vty_out (vty, "Can't find rule.%s", VTY_NEWLINE);
          return CMD_WARNING;
-         break;
        case RMAP_COMPILE_ERROR:
          vty_out (vty, "Argument is malformed.%s", VTY_NEWLINE);
          return CMD_WARNING;
-         break;
        }
     }
   return CMD_SUCCESS;
@@ -129,11 +123,9 @@ ripng_route_set_delete (struct vty *vty, struct route_map_index *index,
        case RMAP_RULE_MISSING:
          vty_out (vty, "Can't find rule.%s", VTY_NEWLINE);
          return CMD_WARNING;
-         break;
        case RMAP_COMPILE_ERROR:
          vty_out (vty, "Argument is malformed.%s", VTY_NEWLINE);
          return CMD_WARNING;
-         break;
        }
     }
   return CMD_SUCCESS;

diff --git a/zebra/ChangeLog b/zebra/ChangeLog
index b33180f7d758cfd84b7fab8b74dada8037a7c92e..b40f78fb9cbcc5cfcb10d04dc1da445ef3a66115 100644 (file)
--- a/zebra/ChangeLog
+++ b/zebra/ChangeLog
@@ -1,3 +1,14 @@
+2006-01-19 Paul Jakma <paul.jakma@sun.com>
+
+        * (general) various miscellaneous compiler warning fixes.
+          Remove redundant break statements from switch clauses
+          which return.
+          Remove stray semi-colons which cause empty-statement
+          warnings.
+       * main.c: (sighup) remove private declaration of external
+          function.
+          (main) return from main, not exit, cause it annoys SOS.
+
 2006-01-18 Gunnar Stigen <gunnar.stigen@axxessit.no>
 
        * zebra_rib.c: Take interface metric into account.

diff --git a/zebra/main.c b/zebra/main.c
index 67108c4ea24fef26ab90900d7c5573a0bc76c390..dbe1b537df8c2aaeb3376867d53ae08551dbbb24 100644 (file)
--- a/zebra/main.c
+++ b/zebra/main.c
@@ -163,9 +163,6 @@ sighup (void)
 static void
 sigint (void)
 {
-  /* Decrared in rib.c */
-  void rib_close ();
-
   zlog_notice ("Terminating on signal");
 
   if (!retain_mode)
@@ -378,5 +375,5 @@ main (int argc, char **argv)
     thread_call (&thread);
 
   /* Not reached... */
-  exit (0);
+  return 0;
 }

diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index 5d9cb2f68cb842231c70c859d789bfb502e91e89..a591776a5b3b9aa243d169099d44da45c7c17cb6 100644 (file)
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -1497,7 +1497,7 @@ static_ipv4_nexthop_same (struct nexthop *nexthop, struct static_ipv4 *si)
   if (nexthop->type == NEXTHOP_TYPE_BLACKHOLE
       && si->type == STATIC_IPV4_BLACKHOLE)
     return 1;
-  return 0;;
+  return 0;
 }
 
 /* Uninstall static route from RIB. */
@@ -2045,7 +2045,7 @@ static_ipv6_nexthop_same (struct nexthop *nexthop, struct static_ipv6 *si)
       && IPV6_ADDR_SAME (&nexthop->gate.ipv6, &si->ipv6)
       && strcmp (nexthop->ifname, si->ifname) == 0)
     return 1;
-  return 0;;
+  return 0;
 }
 
 static void

diff --git a/zebra/zserv.c b/zebra/zserv.c
index f8bfcfaa0e46ff0256c2a1b137c498c42ac0aef8..aa88ab5d668972bc9271a96a3e760bb8cc028caf 100644 (file)
--- a/zebra/zserv.c
+++ b/zebra/zserv.c
@@ -138,7 +138,6 @@ zebra_server_send_message(struct zserv *client)
       client->t_suicide = thread_add_event(zebrad.master, zserv_delayed_close,
                                           client, 0);
       return -1;
-      break;
     case BUFFER_EMPTY:
       THREAD_OFF(client->t_write);
       break;