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

[mirror_frr.git] / isisd / isis_spf.c

diff --git a/isisd/isis_spf.c b/isisd/isis_spf.c
index cd9a0f89bbb4cb5592ac252abc81a48fb68bf397..3008fb6a1eb1805c3b3e7317381f2080a6efd12e 100644 (file)
--- a/isisd/isis_spf.c
+++ b/isisd/isis_spf.c
@@ -205,10 +205,8 @@ static void isis_vertex_queue_free(struct isis_vertex_queue *queue)
        if (queue->insert_counter) {
                skiplist_free(queue->l.slist);
                queue->l.slist = NULL;
-       } else {
-               list_delete(queue->l.list);
-               queue->l.list = NULL;
-       }
+       } else
+               list_delete_and_null(&queue->l.list);
 }
 
 static unsigned int isis_vertex_queue_count(struct isis_vertex_queue *queue)
@@ -437,10 +435,8 @@ static struct isis_vertex *isis_vertex_new(void *id, enum vertextype vtype)
 
 static void isis_vertex_del(struct isis_vertex *vertex)
 {
-       list_delete(vertex->Adj_N);
-       vertex->Adj_N = NULL;
-       list_delete(vertex->parents);
-       vertex->parents = NULL;
+       list_delete_and_null(&vertex->Adj_N);
+       list_delete_and_null(&vertex->parents);
 
        memset(vertex, 0, sizeof(struct isis_vertex));
        XFREE(MTYPE_ISIS_VERTEX, vertex);
@@ -1038,7 +1034,7 @@ static int isis_spf_preload_tent(struct isis_spftree *spftree,
                        adjdb = circuit->u.bc.adjdb[spftree->level - 1];
                        isis_adj_build_up_list(adjdb, adj_list);
                        if (listcount(adj_list) == 0) {
-                               list_delete(adj_list);
+                               list_delete_and_null(&adj_list);
                                if (isis->debugs & DEBUG_SPF_EVENTS)
                                        zlog_debug(
                                                "ISIS-Spf: no L%d adjacencies on circuit %s",
@@ -1102,7 +1098,7 @@ static int isis_spf_preload_tent(struct isis_spftree *spftree,
                                                "isis_spf_preload_tent unknow adj type");
                                }
                        }
-                       list_delete(adj_list);
+                       list_delete_and_null(&adj_list);
                        /*
                         * Add the pseudonode
                         */