Fix deleting connections from the connection list.

diff --git a/src/connection.c b/src/connection.c
index cbe704b537e24c246df59a5af43bd3f3e05456a1..598b5e591d348c2a662e93f8841288f849290cc1 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -91,12 +91,7 @@ void connection_add(connection_t *c) {
 }
 
 void connection_del(connection_t *c) {
-       for list_each(connection_t, c, connection_list) {
-               if(node->data == c) {
-                       list_delete_node(connection_list, node);
-                       return;
-               }
-       }
+       list_delete(connection_list, c);
 }
 
 bool dump_connections(connection_t *cdump) {

diff --git a/src/list.c b/src/list.c
index 8d0c9c89e31c59c2b341c5c2303bed13c59450c9..18765d4907b3fb8e7c1253c9163521938ed2a7d5 100644 (file)
--- a/src/list.c
+++ b/src/list.c
@@ -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);
 }

diff --git a/src/list.h b/src/list.h
index 855b42723bc448a3dfc115ecedd7abbe9e134b24..4a863167e233abd24831eaebf120a60d2253f9fa 100644 (file)
--- a/src/list.h
+++ b/src/list.h
@@ -57,6 +57,8 @@ extern list_node_t *list_insert_tail(list_t *, void *);
 extern list_node_t *list_insert_after(list_t *, list_node_t *, void *);
 extern list_node_t *list_insert_before(list_t *, list_node_t *, void *);
 
+extern void list_delete(list_t *, const void *);
+
 extern void list_unlink_node(list_t *, list_node_t *);
 extern void list_delete_node(list_t *, list_node_t *);