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 /ospfd/ospf_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 'ospfd/ospf_interface.c')
| -rw-r--r-- | ospfd/ospf_interface.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ospfd/ospf_interface.c b/ospfd/ospf_interface.c index 2ad36ae364..ddb25a20f6 100644 --- a/ospfd/ospf_interface.c +++ b/ospfd/ospf_interface.c @@ -341,10 +341,10 @@ void ospf_if_free(struct ospf_interface *oi) route_table_finish(oi->ls_upd_queue); /* Free any lists that should be freed */ - list_delete_and_null(&oi->nbr_nbma); + list_delete(&oi->nbr_nbma); - list_delete_and_null(&oi->ls_ack); - list_delete_and_null(&oi->ls_ack_direct.ls_ack); + list_delete(&oi->ls_ack); + list_delete(&oi->ls_ack_direct.ls_ack); if (IS_DEBUG_OSPF_EVENT) zlog_debug("%s: ospf interface %s vrf %s id %u deleted", @@ -545,7 +545,7 @@ static struct ospf_if_params *ospf_new_if_params(void) void ospf_del_if_params(struct ospf_if_params *oip) { - list_delete_and_null(&oip->auth_crypt); + list_delete(&oip->auth_crypt); bfd_info_free(&(oip->bfd_info)); XFREE(MTYPE_OSPF_IF_PARAMS, oip); } |