From 21ecdb1f34b8ef283e32f4f4d1b22e470c9d388f Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Tue, 14 Sep 2021 13:27:19 -0400 Subject: [PATCH 1/2] lib: Fix usage of default case default has snuck into our code base for switches over enumerated types. Remove. Signed-off-by: Donald Sharp --- lib/nexthop.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/lib/nexthop.c b/lib/nexthop.c index 98409c76c5..757138b5b4 100644 --- a/lib/nexthop.c +++ b/lib/nexthop.c @@ -634,9 +634,6 @@ const char *nexthop2str(const struct nexthop *nexthop, char *str, int size) case NEXTHOP_TYPE_BLACKHOLE: snprintf(str, size, "blackhole"); break; - default: - snprintf(str, size, "unknown"); - break; } return str; @@ -993,12 +990,10 @@ static ssize_t printfrr_nh(struct fbuf *buf, struct printfrr_eargs *ea, case BLACKHOLE_NULL: ret += bputs(buf, " (blackhole)"); break; - default: + case BLACKHOLE_UNSPEC: break; } break; - default: - break; } if (do_ifi && nexthop->ifindex) ret += bprintfrr(buf, ", %s%s", v_viaif, @@ -1029,9 +1024,6 @@ static ssize_t printfrr_nh(struct fbuf *buf, struct printfrr_eargs *ea, case NEXTHOP_TYPE_BLACKHOLE: ret += bputs(buf, "blackhole"); break; - default: - ret += bputs(buf, "unknown"); - break; } return ret; } From 321f8e0d840986044a86651a5e52e9ca66ac4bbe Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Tue, 14 Sep 2021 13:28:00 -0400 Subject: [PATCH 2/2] zebra: Fix case default usage w/ enum's We should not be using `case default` with an enumerated type This prevents the developer of new cases from knowing where they need to fix by just compiling. Signed-off-by: Donald Sharp --- zebra/zebra_vty.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c index 1c8a1ad09a..79087c5849 100644 --- a/zebra/zebra_vty.c +++ b/zebra/zebra_vty.c @@ -353,8 +353,6 @@ static void show_nexthop_detail_helper(struct vty *vty, break; } break; - default: - break; } if (re->vrf_id != nexthop->vrf_id) { @@ -605,8 +603,6 @@ static void show_route_nexthop_helper(struct vty *vty, break; } break; - default: - break; } if ((re == NULL || (nexthop->vrf_id != re->vrf_id))) @@ -777,8 +773,6 @@ static void show_nexthop_json_helper(json_object *json_nexthop, break; } break; - default: - break; } if (nexthop->vrf_id != re->vrf_id) @@ -2247,8 +2241,6 @@ static void show_ip_route_nht_dump(struct vty *vty, struct nexthop *nexthop, break; } break; - default: - break; } }