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 /zebra/interface.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 '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 96b244635d..afb08f7012 100644 --- a/zebra/interface.c +++ b/zebra/interface.c @@ -88,7 +88,7 @@ static void zebra_if_node_destroy(route_table_delegate_t *delegate, struct route_node *node) { if (node->info) - list_delete_and_null((struct list **)&node->info); + list_delete((struct list **)&node->info); route_node_destroy(delegate, table, node); } @@ -174,7 +174,7 @@ static int if_zebra_delete_hook(struct interface *ifp) struct rtadvconf *rtadv; rtadv = &zebra_if->rtadv; - list_delete_and_null(&rtadv->AdvPrefixList); + list_delete(&rtadv->AdvPrefixList); #endif /* HAVE_RTADV */ THREAD_OFF(zebra_if->speed_update); @@ -361,7 +361,7 @@ int if_subnet_delete(struct interface *ifp, struct connected *ifc) } /* Otherwise, free list and route node. */ - list_delete_and_null(&addr_list); + list_delete(&addr_list); rn->info = NULL; route_unlock_node(rn); @@ -673,7 +673,7 @@ static void if_delete_connected(struct interface *ifp) } /* Free chain list and respective route node. */ - list_delete_and_null(&addr_list); + list_delete(&addr_list); rn->info = NULL; route_unlock_node(rn); } else if (cp.family == AF_INET6) { |