X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=lib%2Flist.c;h=c5dccb79cd67982050ca2ad300e6cba9ad6f9ef8;hb=f02d3ed3e135b5326003e7f69f8331ff6a3cc219;hp=699b27e461af410c7a86d66feae9363a4c197e69;hpb=5db596c6844169f1eb5f804b72abe99d067aaa5a;p=tinc diff --git a/lib/list.c b/lib/list.c index 699b27e4..c5dccb79 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,22 +17,17 @@ 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.14 2003/07/12 17:41:45 guus Exp $ + $Id$ */ -#include "config.h" - -#include - -#include -#include +#include "system.h" #include "list.h" +#include "xalloc.h" /* (De)constructors */ -list_t *list_alloc(list_action_t delete) -{ +list_t *list_alloc(list_action_t delete) { list_t *list; list = xmalloc_and_zero(sizeof(list_t)); @@ -41,18 +36,15 @@ 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)); +list_node_t *list_alloc_node(void) { + 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,8 +53,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; node = list_alloc_node(); @@ -82,8 +73,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; node = list_alloc_node(); @@ -103,8 +93,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; else @@ -118,34 +107,29 @@ 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; 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 @@ -154,8 +138,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; for(node = list->head; node; node = next) { @@ -168,8 +151,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; for(node = list->head; node; node = next) { @@ -178,8 +160,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; for(node = list->head; node; node = next) {