diff options
| author | Russ White <russ@riw.us> | 2021-09-15 09:06:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-15 09:06:49 -0400 |
| commit | a79c6892bc86accf99f0c12e38a0435330cde207 (patch) | |
| tree | aa0d1c2741acc9f7e98b17556521a935dd65316b | |
| parent | 9948e5acb2a6ffb8ea092ecab5f5777025c5dc41 (diff) | |
| parent | 321f8e0d840986044a86651a5e52e9ca66ac4bbe (diff) | |
Merge pull request #9611 from donaldsharp/more_default_bull
when doing a switch over an enumeration do not use default
| -rw-r--r-- | lib/nexthop.c | 10 | ||||
| -rw-r--r-- | zebra/zebra_vty.c | 8 |
2 files changed, 1 insertions, 17 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; } 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; } } |