X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Flist.c;h=0bbc5d42aeb23563f947cfe10c4c3d5654556ff9;hp=8d0c9c89e31c59c2b341c5c2303bed13c59450c9;hb=9fdf4278f8c8c1563d45205c9e9f1bc351bd814f;hpb=0b8b23e0dd7219344543f135ca0aeba8a4a42d48

diff --git a/src/list.c b/src/list.c
index 8d0c9c89..0bbc5d42 100644
--- a/src/list.c
+++ b/src/list.c
@@ -1,7 +1,7 @@
 /*
     list.c -- functions to deal with double linked lists
     Copyright (C) 2000-2005 Ivo Timmermans
-                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@
 /* (De)constructors */
 
 list_t *list_alloc(list_action_t delete) {
-	list_t *list = xmalloc_and_zero(sizeof(list_t));
+	list_t *list = xzalloc(sizeof(list_t));
 	list->delete = delete;
 
 	return list;
@@ -37,7 +37,7 @@ void list_free(list_t *list) {
 }
 
 list_node_t *list_alloc_node(void) {
-	return xmalloc_and_zero(sizeof(list_node_t));
+	return xzalloc(sizeof(list_node_t));
 }
 
 void list_free_node(list_t *list, list_node_t *node) {
@@ -150,6 +150,12 @@ void list_delete_tail(list_t *list) {
 	list_delete_node(list, list->tail);
 }
 
+void list_delete(list_t *list, const void *data) {
+	for(list_node_t *node = list->head, *next; next = node ? node->next : NULL, node; node = next)
+		if(node->data == data)
+			list_delete_node(list, node);
+}
+
 /* Head/tail lookup */
 
 void *list_get_head(list_t *list) {
@@ -169,7 +175,7 @@ void *list_get_tail(list_t *list) {
 /* Fast list deletion */
 
 void list_delete_list(list_t *list) {
-	for(list_node_t *node = list->head, *next; next = node->next, node; node = next)
+	for(list_node_t *node = list->head, *next; next = node ? node->next : NULL, node; node = next)
 		list_free_node(list, node);
 
 	list_free(list);
@@ -178,12 +184,12 @@ void list_delete_list(list_t *list) {
 /* Traversing */
 
 void list_foreach_node(list_t *list, list_action_node_t action) {
-	for(list_node_t *node = list->head, *next; next = node->next, node; node = next)
+	for(list_node_t *node = list->head, *next; next = node ? node->next : NULL, node; node = next)
 		action(node);
 }
 
 void list_foreach(list_t *list, list_action_t action) {
-	for(list_node_t *node = list->head, *next; next = node->next, node; node = next)
+	for(list_node_t *node = list->head, *next; next = node ? node->next : NULL, node; node = next)
 		if(node->data)
 			action(node->data);
 }