From d10bda270e6a5bfdd634f3f442724f20256e027e Mon Sep 17 00:00:00 2001 From: Donatas Abraitis Date: Wed, 25 Aug 2021 10:47:52 +0300 Subject: [PATCH] *: Drop `break` after using frr_help_exit() in switch/case Signed-off-by: Donatas Abraitis --- babeld/babel_main.c | 3 +-- bfdd/bfdd.c | 1 - bgpd/bgp_main.c | 1 - eigrpd/eigrp_main.c | 1 - isisd/isis_main.c | 1 - ldpd/ldpd.c | 1 - lib/libfrr.c | 1 - nhrpd/nhrp_main.c | 1 - ospf6d/ospf6_main.c | 1 - ospfd/ospf_main.c | 1 - pathd/path_main.c | 1 - pbrd/pbr_main.c | 1 - pimd/pim_main.c | 1 - ripd/rip_main.c | 1 - ripngd/ripng_main.c | 1 - sharpd/sharp_main.c | 1 - staticd/static_main.c | 1 - vrrpd/vrrp_main.c | 1 - zebra/main.c | 1 - 19 files changed, 1 insertion(+), 20 deletions(-) diff --git a/babeld/babel_main.c b/babeld/babel_main.c index df1998c4fc..61a800eef4 100644 --- a/babeld/babel_main.c +++ b/babeld/babel_main.c @@ -183,8 +183,7 @@ main(int argc, char **argv) case 0: break; default: - frr_help_exit (1); - break; + frr_help_exit(1); } } diff --git a/bfdd/bfdd.c b/bfdd/bfdd.c index 7a2c3cc3aa..188e47905c 100644 --- a/bfdd/bfdd.c +++ b/bfdd/bfdd.c @@ -364,7 +364,6 @@ int main(int argc, char *argv[]) default: frr_help_exit(1); - break; } } diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c index 38cc781338..08776d200f 100644 --- a/bgpd/bgp_main.c +++ b/bgpd/bgp_main.c @@ -490,7 +490,6 @@ int main(int argc, char **argv) break; default: frr_help_exit(1); - break; } } if (skip_runas) diff --git a/eigrpd/eigrp_main.c b/eigrpd/eigrp_main.c index b775c841f0..9acb517d8c 100644 --- a/eigrpd/eigrp_main.c +++ b/eigrpd/eigrp_main.c @@ -177,7 +177,6 @@ int main(int argc, char **argv, char **envp) break; default: frr_help_exit(1); - break; } } diff --git a/isisd/isis_main.c b/isisd/isis_main.c index acfa1a29d4..6deeebda95 100644 --- a/isisd/isis_main.c +++ b/isisd/isis_main.c @@ -231,7 +231,6 @@ int main(int argc, char **argv, char **envp) break; default: frr_help_exit(1); - break; } } diff --git a/ldpd/ldpd.c b/ldpd/ldpd.c index 800b954d65..000d1a3301 100644 --- a/ldpd/ldpd.c +++ b/ldpd/ldpd.c @@ -304,7 +304,6 @@ main(int argc, char *argv[]) break; default: frr_help_exit(1); - break; } } diff --git a/lib/libfrr.c b/lib/libfrr.c index 97dab74d9b..d03437328b 100644 --- a/lib/libfrr.c +++ b/lib/libfrr.c @@ -418,7 +418,6 @@ static int frr_opt(int opt) switch (opt) { case 'h': frr_help_exit(0); - break; case 'v': print_version(di->progname); exit(0); diff --git a/nhrpd/nhrp_main.c b/nhrpd/nhrp_main.c index 54b7850207..73684046a8 100644 --- a/nhrpd/nhrp_main.c +++ b/nhrpd/nhrp_main.c @@ -71,7 +71,6 @@ static void parse_arguments(int argc, char **argv) break; default: frr_help_exit(1); - break; } } } diff --git a/ospf6d/ospf6_main.c b/ospf6d/ospf6_main.c index e233611690..54cf142ba8 100644 --- a/ospf6d/ospf6_main.c +++ b/ospf6d/ospf6_main.c @@ -208,7 +208,6 @@ int main(int argc, char *argv[], char *envp[]) break; default: frr_help_exit(1); - break; } } diff --git a/ospfd/ospf_main.c b/ospfd/ospf_main.c index 73d596b030..257429ebe8 100644 --- a/ospfd/ospf_main.c +++ b/ospfd/ospf_main.c @@ -185,7 +185,6 @@ int main(int argc, char **argv) #endif /* SUPPORT_OSPF_API */ default: frr_help_exit(1); - break; } } diff --git a/pathd/path_main.c b/pathd/path_main.c index 8d88475206..7b702cca31 100644 --- a/pathd/path_main.c +++ b/pathd/path_main.c @@ -138,7 +138,6 @@ int main(int argc, char **argv, char **envp) break; default: frr_help_exit(1); - break; } } diff --git a/pbrd/pbr_main.c b/pbrd/pbr_main.c index 7861559034..c7cbbb4462 100644 --- a/pbrd/pbr_main.c +++ b/pbrd/pbr_main.c @@ -153,7 +153,6 @@ int main(int argc, char **argv, char **envp) break; default: frr_help_exit(1); - break; } } diff --git a/pimd/pim_main.c b/pimd/pim_main.c index 96132c4425..780595ca11 100644 --- a/pimd/pim_main.c +++ b/pimd/pim_main.c @@ -115,7 +115,6 @@ int main(int argc, char **argv, char **envp) break; default: frr_help_exit(1); - break; } } diff --git a/ripd/rip_main.c b/ripd/rip_main.c index 2e5eec9844..7b9146b13a 100644 --- a/ripd/rip_main.c +++ b/ripd/rip_main.c @@ -161,7 +161,6 @@ int main(int argc, char **argv) break; default: frr_help_exit(1); - break; } } diff --git a/ripngd/ripng_main.c b/ripngd/ripng_main.c index a5d837aa55..34cd4ab0a7 100644 --- a/ripngd/ripng_main.c +++ b/ripngd/ripng_main.c @@ -163,7 +163,6 @@ int main(int argc, char **argv) break; default: frr_help_exit(1); - break; } } diff --git a/sharpd/sharp_main.c b/sharpd/sharp_main.c index 75cf145385..a646c313e4 100644 --- a/sharpd/sharp_main.c +++ b/sharpd/sharp_main.c @@ -171,7 +171,6 @@ int main(int argc, char **argv, char **envp) break; default: frr_help_exit(1); - break; } } diff --git a/staticd/static_main.c b/staticd/static_main.c index 1561b91efb..f7a15462a0 100644 --- a/staticd/static_main.c +++ b/staticd/static_main.c @@ -149,7 +149,6 @@ int main(int argc, char **argv, char **envp) break; default: frr_help_exit(1); - break; } } diff --git a/vrrpd/vrrp_main.c b/vrrpd/vrrp_main.c index a5ad37aa0c..990fa9e382 100644 --- a/vrrpd/vrrp_main.c +++ b/vrrpd/vrrp_main.c @@ -148,7 +148,6 @@ int main(int argc, char **argv, char **envp) break; default: frr_help_exit(1); - break; } } diff --git a/zebra/main.c b/zebra/main.c index bded50149f..6162d36b43 100644 --- a/zebra/main.c +++ b/zebra/main.c @@ -384,7 +384,6 @@ int main(int argc, char **argv) #endif /* HAVE_NETLINK */ default: frr_help_exit(1); - break; } } -- 2.39.5