*: remove null check before XFREE

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

diff --git a/bgpd/bgp_dump.c b/bgpd/bgp_dump.c
index e9711f5b90d531dae766d9f44d3cae15eb5c3a2e..298f9d0212b353ddb3eab347a52014bc23ce0529 100644 (file)
--- a/bgpd/bgp_dump.c
+++ b/bgpd/bgp_dump.c
@@ -667,9 +667,7 @@ static int bgp_dump_set(struct vty *vty, struct bgp_dump *bgp_dump,
 static int bgp_dump_unset(struct bgp_dump *bgp_dump)
 {
        /* Removing file name. */
-       if (bgp_dump->filename) {
-               XFREE(MTYPE_BGP_DUMP_STR, bgp_dump->filename);
-       }
+       XFREE(MTYPE_BGP_DUMP_STR, bgp_dump->filename);
 
        /* Closing file. */
        if (bgp_dump->fp) {
@@ -686,9 +684,7 @@ static int bgp_dump_unset(struct bgp_dump *bgp_dump)
        bgp_dump->interval = 0;
 
        /* Removing interval string. */
-       if (bgp_dump->interval_str) {
-               XFREE(MTYPE_BGP_DUMP_STR, bgp_dump->interval_str);
-       }
+       XFREE(MTYPE_BGP_DUMP_STR, bgp_dump->interval_str);
 
        return CMD_SUCCESS;
 }

diff --git a/bgpd/bgp_filter.c b/bgpd/bgp_filter.c
index a3c86c7eaf0ac17ca9c56c38960c1bbcc42fbc4a..a03551e79ddaafdf04d65a4eb90a5b64865974fa 100644 (file)
--- a/bgpd/bgp_filter.c
+++ b/bgpd/bgp_filter.c
@@ -168,9 +168,7 @@ static struct as_list *as_list_new(void)
 
 static void as_list_free(struct as_list *aslist)
 {
-       if (aslist->name) {
-               XFREE(MTYPE_AS_STR, aslist->name);
-       }
+       XFREE(MTYPE_AS_STR, aslist->name);
        XFREE(MTYPE_AS_LIST, aslist);
 }
 

diff --git a/bgpd/bgp_open.c b/bgpd/bgp_open.c
index f97827931fa940f422fdf304c3068e81c0c242e1..2d3dc135570364fe6a4148e87ff358b2a5197a38 100644 (file)
--- a/bgpd/bgp_open.c
+++ b/bgpd/bgp_open.c
@@ -710,13 +710,8 @@ static int bgp_capability_hostname(struct peer *peer,
        if (len) {
                str[len] = '\0';
 
-               if (peer->hostname != NULL) {
-                       XFREE(MTYPE_BGP_PEER_HOST, peer->hostname);
-               }
-
-               if (peer->domainname != NULL) {
-                       XFREE(MTYPE_BGP_PEER_HOST, peer->domainname);
-               }
+               XFREE(MTYPE_BGP_PEER_HOST, peer->hostname);
+               XFREE(MTYPE_BGP_PEER_HOST, peer->domainname);
 
                peer->hostname = XSTRDUP(MTYPE_BGP_PEER_HOST, str);
        }
@@ -748,9 +743,7 @@ static int bgp_capability_hostname(struct peer *peer,
        if (len) {
                str[len] = '\0';
 
-               if (peer->domainname != NULL) {
-                       XFREE(MTYPE_BGP_PEER_HOST, peer->domainname);
-               }
+               XFREE(MTYPE_BGP_PEER_HOST, peer->domainname);
 
                peer->domainname = XSTRDUP(MTYPE_BGP_PEER_HOST, str);
        }

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 4b2db05143e744a2394a8b18eeafa1f60a5aaaeb..954f524ec75ed2d451f267ef384460b551d780f8 100644 (file)
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -12160,9 +12160,7 @@ static int bgp_distance_set(struct vty *vty, const char *distance_str,
        bdistance->distance = distance;
 
        /* Reset access-list configuration. */
-       if (bdistance->access_list) {
-               XFREE(MTYPE_AS_LIST, bdistance->access_list);
-       }
+       XFREE(MTYPE_AS_LIST, bdistance->access_list);
        if (access_list_str)
                bdistance->access_list =
                        XSTRDUP(MTYPE_AS_LIST, access_list_str);

diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 0e2bbbe7cbdf78b0fcfe79ea69f96ef87132994e..7c2d60c51529723e25b2b8def6b52e73e712b653 100644 (file)
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -1007,22 +1007,10 @@ static void peer_free(struct peer *peer)
 
        XFREE(MTYPE_PEER_TX_SHUTDOWN_MSG, peer->tx_shutdown_message);
 
-       if (peer->desc) {
-               XFREE(MTYPE_PEER_DESC, peer->desc);
-       }
-
-       /* Free allocated host character. */
-       if (peer->host) {
-               XFREE(MTYPE_BGP_PEER_HOST, peer->host);
-       }
-
-       if (peer->domainname) {
-               XFREE(MTYPE_BGP_PEER_HOST, peer->domainname);
-       }
-
-       if (peer->ifname) {
-               XFREE(MTYPE_BGP_PEER_IFNAME, peer->ifname);
-       }
+       XFREE(MTYPE_PEER_DESC, peer->desc);
+       XFREE(MTYPE_BGP_PEER_HOST, peer->host);
+       XFREE(MTYPE_BGP_PEER_HOST, peer->domainname);
+       XFREE(MTYPE_BGP_PEER_IFNAME, peer->ifname);
 
        /* Update source configuration.  */
        if (peer->update_source) {
@@ -1030,9 +1018,7 @@ static void peer_free(struct peer *peer)
                peer->update_source = NULL;
        }
 
-       if (peer->update_if) {
-               XFREE(MTYPE_PEER_UPDATE_SOURCE, peer->update_if);
-       }
+       XFREE(MTYPE_PEER_UPDATE_SOURCE, peer->update_if);
 
        XFREE(MTYPE_TMP, peer->notify.data);
        memset(&peer->notify, 0, sizeof(struct bgp_notify));
@@ -1042,9 +1028,7 @@ static void peer_free(struct peer *peer)
 
        bgp_sync_delete(peer);
 
-       if (peer->conf_if) {
-               XFREE(MTYPE_PEER_CONF_IF, peer->conf_if);
-       }
+       XFREE(MTYPE_PEER_CONF_IF, peer->conf_if);
 
        bfd_info_free(&(peer->bfd_info));
 
@@ -1364,9 +1348,7 @@ void peer_xfer_config(struct peer *peer_dst, struct peer *peer_src)
        if (peer_src->update_source) {
                if (peer_dst->update_source)
                        sockunion_free(peer_dst->update_source);
-               if (peer_dst->update_if) {
-                       XFREE(MTYPE_PEER_UPDATE_SOURCE, peer_dst->update_if);
-               }
+               XFREE(MTYPE_PEER_UPDATE_SOURCE, peer_dst->update_if);
                peer_dst->update_source =
                        sockunion_dup(peer_src->update_source);
        } else if (peer_src->update_if) {
@@ -2378,49 +2360,24 @@ int peer_delete(struct peer *peer)
                filter = &peer->filter[afi][safi];
 
                for (i = FILTER_IN; i < FILTER_MAX; i++) {
-                       if (filter->dlist[i].name) {
-                               XFREE(MTYPE_BGP_FILTER_NAME,
-                                     filter->dlist[i].name);
-                       }
-
-                       if (filter->plist[i].name) {
-                               XFREE(MTYPE_BGP_FILTER_NAME,
-                                     filter->plist[i].name);
-                       }
-
-                       if (filter->aslist[i].name) {
-                               XFREE(MTYPE_BGP_FILTER_NAME,
-                                     filter->aslist[i].name);
-                       }
+                       XFREE(MTYPE_BGP_FILTER_NAME, filter->dlist[i].name);
+                       XFREE(MTYPE_BGP_FILTER_NAME, filter->plist[i].name);
+                       XFREE(MTYPE_BGP_FILTER_NAME, filter->aslist[i].name);
                }
 
                for (i = RMAP_IN; i < RMAP_MAX; i++) {
-                       if (filter->map[i].name) {
-                               XFREE(MTYPE_BGP_FILTER_NAME,
-                                     filter->map[i].name);
-                       }
+                       XFREE(MTYPE_BGP_FILTER_NAME, filter->map[i].name);
                }
 
-               if (filter->usmap.name) {
-                       XFREE(MTYPE_BGP_FILTER_NAME, filter->usmap.name);
-               }
-
-               if (peer->default_rmap[afi][safi].name) {
-                       XFREE(MTYPE_ROUTE_MAP_NAME,
-                             peer->default_rmap[afi][safi].name);
-               }
+               XFREE(MTYPE_BGP_FILTER_NAME, filter->usmap.name);
+               XFREE(MTYPE_ROUTE_MAP_NAME, peer->default_rmap[afi][safi].name);
        }
 
        FOREACH_AFI_SAFI (afi, safi)
                peer_af_delete(peer, afi, safi);
 
-       if (peer->hostname) {
-               XFREE(MTYPE_BGP_PEER_HOST, peer->hostname);
-       }
-
-       if (peer->domainname) {
-               XFREE(MTYPE_BGP_PEER_HOST, peer->domainname);
-       }
+       XFREE(MTYPE_BGP_PEER_HOST, peer->hostname);
+       XFREE(MTYPE_BGP_PEER_HOST, peer->domainname);
 
        peer_unlock(peer); /* initial reference */
 
@@ -2977,16 +2934,12 @@ static struct bgp *bgp_create(as_t *as, const char *name,
        XFREE(MTYPE_BGP_PEER_HOST, bgp->peer_self->host);
        bgp->peer_self->host =
                XSTRDUP(MTYPE_BGP_PEER_HOST, "Static announcement");
-       if (bgp->peer_self->hostname != NULL) {
-               XFREE(MTYPE_BGP_PEER_HOST, bgp->peer_self->hostname);
-       }
+       XFREE(MTYPE_BGP_PEER_HOST, bgp->peer_self->hostname);
        if (cmd_hostname_get())
                bgp->peer_self->hostname =
                        XSTRDUP(MTYPE_BGP_PEER_HOST, cmd_hostname_get());
 
-       if (bgp->peer_self->domainname != NULL) {
-               XFREE(MTYPE_BGP_PEER_HOST, bgp->peer_self->domainname);
-       }
+       XFREE(MTYPE_BGP_PEER_HOST, bgp->peer_self->domainname);
        if (cmd_domainname_get())
                bgp->peer_self->domainname =
                        XSTRDUP(MTYPE_BGP_PEER_HOST, cmd_domainname_get());

diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h
index 3f33139ef2389a1d4c7a47582f70c9278e4b3f96..04355450d7ab42f3d537e2fdcba94e0be9fba6c4 100644 (file)
--- a/bgpd/bgpd.h
+++ b/bgpd/bgpd.h
@@ -1382,8 +1382,7 @@ DECLARE_QOBJ_TYPE(peer)
        ((peer)->attr = (group)->conf->attr)
 #define PEER_STR_ATTR_INHERIT(peer, group, attr, mt)                           \
        do {                                                                   \
-               if ((peer)->attr)                                              \
-                       XFREE(mt, (peer)->attr);                               \
+               XFREE(mt, (peer)->attr);                                       \
                if ((group)->conf->attr)                                       \
                        (peer)->attr = XSTRDUP(mt, (group)->conf->attr);       \
                else                                                           \

diff --git a/bgpd/rfapi/rfapi.c b/bgpd/rfapi/rfapi.c
index a9e60436c947c4b8239f0f6042066485bd0cf6a9..4701d2e1fa21fc46612d58cd6c8948e97093c7a5 100644 (file)
--- a/bgpd/rfapi/rfapi.c
+++ b/bgpd/rfapi/rfapi.c
@@ -1489,9 +1489,7 @@ void rfapiFreeBgpTeaOptionChain(struct bgp_tea_options *p)
        while (p) {
                next = p->next;
 
-               if (p->value) {
-                       XFREE(MTYPE_BGP_TEA_OPTIONS_VALUE, p->value);
-               }
+               XFREE(MTYPE_BGP_TEA_OPTIONS_VALUE, p->value);
                XFREE(MTYPE_BGP_TEA_OPTIONS, p);
 
                p = next;

diff --git a/lib/bfd.c b/lib/bfd.c
index 48d8914f618fc18e09cc674781d4c167793a0fac..4e192422cdb5ffa49d160db0dc748a7ccefaa31d 100644 (file)
--- a/lib/bfd.c
+++ b/lib/bfd.c
@@ -74,9 +74,7 @@ struct bfd_info *bfd_info_create(void)
  */
 void bfd_info_free(struct bfd_info **bfd_info)
 {
-       if (*bfd_info) {
-               XFREE(MTYPE_BFD_INFO, *bfd_info);
-       }
+       XFREE(MTYPE_BFD_INFO, *bfd_info);
 }
 
 /*

diff --git a/lib/command.c b/lib/command.c
index 05bb66565744f4e9293b27c1646c1ce292f29825..8811b3a7915484d5d6429a8276f8a68e8e4e35b0 100644 (file)
--- a/lib/command.c
+++ b/lib/command.c
@@ -2659,8 +2659,7 @@ int cmd_banner_motd_file(const char *file)
 
 void cmd_banner_motd_line(const char *line)
 {
-       if (host.motd)
-               XFREE(MTYPE_HOST, host.motd);
+       XFREE(MTYPE_HOST, host.motd);
        host.motd = XSTRDUP(MTYPE_HOST, line);
 }
 

diff --git a/lib/filter.c b/lib/filter.c
index e7a225961f493db0d66718eab76b81aa98556dae..4521cf64696fd269eb3253cdbf995c1de6cd5764 100644 (file)
--- a/lib/filter.c
+++ b/lib/filter.c
@@ -608,9 +608,7 @@ static int vty_access_list_remark_unset(struct vty *vty, afi_t afi,
                return CMD_WARNING_CONFIG_FAILED;
        }
 
-       if (access->remark) {
-               XFREE(MTYPE_TMP, access->remark);
-       }
+       XFREE(MTYPE_TMP, access->remark);
 
        if (access->head == NULL && access->tail == NULL)
                access_list_delete(access);

diff --git a/lib/plist.c b/lib/plist.c
index 971fc621645290d942011443cd1e3e7ca4f4ede2..f6ceba81e80b370060b534776e769e9a8ff72280 100644 (file)
--- a/lib/plist.c
+++ b/lib/plist.c
@@ -1092,9 +1092,7 @@ static int vty_prefix_list_desc_unset(struct vty *vty, afi_t afi,
                return CMD_WARNING_CONFIG_FAILED;
        }
 
-       if (plist->desc) {
-               XFREE(MTYPE_TMP, plist->desc);
-       }
+       XFREE(MTYPE_TMP, plist->desc);
 
        if (plist->head == NULL && plist->tail == NULL && plist->desc == NULL)
                prefix_list_delete(plist);

diff --git a/lib/vty.c b/lib/vty.c
index 75e68c0330b89674a4443ff073db4c4f0f7dd0ae..cf161338520471264518bd749644c6515da745fb 100644 (file)
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -3011,13 +3011,8 @@ void vty_reset(void)
 
        vty_timeout_val = VTY_TIMEOUT_DEFAULT;
 
-       if (vty_accesslist_name) {
-               XFREE(MTYPE_VTY, vty_accesslist_name);
-       }
-
-       if (vty_ipv6_accesslist_name) {
-               XFREE(MTYPE_VTY, vty_ipv6_accesslist_name);
-       }
+       XFREE(MTYPE_VTY, vty_accesslist_name);
+       XFREE(MTYPE_VTY, vty_ipv6_accesslist_name);
 }
 
 static void vty_save_cwd(void)

diff --git a/ospf6d/ospf6_message.c b/ospf6d/ospf6_message.c
index 40a21b37b3758f94d8a062883b5e71a3593e3c59..d75fc39bbbb5970bd70390187f2b212b518517fa 100644 (file)
--- a/ospf6d/ospf6_message.c
+++ b/ospf6d/ospf6_message.c
@@ -1516,13 +1516,8 @@ int ospf6_iobuf_size(unsigned int size)
 
 void ospf6_message_terminate(void)
 {
-       if (recvbuf) {
-               XFREE(MTYPE_OSPF6_MESSAGE, recvbuf);
-       }
-
-       if (sendbuf) {
-               XFREE(MTYPE_OSPF6_MESSAGE, sendbuf);
-       }
+       XFREE(MTYPE_OSPF6_MESSAGE, recvbuf);
+       XFREE(MTYPE_OSPF6_MESSAGE, sendbuf);
 
        iobuflen = 0;
 }

diff --git a/pimd/pim_bsm.c b/pimd/pim_bsm.c
index 4a69e4d1abc43f2d050480582be5f5b97fc4b5a3..e14b7e058d33a10c78ef7795358c818b322973df 100644 (file)
--- a/pimd/pim_bsm.c
+++ b/pimd/pim_bsm.c
@@ -86,8 +86,7 @@ static void pim_free_bsgrp_node(struct route_table *rt, struct prefix *grp)
 
 static void pim_bsm_node_free(struct bsm_info *bsm)
 {
-       if (bsm->bsm)
-               XFREE(MTYPE_PIM_BSM_PKT_VAR_MEM, bsm->bsm);
+       XFREE(MTYPE_PIM_BSM_PKT_VAR_MEM, bsm->bsm);
        XFREE(MTYPE_PIM_BSM_INFO, bsm);
 }
 

diff --git a/pimd/pim_msdp.c b/pimd/pim_msdp.c
index 58ebc6ce67d716d56f31a9259504894029e56ab7..bb02a36e1db65caf63777d6287631b2cd844095f 100644 (file)
--- a/pimd/pim_msdp.c
+++ b/pimd/pim_msdp.c
@@ -1175,9 +1175,7 @@ static void pim_msdp_peer_free(struct pim_msdp_peer *mp)
                stream_fifo_free(mp->obuf);
        }
 
-       if (mp->mesh_group_name) {
-               XFREE(MTYPE_PIM_MSDP_MG_NAME, mp->mesh_group_name);
-       }
+       XFREE(MTYPE_PIM_MSDP_MG_NAME, mp->mesh_group_name);
 
        mp->pim = NULL;
        XFREE(MTYPE_PIM_MSDP_PEER, mp);

diff --git a/ripd/ripd.c b/ripd/ripd.c
index ec0770ef3d7d835441ff5da0b81c4edc621b0f9c..99f48dffdd090237ba64b246956afa297b059498 100644 (file)
--- a/ripd/ripd.c
+++ b/ripd/ripd.c
@@ -3670,8 +3670,7 @@ static int rip_vrf_enable(struct vrf *vrf)
                                running_config->version++;
                        }
                }
-               if (old_vrf_name)
-                       XFREE(MTYPE_RIP_VRF_NAME, old_vrf_name);
+               XFREE(MTYPE_RIP_VRF_NAME, old_vrf_name);
        }
        if (!rip || rip->enabled)
                return 0;

diff --git a/ripngd/ripngd.c b/ripngd/ripngd.c
index ad2ddd0dba8a2ace03f0ca269d234bd9c388209f..f8d7dc968b8462ec2627e7778ecaa33008690d2c 100644 (file)
--- a/ripngd/ripngd.c
+++ b/ripngd/ripngd.c
@@ -2804,8 +2804,7 @@ static int ripng_vrf_enable(struct vrf *vrf)
                                running_config->version++;
                        }
                }
-               if (old_vrf_name)
-                       XFREE(MTYPE_RIPNG_VRF_NAME, old_vrf_name);
+               XFREE(MTYPE_RIPNG_VRF_NAME, old_vrf_name);
        }
 
        if (ripng->enabled)

diff --git a/zebra/zebra_mlag.c b/zebra/zebra_mlag.c
index f6bd5f458647be6a8ba05beff7efc61d0206499d..fc7804a409e22269376c19316a36aa3188406111 100644 (file)
--- a/zebra/zebra_mlag.c
+++ b/zebra/zebra_mlag.c
@@ -797,13 +797,11 @@ int zebra_mlag_protobuf_encode_client_data(struct stream *s, uint32_t *msg_type)
                }
 
                for (i = 0; i < mlag_msg.msg_cnt; i++) {
-                       if (pay_load[i]->vrf_name)
-                               XFREE(MTYPE_MLAG_PBUF, pay_load[i]->vrf_name);
+                       XFREE(MTYPE_MLAG_PBUF, pay_load[i]->vrf_name);
                        if (pay_load[i]->owner_id == MLAG_OWNER_INTERFACE
                            && pay_load[i]->intf_name)
                                XFREE(MTYPE_MLAG_PBUF, pay_load[i]->intf_name);
-                       if (pay_load[i])
-                               XFREE(MTYPE_MLAG_PBUF, pay_load[i]);
+                       XFREE(MTYPE_MLAG_PBUF, pay_load[i]);
                }
                XFREE(MTYPE_MLAG_PBUF, pay_load);
                if (cleanup == true)
@@ -861,13 +859,11 @@ int zebra_mlag_protobuf_encode_client_data(struct stream *s, uint32_t *msg_type)
                }
 
                for (i = 0; i < mlag_msg.msg_cnt; i++) {
-                       if (pay_load[i]->vrf_name)
-                               XFREE(MTYPE_MLAG_PBUF, pay_load[i]->vrf_name);
+                       XFREE(MTYPE_MLAG_PBUF, pay_load[i]->vrf_name);
                        if (pay_load[i]->owner_id == MLAG_OWNER_INTERFACE
                            && pay_load[i]->intf_name)
                                XFREE(MTYPE_MLAG_PBUF, pay_load[i]->intf_name);
-                       if (pay_load[i])
-                               XFREE(MTYPE_MLAG_PBUF, pay_load[i]);
+                       XFREE(MTYPE_MLAG_PBUF, pay_load[i]);
                }
                XFREE(MTYPE_MLAG_PBUF, pay_load);
                if (cleanup)
@@ -914,8 +910,7 @@ int zebra_mlag_protobuf_encode_client_data(struct stream *s, uint32_t *msg_type)
                        mlag_lib_msgid_to_str(mlag_msg.msg_type, buf,
                                              sizeof(buf)),
                        len);
-       if (hdr.data.data)
-               XFREE(MTYPE_MLAG_PBUF, hdr.data.data);
+       XFREE(MTYPE_MLAG_PBUF, hdr.data.data);
 
        return len;
 }