From efae8c26cbb10762a6d87056f4e443e4043c5e36 Mon Sep 17 00:00:00 2001 From: Carmine Scarpitta Date: Sat, 29 Oct 2022 17:31:16 +0200 Subject: [PATCH] bgpd: Don't check for NULL when removing chunks `srv6_locator_chunk_free()` is a wrapper around the `XFREE()` macro. Passing a NULL pointer to `XFREE()` is safe. Therefore, checking that the pointer passed to the `srv6_locator_chunk_free()` is not null is unnecessary. Signed-off-by: Carmine Scarpitta --- bgpd/bgp_vty.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c index 8c3f2bf9b7..a849eb02ec 100644 --- a/bgpd/bgp_vty.c +++ b/bgpd/bgp_vty.c @@ -297,7 +297,7 @@ static int bgp_srv6_locator_unset(struct bgp *bgp) { int ret; struct listnode *node, *nnode; - struct srv6_locator_chunk *chunk, *tovpn_sid_locator; + struct srv6_locator_chunk *chunk; struct bgp_srv6_function *func; struct bgp *bgp_vrf; @@ -345,18 +345,12 @@ static int bgp_srv6_locator_unset(struct bgp *bgp) continue; /* refresh vpnv4 tovpn_sid_locator */ - tovpn_sid_locator = - bgp_vrf->vpn_policy[AFI_IP].tovpn_sid_locator; - if (tovpn_sid_locator) - srv6_locator_chunk_free( - &bgp_vrf->vpn_policy[AFI_IP].tovpn_sid_locator); + srv6_locator_chunk_free( + &bgp_vrf->vpn_policy[AFI_IP].tovpn_sid_locator); /* refresh vpnv6 tovpn_sid_locator */ - tovpn_sid_locator = - bgp_vrf->vpn_policy[AFI_IP6].tovpn_sid_locator; - if (tovpn_sid_locator) - srv6_locator_chunk_free(&bgp_vrf->vpn_policy[AFI_IP6] - .tovpn_sid_locator); + srv6_locator_chunk_free( + &bgp_vrf->vpn_policy[AFI_IP6].tovpn_sid_locator); /* refresh per-vrf tovpn_sid_locator */ srv6_locator_chunk_free(&bgp_vrf->tovpn_sid_locator);