diff options
| author | Lou Berger <lberger@labn.net> | 2017-10-05 14:57:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-05 14:57:05 -0400 |
| commit | 76ae8092db11aa40198f71424103b484675d4d62 (patch) | |
| tree | 9f6095d8c4c99171f57189db8396870d9f2c9740 /zebra/interface.c | |
| parent | 9772d7297920b2c6947886488fa2b07ead8e8fe0 (diff) | |
| parent | acdf5e25101bafe334e6b500c3dd0a2babb3c1ec (diff) | |
Merge pull request #1264 from donaldsharp/linklist
Linklist api cleanup
Diffstat (limited to 'zebra/interface.c')
| -rw-r--r-- | zebra/interface.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/zebra/interface.c b/zebra/interface.c index 664e493d84..a65dd21f63 100644 --- a/zebra/interface.c +++ b/zebra/interface.c @@ -64,7 +64,7 @@ static void zebra_if_node_destroy(route_table_delegate_t *delegate, struct route_node *node) { if (node->info) - list_delete(node->info); + list_delete_and_null((struct list **)&node->info); route_node_destroy(delegate, table, node); } @@ -138,7 +138,7 @@ static int if_zebra_delete_hook(struct interface *ifp) struct rtadvconf *rtadv; rtadv = &zebra_if->rtadv; - list_free(rtadv->AdvPrefixList); + list_delete_and_null(&rtadv->AdvPrefixList); #endif /* HAVE_RTADV */ XFREE(MTYPE_TMP, zebra_if); @@ -322,7 +322,7 @@ int if_subnet_delete(struct interface *ifp, struct connected *ifc) } /* Otherwise, free list and route node. */ - list_free(addr_list); + list_delete_and_null(&addr_list); rn->info = NULL; route_unlock_node(rn); @@ -627,7 +627,7 @@ static void if_delete_connected(struct interface *ifp) } /* Free chain list and respective route node. */ - list_delete(addr_list); + list_delete_and_null(&addr_list); rn->info = NULL; route_unlock_node(rn); } else if (cp.family == AF_INET6) { |