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_rp.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_rp.c')
| -rw-r--r-- | pimd/pim_rp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pimd/pim_rp.c b/pimd/pim_rp.c index 51ca0945b9..6b76794b75 100644 --- a/pimd/pim_rp.c +++ b/pimd/pim_rp.c @@ -52,7 +52,7 @@ void pim_rp_list_hash_clean(void *data) { struct pim_nexthop_cache *pnc = (struct pim_nexthop_cache *)data; - list_delete_and_null(&pnc->rp_list); + list_delete(&pnc->rp_list); hash_clean(pnc->upstream_hash, NULL); hash_free(pnc->upstream_hash); @@ -115,7 +115,7 @@ void pim_rp_init(struct pim_instance *pim) if (!str2prefix("224.0.0.0/4", &rp_info->group)) { flog_err(EC_LIB_DEVELOPMENT, "Unable to convert 224.0.0.0/4 to prefix"); - list_delete_and_null(&pim->rp_list); + list_delete(&pim->rp_list); route_table_finish(pim->rp_table); XFREE(MTYPE_PIM_RP, rp_info); return; @@ -138,7 +138,7 @@ void pim_rp_init(struct pim_instance *pim) void pim_rp_free(struct pim_instance *pim) { if (pim->rp_list) - list_delete_and_null(&pim->rp_list); + list_delete(&pim->rp_list); } /* |