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

diff --git a/src/list.c b/src/list.c
index 9d4920b7..8d0c9c89 100644
--- a/src/list.c
+++ b/src/list.c
@@ -26,9 +26,7 @@
 /* (De)constructors */
 
 list_t *list_alloc(list_action_t delete) {
-	list_t *list;
-
-	list = xmalloc_and_zero(sizeof(list_t));
+	list_t *list = xmalloc_and_zero(sizeof(list_t));
 	list->delete = delete;
 
 	return list;
@@ -52,9 +50,7 @@ void list_free_node(list_t *list, list_node_t *node) {
 /* Insertion and deletion */
 
 list_node_t *list_insert_head(list_t *list, void *data) {
-	list_node_t *node;
-
-	node = list_alloc_node();
+	list_node_t *node = list_alloc_node();
 
 	node->data = data;
 	node->prev = NULL;
@@ -72,9 +68,7 @@ list_node_t *list_insert_head(list_t *list, void *data) {
 }
 
 list_node_t *list_insert_tail(list_t *list, void *data) {
-	list_node_t *node;
-
-	node = list_alloc_node();
+	list_node_t *node = list_alloc_node();
 
 	node->data = data;
 	node->next = NULL;
@@ -92,9 +86,7 @@ list_node_t *list_insert_tail(list_t *list, void *data) {
 }
 
 list_node_t *list_insert_after(list_t *list, list_node_t *after, void *data) {
-	list_node_t *node;
-
-	node = list_alloc_node();
+	list_node_t *node = list_alloc_node();
 
 	node->data = data;
 	node->next = after->next;
@@ -111,6 +103,26 @@ list_node_t *list_insert_after(list_t *list, list_node_t *after, void *data) {
 	return node;
 }
 
+list_node_t *list_insert_before(list_t *list, list_node_t *before, void *data) {
+	list_node_t *node;
+
+	node = list_alloc_node();
+
+	node->data = data;
+	node->next = before;
+	node->prev = before->prev;
+	before->prev = node;
+
+	if(node->prev)
+		node->prev->next = node;
+	else
+		list->head = node;
+
+	list->count++;
+
+	return node;
+}
+
 void list_unlink_node(list_t *list, list_node_t *node) {
 	if(node->prev)
 		node->prev->next = node->next;
@@ -157,12 +169,8 @@ void *list_get_tail(list_t *list) {
 /* Fast list deletion */
 
 void list_delete_list(list_t *list) {
-	list_node_t *node, *next;
-
-	for(node = list->head; node; node = next) {
-		next = node->next;
+	for(list_node_t *node = list->head, *next; next = node->next, node; node = next)
 		list_free_node(list, node);
-	}
 
 	list_free(list);
 }
@@ -170,20 +178,12 @@ void list_delete_list(list_t *list) {
 /* Traversing */
 
 void list_foreach_node(list_t *list, list_action_node_t action) {
-	list_node_t *node, *next;
-
-	for(node = list->head; node; node = next) {
-		next = node->next;
+	for(list_node_t *node = list->head, *next; next = node->next, node; node = next)
 		action(node);
-	}
 }
 
 void list_foreach(list_t *list, list_action_t action) {
-	list_node_t *node, *next;
-
-	for(node = list->head; node; node = next) {
-		next = node->next;
+	for(list_node_t *node = list->head, *next; next = node->next, node; node = next)
 		if(node->data)
 			action(node->data);
-	}
 }