diff options
| author | Quentin Young <qlyoung@cumulusnetworks.com> | 2019-02-25 20:18:13 +0000 |
|---|---|---|
| committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2019-02-25 23:00:46 +0000 |
| commit | 0a22ddfbb16a61c3e068ea1164e885104366112a (patch) | |
| tree | 5aeaef43b3de5ebbdfcf1015421eb48b51a071fb /pimd | |
| parent | 1383ff9c51dd58ed84021fafb14f7c2e27b7666b (diff) | |
*: remove null check before XFREE
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Diffstat (limited to 'pimd')
| -rw-r--r-- | pimd/pim_cmd.c | 6 | ||||
| -rw-r--r-- | pimd/pim_iface.c | 3 | ||||
| -rw-r--r-- | pimd/pim_msdp.c | 3 | ||||
| -rw-r--r-- | pimd/pim_rp.c | 3 | ||||
| -rw-r--r-- | pimd/pim_ssm.c | 3 |
5 files changed, 6 insertions, 12 deletions
diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c index eaec002a73..91aba949ea 100644 --- a/pimd/pim_cmd.c +++ b/pimd/pim_cmd.c @@ -5159,16 +5159,14 @@ static int pim_cmd_spt_switchover(struct pim_instance *pim, switch (pim->spt.switchover) { case PIM_SPT_IMMEDIATE: - if (pim->spt.plist) - XFREE(MTYPE_PIM_SPT_PLIST_NAME, pim->spt.plist); + XFREE(MTYPE_PIM_SPT_PLIST_NAME, pim->spt.plist); pim_upstream_add_lhr_star_pimreg(pim); break; case PIM_SPT_INFINITY: pim_upstream_remove_lhr_star_pimreg(pim, plist); - if (pim->spt.plist) - XFREE(MTYPE_PIM_SPT_PLIST_NAME, pim->spt.plist); + XFREE(MTYPE_PIM_SPT_PLIST_NAME, pim->spt.plist); if (plist) pim->spt.plist = diff --git a/pimd/pim_iface.c b/pimd/pim_iface.c index 6933f4d5bd..92d21cf429 100644 --- a/pimd/pim_iface.c +++ b/pimd/pim_iface.c @@ -208,8 +208,7 @@ void pim_if_delete(struct interface *ifp) list_delete(&pim_ifp->upstream_switch_list); list_delete(&pim_ifp->sec_addr_list); - if (pim_ifp->boundary_oil_plist) - XFREE(MTYPE_PIM_INTERFACE, pim_ifp->boundary_oil_plist); + XFREE(MTYPE_PIM_INTERFACE, pim_ifp->boundary_oil_plist); while (!RB_EMPTY(pim_ifchannel_rb, &pim_ifp->ifchannel_rb)) { ch = RB_ROOT(pim_ifchannel_rb, &pim_ifp->ifchannel_rb); diff --git a/pimd/pim_msdp.c b/pimd/pim_msdp.c index a4f87fa1a6..395c4af35f 100644 --- a/pimd/pim_msdp.c +++ b/pimd/pim_msdp.c @@ -1256,8 +1256,7 @@ static void pim_msdp_mg_free(struct pim_instance *pim) if (PIM_DEBUG_MSDP_EVENTS) { zlog_debug("MSDP mesh-group %s deleted", mg->mesh_group_name); } - if (mg->mesh_group_name) - XFREE(MTYPE_PIM_MSDP_MG_NAME, mg->mesh_group_name); + XFREE(MTYPE_PIM_MSDP_MG_NAME, mg->mesh_group_name); if (mg->mbr_list) list_delete(&mg->mbr_list); diff --git a/pimd/pim_rp.c b/pimd/pim_rp.c index 08f2ffc4ea..308d5a5e06 100644 --- a/pimd/pim_rp.c +++ b/pimd/pim_rp.c @@ -65,8 +65,7 @@ void pim_rp_list_hash_clean(void *data) static void pim_rp_info_free(struct rp_info *rp_info) { - if (rp_info->plist) - XFREE(MTYPE_PIM_FILTER_NAME, rp_info->plist); + XFREE(MTYPE_PIM_FILTER_NAME, rp_info->plist); XFREE(MTYPE_PIM_RP, rp_info); } diff --git a/pimd/pim_ssm.c b/pimd/pim_ssm.c index dfc7063fd0..6a70a73b45 100644 --- a/pimd/pim_ssm.c +++ b/pimd/pim_ssm.c @@ -151,8 +151,7 @@ void pim_ssm_terminate(struct pim_ssm *ssm) if (!ssm) return; - if (ssm->plist_name) - XFREE(MTYPE_PIM_FILTER_NAME, ssm->plist_name); + XFREE(MTYPE_PIM_FILTER_NAME, ssm->plist_name); XFREE(MTYPE_PIM_SSM_INFO, ssm); } |