X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=lib%2Favl_tree.c;h=6584ddf811374e798243e5e200ae954e4f42c468;hp=65df7b79f946a0e5c7a07631714b6187cb8467a0;hb=df3220a1549f992cbf4a9b6e67c1e67b69896c7d;hpb=e449d94caef963809d417f16497f6f978e10d731

diff --git a/lib/avl_tree.c b/lib/avl_tree.c
index 65df7b79..6584ddf8 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 <ivo@tinc-vpn.org>,
+                  2000-2005 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
@@ -21,15 +21,15 @@
 
     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>.
+    library for inclusion into tinc (http://www.tinc-vpn.org/) by
+    Guus Sliepen <guus@tinc-vpn.org>.
 
-    $Id: avl_tree.c,v 1.1.2.16 2003/07/17 15:06:25 guus Exp $
+    $Id$
 */
 
 #include "system.h"
@@ -52,7 +52,7 @@
 #endif
 
 #ifndef AVL_DEPTH
-static int lg(unsigned int u) __attribute__ ((const));
+static int lg(unsigned int u) __attribute__ ((__const__));
 
 static int lg(unsigned int u)
 {
@@ -90,7 +90,7 @@ static int lg(unsigned int u)
 
 /* Internal helper functions */
 
-static int avl_check_balance(avl_node_t *node)
+static int avl_check_balance(const avl_node_t *node)
 {
 #ifdef AVL_DEPTH
 	int d;
@@ -280,7 +280,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)
@@ -666,7 +666,7 @@ void avl_delete_tree(avl_tree_t *tree)
 
 /* Tree walking */
 
-void avl_foreach(avl_tree_t *tree, avl_action_t action)
+void avl_foreach(const avl_tree_t *tree, avl_action_t action)
 {
 	avl_node_t *node, *next;
 
@@ -676,7 +676,7 @@ void avl_foreach(avl_tree_t *tree, avl_action_t action)
 	}
 }
 
-void avl_foreach_node(avl_tree_t *tree, avl_action_t action)
+void avl_foreach_node(const avl_tree_t *tree, avl_action_t action)
 {
 	avl_node_t *node, *next;
 
@@ -689,7 +689,7 @@ void avl_foreach_node(avl_tree_t *tree, avl_action_t action)
 /* Indexing */
 
 #ifdef AVL_COUNT
-unsigned int avl_count(avl_tree_t *tree)
+unsigned int avl_count(const avl_tree_t *tree)
 {
 	return AVL_NODE_COUNT(tree->root);
 }
@@ -734,7 +734,7 @@ unsigned int avl_index(const avl_node_t *node)
 }
 #endif
 #ifdef AVL_DEPTH
-unsigned int avl_depth(avl_tree_t *tree)
+unsigned int avl_depth(const avl_tree_t *tree)
 {
 	return AVL_NODE_DEPTH(tree->root);
 }