X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=lib%2Flist.c;h=4c4a3f6237f957e96e4a24e1b71da31a625c93eb;hp=4c90b580e7117b8da3ef4dccc024f00da453a7a8;hb=f6905582d0e70ac5b44369780aaa921d9c721197;hpb=d9ce5a7f3f5eddb193b6a9b5974c7c49eac41ea1

diff --git a/lib/list.c b/lib/list.c
index 4c90b580..4c4a3f62 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 Ivo Timmermans <itimmermans@bigfoot.com>
-                  2000 Guus Sliepen <guus@sliepen.warande.net>
+    Copyright (C) 2000,2001 Ivo Timmermans <ivo@o2w.nl>
+                  2000,2001 Guus Sliepen <guus@sliepen.eu.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
@@ -17,130 +17,174 @@
     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.1 2000/11/15 22:04:48 zarq Exp $
+    $Id: list.c,v 1.1.2.13 2002/09/09 22:32:27 guus Exp $
 */
 
 #include "config.h"
 
-#include <string.h>
+#include <stdlib.h>
 
-#include <error.h>
-#include <list.h>
 #include <xalloc.h>
-
 #include <system.h>
 
-/*
-  list_new
+#include "list.h"
 
-  Initialize a new list.
-*/
-list_t *list_new(void)
+/* (De)constructors */
+
+list_t *list_alloc(list_action_t delete)
 {
-  list_t *list;
+	list_t *list;
 
-  list = xmalloc_and_zero(sizeof(list_t));
-  return list;
+	list = xmalloc_and_zero(sizeof(list_t));
+	list->delete = delete;
+
+	return list;
 }
 
-/*
-  list_delete
+void list_free(list_t *list)
+{
+	free(list);
+}
 
-  Delete the element pointed to by idx from the list.
-*/
-list_node_t *list_delete(list_t *list, list_node_t *idx)
+list_node_t *list_alloc_node(void)
 {
-  list_node_t *res;
-  
-  if(!list)
-    return NULL;
-  if(!idx)
-    return NULL;
-
-  if(list->callbacks->delete != NULL)
-    if(list->callbacks->delete(idx->data))
-      error(ERR_WARNING, N_("List callback[delete] failed for %08lx - freeing anyway"), idx->data);
-  
-  free(idx->data);
-  
-  if(idx->prev == NULL)
-    /* First element in list */
-    {
-      res = idx->next;
-      list->head = idx->next;
-    }
-  if(idx->next == NULL)
-    /* Last element in list */
-    {
-      res = NULL;
-      list->tail = idx->prev;
-    }
-  if(idx->prev != NULL && idx->next != NULL)
-    /* Neither first nor last element */
-    {
-      idx->prev->next = idx->next;
-      idx->next->prev = idx->prev;
-    }
-  if(list->head == NULL)
-    list->tail = NULL;
-  else
-    if(list->tail == NULL)
-      list->head = NULL;
-  free(idx);
-  return res;
+	return (list_node_t *)xmalloc_and_zero(sizeof(list_node_t));
 }
 
-/*
-  list_forall_nodes
+void list_free_node(list_t *list, list_node_t *node)
+{
+	if(node->data && list->delete)
+		list->delete(node->data);
 
-  Call function() on each element in the list.  If this function
-  returns non-zero, the element will be removed from the list.
-*/
-void list_forall_nodes(list_t *list, int (*function)(void *data))
+	free(node);
+}
+
+/* Insertion and deletion */
+
+list_node_t *list_insert_head(list_t *list, void *data)
 {
-  list_node_t *p;
-  int res;
-  
-  if(!list)       /* no list given */
-    return;
-  if(!function)   /* no function given */
-    return;
-  if(!list->head) /* list is empty */
-    return;
-  for(p = list->head; p != NULL; p = p->next)
-    {
-      res = function(p->data);
-      if(res != 0)
-	p = list_delete(list, p);
-    }
+	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_destroy
+list_node_t *list_insert_tail(list_t *list, void *data)
+{
+	list_node_t *node;
 
-  Free all datastructures contained in this list.  It uses the delete
-  callback for this list to free each element.
-*/
-void list_destroy(list_t *list)
+	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)
 {
-  if(!list)
-    return;
-  list_destroy_nodes(list);
-  free(list);
+	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--;
 }
 
-/*
-  list_append
+void list_delete_node(list_t *list, list_node_t *node)
+{
+	list_unlink_node(list, node);
+	list_free_node(list, node);
+}
 
-  Append a new node to the list that points to data.
-*/
-list_append(list_t *list, void *data)
+void list_delete_head(list_t *list)
+{
+	list_delete_node(list, list->head);
+}
+
+void list_delete_tail(list_t *list)
+{
+	list_delete_node(list, list->tail);
+}
+
+/* Head/tail lookup */
+
+void *list_get_head(list_t *list)
+{
+	if(list->head)
+		return list->head->data;
+	else
+		return NULL;
+}
+
+void *list_get_tail(list_t *list)
+{
+	if(list->tail)
+		return list->tail->data;
+	else
+		return NULL;
+}
+
+/* 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;
+		list_free_node(list, node);
+	}
+
+	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;
+		action(node);
+	}
+}
+
+void list_foreach(list_t *list, list_action_t action)
 {
-  list_node_t *n;
+	list_node_t *node, *next;
 
-  n = xmalloc_and_zero(sizeof(list_node_t));
-  n->data = data;
-  n->prev = list->tail;
-  list->tail->next = n;
-  list->tail = n;
+	for(node = list->head; node; node = next) {
+		next = node->next;
+		if(node->data)
+			action(node->data);
+	}
 }