From: Paul Jakma <paul.jakma@sun.com>
Date: Thu, 15 Jun 2006 12:43:09 +0000 (+0000)
Subject: [lib] list_delete shouldn't duplicate list_delete_all_node
X-Git-Tag: frr-2.0-rc1~2671
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=c024fd0c76bc305cd6b6bab0989226bd9ec5e763;p=mirror%2Ffrr.git

[lib] list_delete shouldn't duplicate list_delete_all_node

2006-06-15 Paul Jakma <paul.jakma@sun.com>

	* linklist.c: (list_delete) call list_delete_all_node, don't
	  duplicate it.
---

diff --git a/lib/ChangeLog b/lib/ChangeLog
index b7c9f04035..a9c3b8bfd0 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -3,6 +3,8 @@
 	* command.c: (cmd_describe_command_real) Fix leak, CID #38.
 	* memory.h: Experimental, have XFREE macro NULL out the freed
 	  pointer.
+	* linklist.c: (list_delete) call list_delete_all_node, don't
+	  duplicate it.
 
 2006-05-28 Paul Jakma <paul.jakma@sun.com>
 
diff --git a/lib/linklist.c b/lib/linklist.c
index 71c4db8202..11e16a8a4a 100644
--- a/lib/linklist.c
+++ b/lib/linklist.c
@@ -226,17 +226,8 @@ list_delete_all_node (struct list *list)
 void
 list_delete (struct list *list)
 {
-  struct listnode *node;
-  struct listnode *next;
-
   assert(list);
-  for (node = list->head; node; node = next)
-    {
-      next = node->next;
-      if (list->del)
-	(*list->del) (node->data);
-      listnode_free (node);
-    }
+  list_delete_all_node (list);
   list_free (list);
 }