X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=lib%2Flist.c;h=f509e216df9bd5f59f9c073390dcf22872725542;hp=6ade9e8a4fae2338a1f4199bbe8127d7f1c90df1;hb=7aa7895629d72391eccfcb23f3cb6290a9e3abc3;hpb=3a6200c1e39b61b249db3d1f9bcffa77351863bd

diff --git a/lib/list.c b/lib/list.c
index 6ade9e8a..f509e216 100644
--- a/lib/list.c
+++ b/lib/list.c
@@ -17,16 +17,15 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: list.c,v 1.1.2.3 2000/11/20 22:13:00 guus Exp $
+    $Id: list.c,v 1.1.2.6 2000/11/22 23:09:38 guus Exp $
 */
 
 #include "config.h"
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
 
-#include <error.h>
 #include <list.h>
 #include <xalloc.h>
 
@@ -50,14 +49,10 @@ list_t *list_new(void)
 
   Delete the element pointed to by idx from the list.
 */
-list_node_t *list_delete(list_t *list, list_node_t *idx)
+void list_delete(list_t *list, list_node_t *idx)
 {
-  list_node_t *res;
-  
-  if(!list)
-    return NULL;
-  if(!idx)
-    return NULL;
+  if(!list || !idx)
+    return;
 
   if(list->callbacks->delete != NULL)
     if(list->callbacks->delete(idx->data))
@@ -68,13 +63,11 @@ list_node_t *list_delete(list_t *list, list_node_t *idx)
   if(idx->prev == NULL)
     /* First element in list */
     {
-      res = idx->next;
       list->head = idx->next;
     }
   if(idx->next == NULL)
     /* Last element in list */
     {
-      res = NULL;
       list->tail = idx->prev;
     }
   if(idx->prev != NULL && idx->next != NULL)
@@ -88,8 +81,8 @@ list_node_t *list_delete(list_t *list, list_node_t *idx)
   else
     if(list->tail == NULL)
       list->head = NULL;
+
   free(idx);
-  return res;
 }
 
 /*
@@ -100,7 +93,7 @@ list_node_t *list_delete(list_t *list, list_node_t *idx)
 */
 void list_forall_nodes(list_t *list, int (*function)(void *data))
 {
-  list_node_t *p;
+  list_node_t *p, *next;
   int res;
   
   if(!list)       /* no list given */
@@ -109,11 +102,12 @@ void list_forall_nodes(list_t *list, int (*function)(void *data))
     return;
   if(!list->head) /* list is empty */
     return;
-  for(p = list->head; p != NULL; p = p->next)
+  for(p = list->head; p != NULL; p = next)
     {
+      next = p->next;
       res = function(p->data);
       if(res != 0)
-	p = list_delete(list, p);
+	list_delete(list, p);
     }
 }