X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=lib%2Flist.c;h=2f9f611db39b327464735e3c9f3e4253453cc1a0;hp=d47ce0ebb8bc36ffd15b8e982da0ccf560feb006;hb=a5f899a9794f215e8174455ead04862a2c14a5b1;hpb=9f38e394636a177c00a4545de2a99c661de36386 diff --git a/lib/list.c b/lib/list.c index d47ce0eb..2f9f611d 100644 --- a/lib/list.c +++ b/lib/list.c @@ -1,7 +1,7 @@ /* list.c -- functions to deal with double linked lists - Copyright (C) 2000,2001 Ivo Timmermans - 2000,2001 Guus Sliepen + Copyright (C) 2000-2005 Ivo Timmermans + 2000-2006 Guus Sliepen 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 @@ -17,17 +17,13 @@ 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.12 2002/09/09 21:49:16 guus Exp $ + $Id$ */ -#include "config.h" - -#include - -#include -#include +#include "system.h" #include "list.h" +#include "xalloc.h" /* (De)constructors */ @@ -41,17 +37,17 @@ list_t *list_alloc(list_action_t delete) return list; } -void list_free(list_t * list) +void list_free(list_t *list) { free(list); } list_node_t *list_alloc_node(void) { - return (list_node_t *)xmalloc_and_zero(sizeof(list_node_t)); + return 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); @@ -61,7 +57,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 *list_insert_head(list_t *list, void *data) { list_node_t *node; @@ -82,7 +78,7 @@ list_node_t *list_insert_head(list_t * list, void *data) 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; @@ -103,7 +99,7 @@ list_node_t *list_insert_tail(list_t * list, void *data) 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; @@ -118,25 +114,25 @@ void list_unlink_node(list_t * list, list_node_t * node) 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); } -void list_delete_head(list_t * list) +void list_delete_head(list_t *list) { 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); } /* Head/tail lookup */ -void *list_get_head(list_t * list) +void *list_get_head(list_t *list) { if(list->head) return list->head->data; @@ -144,7 +140,7 @@ void *list_get_head(list_t * list) return NULL; } -void *list_get_tail(list_t * list) +void *list_get_tail(list_t *list) { if(list->tail) return list->tail->data; @@ -154,7 +150,7 @@ void *list_get_tail(list_t * list) /* Fast list deletion */ -void list_delete_list(list_t * list) +void list_delete_list(list_t *list) { list_node_t *node, *next; @@ -168,7 +164,7 @@ void list_delete_list(list_t * 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; @@ -178,7 +174,7 @@ void list_foreach_node(list_t * list, list_action_node_t action) } } -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;