diff options
Diffstat (limited to 'pimd/pim_upstream.c')
| -rw-r--r-- | pimd/pim_upstream.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c index 4adfde677..cd6326f09 100644 --- a/pimd/pim_upstream.c +++ b/pimd/pim_upstream.c @@ -80,7 +80,7 @@ static void pim_upstream_remove_children(struct pim_instance *pim, if (child) child->parent = NULL; } - list_delete_and_null(&up->sources); + list_delete(&up->sources); } /* @@ -202,11 +202,11 @@ struct pim_upstream *pim_upstream_del(struct pim_instance *pim, for (ALL_LIST_ELEMENTS(up->ifchannels, node, nnode, ch)) pim_ifchannel_delete(ch); - list_delete_and_null(&up->ifchannels); + list_delete(&up->ifchannels); pim_upstream_remove_children(pim, up); if (up->sources) - list_delete_and_null(&up->sources); + list_delete(&up->sources); if (up->parent && up->parent->sources) listnode_delete(up->parent->sources, up); @@ -683,9 +683,9 @@ static struct pim_upstream *pim_upstream_new(struct pim_instance *pim, pim_upstream_remove_children(pim, up); if (up->sources) - list_delete_and_null(&up->sources); + list_delete(&up->sources); - list_delete_and_null(&up->ifchannels); + list_delete(&up->ifchannels); hash_release(pim->upstream_hash, up); XFREE(MTYPE_PIM_UPSTREAM, up); @@ -1542,7 +1542,7 @@ void pim_upstream_terminate(struct pim_instance *pim) pim_upstream_del(pim, up, __PRETTY_FUNCTION__); } - list_delete_and_null(&pim->upstream_list); + list_delete(&pim->upstream_list); } if (pim->upstream_hash) |