diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-10-10 13:33:14 -0400 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-10-10 17:08:56 -0400 |
| commit | 84519c816445c7105d4a70f43b92b3ee5ab3802d (patch) | |
| tree | 3b739e7ccffa1def269edea30b898d904d3f5bd3 | |
| parent | 6bab451dcdb316503cd4800a4038826873edcf44 (diff) | |
ospfd: Fix ships in the night PR's and list_delete
list_delete_and_null should be used.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
| -rw-r--r-- | ospfd/ospfd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c index 069ba96be6..0a9a53dbb2 100644 --- a/ospfd/ospfd.c +++ b/ospfd/ospfd.c @@ -634,7 +634,7 @@ static void ospf_finish_final(struct ospf *ospf) /* Reset interface. */ for (ALL_LIST_ELEMENTS(ospf->oiflist, node, nnode, oi)) ospf_if_free(oi); - list_delete(ospf->oiflist); + list_delete_and_null(&ospf->oiflist); /* De-Register VRF */ ospf_zebra_vrf_deregister(ospf); @@ -769,7 +769,7 @@ static void ospf_finish_final(struct ospf *ospf) if (!CHECK_FLAG(om->options, OSPF_MASTER_SHUTDOWN)) instance = ospf->instance; - list_delete(ospf->oi_write_q); + list_delete_and_null(&ospf->oi_write_q); ospf_delete(ospf); |