X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=lib%2Favl_tree.c;h=fc3c27e7b039b52eeb27aad62bb0b3feb1dbd60a;hp=575b2f1248a8a42a19a71be9d9d2733ca1fbd1bd;hb=085d33e6265e139bb08cdfda3d7498993190d187;hpb=6f9f6779e6bd1dd7bb795b42dad550863a386ca8

diff --git a/lib/avl_tree.c b/lib/avl_tree.c
index 575b2f12..fc3c27e7 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,2001 Ivo Timmermans <ivo@o2w.nl>,
-                  2000,2001 Guus Sliepen <guus@sliepen.eu.org>
-                  2000,2001 Wessel Dankers <wsl@nl.linux.org>
+                  2000-2003 Ivo Timmermans <ivo@o2w.nl>,
+                  2000-2003 Guus Sliepen <guus@sliepen.eu.org>
+                  2000-2003 Wessel Dankers <wsl@nl.linux.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
@@ -29,7 +29,7 @@
     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.11 2002/09/09 22:32:24 guus Exp $
+    $Id: avl_tree.c,v 1.1.2.15 2003/07/12 17:48:38 guus Exp $
 */
 
 #include <stdio.h>
@@ -53,7 +53,9 @@
 #endif
 
 #ifndef AVL_DEPTH
-int lg(unsigned int u)
+static int lg(unsigned int u) __attribute__ ((const));
+
+static int lg(unsigned int u)
 {
 	int r = 1;
 
@@ -89,7 +91,7 @@ int lg(unsigned int u)
 
 /* Internal helper functions */
 
-int avl_check_balance(avl_node_t *node)
+static int avl_check_balance(avl_node_t *node)
 {
 #ifdef AVL_DEPTH
 	int d;
@@ -117,7 +119,7 @@ int avl_check_balance(avl_node_t *node)
 #endif
 }
 
-void avl_rebalance(avl_tree_t *tree, avl_node_t *node)
+static void avl_rebalance(avl_tree_t *tree, avl_node_t *node)
 {
 	avl_node_t *child;
 	avl_node_t *gchild;
@@ -494,15 +496,22 @@ void avl_insert_top(avl_tree_t *tree, avl_node_t *node)
 void avl_insert_before(avl_tree_t *tree, avl_node_t *before,
 					   avl_node_t *node)
 {
-	if(!before)
-		return tree->tail ? avl_insert_after(tree, tree->tail, node) : avl_insert_top(tree, node);
+	if(!before) {
+		if(tree->tail)
+			avl_insert_after(tree, tree->tail, node);
+		else
+			avl_insert_top(tree, node);
+		return;
+	}
 
 	node->next = before;
 	node->parent = before;
 	node->prev = before->prev;
 
-	if(before->left)
-		return avl_insert_after(tree, before->prev, node);
+	if(before->left) {
+		avl_insert_after(tree, before->prev, node);
+		return;
+	}
 
 	if(before->prev)
 		before->prev->next = node;
@@ -512,18 +521,23 @@ void avl_insert_before(avl_tree_t *tree, avl_node_t *before,
 	before->prev = node;
 	before->left = node;
 
-	avl_rebalance(tree, before->parent);
+	avl_rebalance(tree, before);
 }
 
 void avl_insert_after(avl_tree_t *tree, avl_node_t *after, avl_node_t *node)
 {
-	if(!after)
-		return tree->head ? avl_insert_before(tree, tree->head,
-											  node) : avl_insert_top(tree,
-																	 node);
+	if(!after) {
+		if(tree->head)
+			avl_insert_before(tree, tree->head, node);
+		else
+			avl_insert_top(tree, node);
+		return;
+	}
 
-	if(after->right)
-		return avl_insert_before(tree, after->next, node);
+	if(after->right) {
+		avl_insert_before(tree, after->next, node);
+		return;
+	}
 
 	node->prev = after;
 	node->parent = after;
@@ -537,7 +551,7 @@ void avl_insert_after(avl_tree_t *tree, avl_node_t *after, avl_node_t *node)
 	after->next = node;
 	after->right = node;
 
-	avl_rebalance(tree, after->parent);
+	avl_rebalance(tree, after);
 }
 
 avl_node_t *avl_unlink(avl_tree_t *tree, void *data)