*: Remove tests for some XFREE-family functions

XFREE() covers that.

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>

diff --git a/bgpd/bgp_aspath.c b/bgpd/bgp_aspath.c
index f73d6e30091424bb51cc9ccf2ebdc006a4806769..0d2f16ef0c3b303790d5a040342d970a4596a812 100644 (file)
--- a/bgpd/bgp_aspath.c
+++ b/bgpd/bgp_aspath.c
@@ -132,8 +132,7 @@ static void assegment_free(struct assegment *seg)
        if (!seg)
                return;
 
-       if (seg->as)
-               assegment_data_free(seg->as);
+       assegment_data_free(seg->as);
        memset(seg, 0xfe, sizeof(struct assegment));
        XFREE(MTYPE_AS_SEG, seg);
 

diff --git a/bgpd/bgp_debug.c b/bgpd/bgp_debug.c
index c69bc52e47538ac30c0e6b3892d995493cfa99a4..466fecc5814bb0381b84641aea80110a690748f7 100644 (file)
--- a/bgpd/bgp_debug.c
+++ b/bgpd/bgp_debug.c
@@ -209,13 +209,8 @@ static void bgp_debug_list_free(struct list *list)
        if (list)
                for (ALL_LIST_ELEMENTS(list, node, nnode, filter)) {
                        listnode_delete(list, filter);
-
-                       if (filter->p)
-                               prefix_free(&filter->p);
-
-                       if (filter->host)
-                               XFREE(MTYPE_BGP_DEBUG_STR, filter->host);
-
+                       prefix_free(&filter->p);
+                       XFREE(MTYPE_BGP_DEBUG_STR, filter->host);
                        XFREE(MTYPE_BGP_DEBUG_FILTER, filter);
                }
 }

diff --git a/lib/if.c b/lib/if.c
index 5edb58a2de85eb6a6763df71cde9fe7d922096be..dabf66799d68745d37b4c6b39a332805bfe02fee 100644 (file)
--- a/lib/if.c
+++ b/lib/if.c
@@ -887,11 +887,8 @@ void connected_free(struct connected **connected)
 {
        struct connected *ptr = *connected;
 
-       if (ptr->address)
-               prefix_free(&ptr->address);
-
-       if (ptr->destination)
-               prefix_free(&ptr->destination);
+       prefix_free(&ptr->address);
+       prefix_free(&ptr->destination);
 
        XFREE(MTYPE_CONNECTED_LABEL, ptr->label);