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.14 2003/07/06 23:16:27 guus Exp $
*/
#include <stdio.h>
#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;
/* 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;
#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;
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;
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;
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)