zebra: Allow ns delete to happen after under/over flow checks

[mirror_frr.git] / pimd / pim_oil.c

diff --git a/pimd/pim_oil.c b/pimd/pim_oil.c
index a0debc0c78f86a0994f9c751fe96c872005714f3..1290bfe56b153d4ec3e658bbf56cd20c05f0ee70 100644 (file)
--- a/pimd/pim_oil.c
+++ b/pimd/pim_oil.c
@@ -79,16 +79,16 @@ static int pim_channel_oil_compare(struct channel_oil *c1,
        return 0;
 }
 
-static int pim_oil_equal(const void *arg1, const void *arg2)
+static bool pim_oil_equal(const void *arg1, const void *arg2)
 {
        const struct channel_oil *c1 = (const struct channel_oil *)arg1;
        const struct channel_oil *c2 = (const struct channel_oil *)arg2;
 
        if ((c1->oil.mfcc_mcastgrp.s_addr == c2->oil.mfcc_mcastgrp.s_addr)
            && (c1->oil.mfcc_origin.s_addr == c2->oil.mfcc_origin.s_addr))
-               return 1;
+               return true;
 
-       return 0;
+       return false;
 }
 
 static unsigned int pim_oil_hash_key(void *arg)
@@ -116,7 +116,7 @@ void pim_oil_init(struct pim_instance *pim)
 void pim_oil_terminate(struct pim_instance *pim)
 {
        if (pim->channel_oil_list)
-               list_delete_and_null(&pim->channel_oil_list);
+               list_delete(&pim->channel_oil_list);
 
        if (pim->channel_oil_hash)
                hash_free(pim->channel_oil_hash);