projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CI: Ignore gcrypt sources when running clang-tidy.
[tinc]
/
src
/
list.c
diff --git
a/src/list.c
b/src/list.c
index
9d4920b
..
50f3fdb
100644
(file)
--- 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
/*
list.c -- functions to deal with double linked lists
Copyright (C) 2000-2005 Ivo Timmermans
- 2000-20
06
Guus Sliepen <guus@tinc-vpn.org>
+ 2000-20
13
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
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,9
+26,7
@@
/* (De)constructors */
list_t *list_alloc(list_action_t delete) {
/* (De)constructors */
list_t *list_alloc(list_action_t delete) {
- list_t *list;
-
- list = xmalloc_and_zero(sizeof(list_t));
+ list_t *list = xzalloc(sizeof(list_t));
list->delete = delete;
return list;
list->delete = delete;
return list;
@@
-39,12
+37,13
@@
void list_free(list_t *list) {
}
list_node_t *list_alloc_node(void) {
}
list_node_t *list_alloc_node(void) {
- return x
malloc_and_zero
(sizeof(list_node_t));
+ return x
zalloc
(sizeof(list_node_t));
}
void list_free_node(list_t *list, list_node_t *node) {
}
void list_free_node(list_t *list, list_node_t *node) {
- if(node->data && list->delete)
+ if(node->data && list->delete)
{
list->delete(node->data);
list->delete(node->data);
+ }
free(node);
}
free(node);
}
@@
-52,19
+51,18
@@
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) {
/* 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;
node->next = list->head;
list->head = node;
node->data = data;
node->prev = NULL;
node->next = list->head;
list->head = node;
- if(node->next)
+ if(node->next)
{
node->next->prev = node;
node->next->prev = node;
- else
+ } else {
list->tail = node;
list->tail = node;
+ }
list->count++;
list->count++;
@@
-72,19
+70,18
@@
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 *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;
node->prev = list->tail;
list->tail = node;
node->data = data;
node->next = NULL;
node->prev = list->tail;
list->tail = node;
- if(node->prev)
+ if(node->prev)
{
node->prev->next = node;
node->prev->next = node;
- else
+ } else {
list->head = node;
list->head = node;
+ }
list->count++;
list->count++;
@@
-92,19
+89,39
@@
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 *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;
node->prev = after;
after->next = node;
node->data = data;
node->next = after->next;
node->prev = after;
after->next = node;
- if(node->next)
+ if(node->next)
{
node->next->prev = node;
node->next->prev = node;
- else
+ } else {
list->tail = node;
list->tail = node;
+ }
+
+ list->count++;
+
+ 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++;
list->count++;
@@
-112,15
+129,17
@@
list_node_t *list_insert_after(list_t *list, list_node_t *after, void *data) {
}
void list_unlink_node(list_t *list, list_node_t *node) {
}
void list_unlink_node(list_t *list, list_node_t *node) {
- if(node->prev)
+ if(node->prev)
{
node->prev->next = node->next;
node->prev->next = node->next;
- else
+ } else {
list->head = node->next;
list->head = node->next;
+ }
- if(node->next)
+ if(node->next)
{
node->next->prev = node->prev;
node->next->prev = node->prev;
- else
+ } else {
list->tail = node->prev;
list->tail = node->prev;
+ }
list->count--;
}
list->count--;
}
@@
-138,52
+157,59
@@
void list_delete_tail(list_t *list) {
list_delete_node(list, list->tail);
}
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) {
/* Head/tail lookup */
void *list_get_head(list_t *list) {
- if(list->head)
+ if(list->head)
{
return list->head->data;
return list->head->data;
- else
+ } else {
return NULL;
return NULL;
+ }
}
void *list_get_tail(list_t *list) {
}
void *list_get_tail(list_t *list) {
- if(list->tail)
+ if(list->tail)
{
return list->tail->data;
return list->tail->data;
- else
+ } else {
return NULL;
return NULL;
+ }
}
/* Fast list deletion */
}
/* 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;
+void list_empty_list(list_t *list) {
+ for(list_node_t *node = list->head, *next; next = node ? node->next : NULL, node; node = next) {
list_free_node(list, node);
}
list_free_node(list, node);
}
+ list->head = NULL;
+ list->tail = NULL;
+ list->count = 0;
+}
+
+void list_delete_list(list_t *list) {
+ list_empty_list(list);
list_free(list);
}
/* Traversing */
void list_foreach_node(list_t *list, list_action_node_t action) {
list_free(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 ? node->next : NULL, node; node = next) {
action(node);
}
}
void list_foreach(list_t *list, list_action_t action) {
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;
- if(node->data)
+ for(list_node_t *node = list->head, *next; next = node ? node->next : NULL, node; node = next)
+ if(node->data) {
action(node->data);
action(node->data);
- }
+
}
}
}