X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=lib%2Flist.c;fp=lib%2Flist.c;h=d47ce0ebb8bc36ffd15b8e982da0ccf560feb006;hp=b4c5871c19f41281c407cacce6540a4dff0199d5;hb=9f38e394636a177c00a4545de2a99c661de36386;hpb=f75dcef72a81a337e847adf0bae54198894f65b9 diff --git a/lib/list.c b/lib/list.c index b4c5871c..d47ce0eb 100644 --- a/lib/list.c +++ b/lib/list.c @@ -17,7 +17,7 @@ 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.11 2002/06/21 10:11:11 guus Exp $ + $Id: list.c,v 1.1.2.12 2002/09/09 21:49:16 guus Exp $ */ #include "config.h" @@ -33,165 +33,158 @@ list_t *list_alloc(list_action_t delete) { - list_t *list; + list_t *list; - list = xmalloc_and_zero(sizeof(list_t)); - list->delete = delete; + list = xmalloc_and_zero(sizeof(list_t)); + list->delete = delete; - return list; + return list; } -void list_free(list_t *list) +void list_free(list_t * list) { - free(list); + free(list); } list_node_t *list_alloc_node(void) { - list_node_t *node; - - node = xmalloc_and_zero(sizeof(list_node_t)); - - return node; + return (list_node_t *)xmalloc_and_zero(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) - list->delete(node->data); - - free(node); + if(node->data && list->delete) + list->delete(node->data); + + free(node); } /* Insertion and deletion */ -list_node_t *list_insert_head(list_t *list, void *data) +list_node_t *list_insert_head(list_t * list, void *data) { - list_node_t *node; - - node = list_alloc_node(); - - node->data = data; - node->prev = NULL; - node->next = list->head; - list->head = node; - - if(node->next) - node->next->prev = node; - else - list->tail = node; - - list->count++; - - return node; + list_node_t *node; + + node = list_alloc_node(); + + node->data = data; + node->prev = NULL; + node->next = list->head; + list->head = node; + + if(node->next) + node->next->prev = node; + else + list->tail = node; + + list->count++; + + return node; } -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(); - - node->data = data; - node->next = NULL; - node->prev = list->tail; - list->tail = node; - - if(node->prev) - node->prev->next = node; - else - list->head = node; - - list->count++; - - return node; + list_node_t *node; + + node = list_alloc_node(); + + node->data = data; + node->next = NULL; + node->prev = list->tail; + list->tail = 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) +void list_unlink_node(list_t * list, list_node_t * node) { - if(node->prev) - node->prev->next = node->next; - else - list->head = node->next; - - if(node->next) - node->next->prev = node->prev; - else - list->tail = node->prev; - - list->count--; + if(node->prev) + node->prev->next = node->next; + else + list->head = node->next; + + if(node->next) + node->next->prev = node->prev; + else + list->tail = node->prev; + + list->count--; } -void list_delete_node(list_t *list, list_node_t *node) +void list_delete_node(list_t * list, list_node_t * node) { - list_unlink_node(list, node); - list_free_node(list, node); + list_unlink_node(list, node); + list_free_node(list, node); } -void list_delete_head(list_t *list) +void list_delete_head(list_t * list) { - list_delete_node(list, list->head); + list_delete_node(list, list->head); } -void list_delete_tail(list_t *list) +void list_delete_tail(list_t * list) { - list_delete_node(list, list->tail); + list_delete_node(list, list->tail); } /* Head/tail lookup */ -void *list_get_head(list_t *list) +void *list_get_head(list_t * list) { - if(list->head) - return list->head->data; - else - return NULL; + if(list->head) + return list->head->data; + else + return NULL; } -void *list_get_tail(list_t *list) +void *list_get_tail(list_t * list) { - if(list->tail) - return list->tail->data; - else - return NULL; + if(list->tail) + return list->tail->data; + else + return NULL; } /* Fast list deletion */ -void list_delete_list(list_t *list) +void list_delete_list(list_t * list) { - list_node_t *node, *next; - - for(node = list->head; node; node = next) - { - next = node->next; - list_free_node(list, node); - } - - list_free(list); + list_node_t *node, *next; + + for(node = list->head; node; node = next) { + next = node->next; + list_free_node(list, node); + } + + list_free(list); } /* Traversing */ -void list_foreach_node(list_t *list, list_action_node_t action) +void list_foreach_node(list_t * list, list_action_node_t action) { - list_node_t *node, *next; + list_node_t *node, *next; - for(node = list->head; node; node = next) - { - next = node->next; - action(node); - } + for(node = list->head; node; node = next) { + next = node->next; + action(node); + } } -void list_foreach(list_t *list, list_action_t action) +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) - action(node->data); - } + list_node_t *node, *next; + + for(node = list->head; node; node = next) { + next = node->next; + if(node->data) + action(node->data); + } }