X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=lib%2Favl_tree.c;h=a8bf5d5f733c99863c31cdcd9e19bdf86a0c8fca;hp=95e95e722528ddbf5e0caccc10f91db4d1a9f657;hb=1c2cd7ed273ee1538ff8a13d036c68aa9992c4aa;hpb=d798b8b3d832f8c69769e08cfd64a4d8355faf0e

diff --git a/lib/avl_tree.c b/lib/avl_tree.c
index 95e95e72..a8bf5d5f 100644
--- a/lib/avl_tree.c
+++ b/lib/avl_tree.c
@@ -1,9 +1,9 @@
 /*
     avl_tree.c -- avl_ tree and linked list convenience
     Copyright (C) 1998 Michael H. Buselli
-                  2000-2003 Ivo Timmermans <ivo@o2w.nl>,
-                  2000-2003 Guus Sliepen <guus@sliepen.eu.org>
-                  2000-2003 Wessel Dankers <wsl@nl.linux.org>
+                  2000-2005 Ivo Timmermans,
+                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2005 Wessel Dankers <wsl@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
@@ -15,21 +15,19 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
     Original AVL tree library by Michael H. Buselli <cosine@cosine.org>.
 
-    Modified 2000-11-28 by Wessel Dankers <wsl@nl.linux.org> to use counts
+    Modified 2000-11-28 by Wessel Dankers <wsl@tinc-vpn.org> to use counts
     instead of depths, to add the ->next and ->prev and to generally obfuscate
     the code. Mail me if you found a bug.
 
     Cleaned up and incorporated some of the ideas from the red-black tree
-    library for inclusion into tinc (http://tinc.nl.linux.org/) by
-    Guus Sliepen <guus@sliepen.eu.org>.
-
-    $Id: avl_tree.c,v 1.1.2.18 2003/07/30 21:52:41 guus Exp $
+    library for inclusion into tinc (http://www.tinc-vpn.org/) by
+    Guus Sliepen <guus@tinc-vpn.org>.
 */
 
 #include "system.h"
@@ -280,7 +278,7 @@ void avl_free_tree(avl_tree_t *tree)
 
 avl_node_t *avl_alloc_node(void)
 {
-	return (avl_node_t *)xmalloc_and_zero(sizeof(avl_node_t));
+	return xmalloc_and_zero(sizeof(avl_node_t));
 }
 
 void avl_free_node(avl_tree_t *tree, avl_node_t *node)
@@ -656,7 +654,7 @@ void avl_delete_tree(avl_tree_t *tree)
 {
 	avl_node_t *node, *next;
 
-	for(node = tree->root; node; node = next) {
+	for(node = tree->head; node; node = next) {
 		next = node->next;
 		avl_free_node(tree, node);
 	}