diff options
| author | Lou Berger <lberger@labn.net> | 2018-10-02 10:03:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-02 10:03:46 -0400 |
| commit | e47e908c0ddc5fa7c4b2ea33094e09bdc7a6e39a (patch) | |
| tree | 8474b723504f124cf34a21b09d2871fe64afcaa3 /pimd/pim_iface.c | |
| parent | e2392415346356926538d0433cbfb1ddcc9a2de1 (diff) | |
| parent | 6a154c88122dd0a9e9deb4309e15b975ad169817 (diff) | |
Merge pull request #3120 from opensourcerouting/remove-list-delete
lib: remove deprecated list_delete()/list_free()
Diffstat (limited to 'pimd/pim_iface.c')
| -rw-r--r-- | pimd/pim_iface.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pimd/pim_iface.c b/pimd/pim_iface.c index 249b24c0d7..1ad71823b8 100644 --- a/pimd/pim_iface.c +++ b/pimd/pim_iface.c @@ -201,10 +201,10 @@ void pim_if_delete(struct interface *ifp) pim_if_del_vif(ifp); - list_delete_and_null(&pim_ifp->igmp_socket_list); - list_delete_and_null(&pim_ifp->pim_neighbor_list); - list_delete_and_null(&pim_ifp->upstream_switch_list); - list_delete_and_null(&pim_ifp->sec_addr_list); + list_delete(&pim_ifp->igmp_socket_list); + list_delete(&pim_ifp->pim_neighbor_list); + 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); @@ -1349,7 +1349,7 @@ int pim_if_igmp_join_del(struct interface *ifp, struct in_addr group_addr, listnode_delete(pim_ifp->igmp_join_list, ij); igmp_join_free(ij); if (listcount(pim_ifp->igmp_join_list) < 1) { - list_delete_and_null(&pim_ifp->igmp_join_list); + list_delete(&pim_ifp->igmp_join_list); pim_ifp->igmp_join_list = 0; } |