projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clear subnets before using them.
[tinc]
/
lib
/
avl_tree.c
diff --git
a/lib/avl_tree.c
b/lib/avl_tree.c
index
8630d4d
..
8ec680b
100644
(file)
--- a/
lib/avl_tree.c
+++ b/
lib/avl_tree.c
@@
-1,8
+1,8
@@
/*
avl_tree.c -- avl_ tree and linked list convenience
Copyright (C) 1998 Michael H. Buselli
/*
avl_tree.c -- avl_ tree and linked list convenience
Copyright (C) 1998 Michael H. Buselli
- 2000,2001 Ivo Timmermans <i
timmermans@bigfoot.com
>,
- 2000,2001 Guus Sliepen <guus@sliepen.
warande.net
>
+ 2000,2001 Ivo Timmermans <i
vo@o2w.nl
>,
+ 2000,2001 Guus Sliepen <guus@sliepen.
eu.org
>
2000,2001 Wessel Dankers <wsl@nl.linux.org>
This program is free software; you can redistribute it and/or modify
2000,2001 Wessel Dankers <wsl@nl.linux.org>
This program is free software; you can redistribute it and/or modify
@@
-27,9
+27,9
@@
Cleaned up and incorporated some of the ideas from the red-black tree
library for inclusion into tinc (http://tinc.nl.linux.org/) by
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.
warande.net
>.
+ Guus Sliepen <guus@sliepen.
eu.org
>.
- $Id: avl_tree.c,v 1.1.2.
5 2001/02/06 10:13:2
1 guus Exp $
+ $Id: avl_tree.c,v 1.1.2.
9 2002/06/21 10:11:1
1 guus Exp $
*/
#include <stdio.h>
*/
#include <stdio.h>
@@
-430,7
+430,7
@@
avl_node_t *avl_insert(avl_tree_t *tree, void *data)
new->data = data;
avl_insert_after(tree, closest, new);
break;
new->data = data;
avl_insert_after(tree, closest, new);
break;
-
case 0
:
+
default
:
return NULL;
}
}
return NULL;
}
}
@@
-493,6
+493,9
@@
void avl_insert_before(avl_tree_t *tree, avl_node_t *before, avl_node_t *node)
node->parent = before;
node->prev = before->prev;
node->parent = before;
node->prev = before->prev;
+ if(before->left)
+ return avl_insert_after(tree, before->prev, node);
+
if (before->prev)
before->prev->next = node;
else
if (before->prev)
before->prev->next = node;
else
@@
-509,6
+512,9
@@
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)
return tree->head ? avl_insert_before(tree, tree->head, node) : avl_insert_top(tree, node);
+ if(after->right)
+ return avl_insert_before(tree, after->next, node);
+
node->prev = after;
node->parent = after;
node->next = after->next;
node->prev = after;
node->parent = after;
node->next = after->next;
@@
-591,6
+597,15
@@
void avl_unlink_node(avl_tree_t *tree, avl_node_t *node)
}
avl_rebalance(tree, balnode);
}
avl_rebalance(tree, balnode);
+
+ node->next = node->prev = node->parent = node->left = node->right = NULL;
+
+#ifdef AVL_COUNT
+ node->count = 0;
+#endif
+#ifdef AVL_DEPTH
+ node->depth = 0;
+#endif
}
void avl_delete_node(avl_tree_t *tree, avl_node_t *node)
}
void avl_delete_node(avl_tree_t *tree, avl_node_t *node)