*: Convert list_delete(struct list *) to ** to allow nulling

[mirror_frr.git] / bgpd / rfapi / rfapi_rib.c

diff --git a/bgpd/rfapi/rfapi_rib.c b/bgpd/rfapi/rfapi_rib.c
index 748c0c476b1d41ecca8de66e8c449b25592952c2..92cd1888ee267dee5b8c83da586cd4a8f5680fb4 100644 (file)
--- a/bgpd/rfapi/rfapi_rib.c
+++ b/bgpd/rfapi/rfapi_rib.c
@@ -510,13 +510,12 @@ void rfapiRibClear(struct rfapi_descriptor *rfd)
                                 */
                                if (pn->info) {
                                        if (pn->info != (void *)1) {
-                                               list_delete(
-                                                       (struct list
-                                                                *)(pn->info));
+                                               list_delete_and_null(
+                                                       (struct list **)(&pn->info));
                                        }
                                        pn->info = NULL;
-                                       route_unlock_node(
-                                               pn); /* linklist or 1 deleted */
+                                       /* linklist or 1 deleted */
+                                       route_unlock_node(pn);
                                }
                        }
                }
@@ -1435,7 +1434,7 @@ callback:
                }
 
                delete_list->del = (void (*)(void *))rfapi_info_free;
-               list_delete(delete_list);
+               list_delete_and_null(&delete_list);
        }
 
        RFAPI_RIB_CHECK_COUNTS(0, 0);
@@ -1450,7 +1449,7 @@ callback:
                route_unlock_node(pn);
        }
        if (lPendCost) {
-               list_delete(lPendCost);
+               list_delete_and_null(&lPendCost);
                pn->info = NULL;
                route_unlock_node(pn);
        }
@@ -1634,7 +1633,7 @@ void rfapiRibUpdatePendingNode(
         */
        if (pn->info) {
                if (pn->info != (void *)1) {
-                       list_delete((struct list *)(pn->info));
+                       list_delete_and_null((struct list **)(&pn->info));
                }
                pn->info = NULL;
                route_unlock_node(pn); /* linklist or 1 deleted */