Merge pull request #3120 from opensourcerouting/remove-list-delete

lib: remove deprecated list_delete()/list_free()

1 files changed, 5 insertions, 5 deletions

diff --git a/lib/command_match.c b/lib/command_match.c
index a1ae3ac6b9..8b34d1e3eb 100644
--- a/lib/command_match.c
+++ b/lib/command_match.c
@@ -334,7 +334,7 @@ static enum matcher_rv command_match_r(struct graph_node *start, vector vline,
 		status = MATCHER_INCOMPLETE;
 
 	// cleanup
-	list_delete_and_null(&next);
+	list_delete(&next);
 
 	return status;
 }
@@ -367,7 +367,7 @@ enum matcher_rv command_complete(struct graph *graph, vector vline,
 
 	unsigned int idx;
 	for (idx = 0; idx < vector_active(vline) && next->count > 0; idx++) {
-		list_delete_and_null(&current);
+		list_delete(&current);
 		current = next;
 		next = list_new();
 		next->del = stack_del;
@@ -458,8 +458,8 @@ enum matcher_rv command_complete(struct graph *graph, vector vline,
 		}
 	}
 
-	list_delete_and_null(&current);
-	list_delete_and_null(&next);
+	list_delete(&current);
+	list_delete(&next);
 
 	return mrv;
 }
@@ -652,7 +652,7 @@ static void del_arglist(struct list *list)
 	list_delete_node(list, tail);
 
 	// delete the rest of the list as usual
-	list_delete_and_null(&list);
+	list_delete(&list);
 }
 
 /*---------- token level matching functions ----------*/