From 3756b9acebfdad4b21bf838b616ebdd52eb038cf Mon Sep 17 00:00:00 2001 From: Iqra Siddiqui Date: Tue, 18 Jan 2022 23:14:03 -0800 Subject: [PATCH] bgpd: Fixing dead code Description: -Removing break statements which will never be executed. -Adding missing 'cmd' variable. Co-authored-by: Kantesh Mundaragi Signed-off-by: Iqra Siddiqui --- bgpd/bgp_vty.c | 2 -- bgpd/bgp_zebra.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c index df134687d5..7b221091dd 100644 --- a/bgpd/bgp_vty.c +++ b/bgpd/bgp_vty.c @@ -175,7 +175,6 @@ static enum node_type bgp_node_type(afi_t afi, safi_t safi) /* not expected */ return BGP_IPV4_NODE; } - break; case AFI_IP6: switch (safi) { case SAFI_UNICAST: @@ -192,7 +191,6 @@ static enum node_type bgp_node_type(afi_t afi, safi_t safi) /* not expected */ return BGP_IPV4_NODE; } - break; case AFI_L2VPN: return BGP_EVPN_NODE; case AFI_UNSPEC: diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c index 21912d143e..e028a7e8d6 100644 --- a/bgpd/bgp_zebra.c +++ b/bgpd/bgp_zebra.c @@ -2843,8 +2843,8 @@ static int bgp_zebra_process_local_es_evi(ZAPI_CALLBACK_ARGS) if (BGP_DEBUG(zebra, ZEBRA)) zlog_debug("Rx %s ESI %s VNI %u", - ZEBRA_VNI_ADD ? "add" : "del", - esi_to_str(&esi, buf, sizeof(buf)), vni); + (cmd == ZEBRA_VNI_ADD) ? "add" : "del", + esi_to_str(&esi, buf, sizeof(buf)), vni); if (cmd == ZEBRA_LOCAL_ES_EVI_ADD) { frrtrace(2, frr_bgp, evpn_mh_local_es_evi_add_zrecv, &esi, vni); -- 2.39.5