j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Keep track of the number of nodes in a tree.

Browse source
This commit is contained in:
Guus Sliepen 2012-10-21 17:34:53 +02:00
parent 0006c754f2
commit 1f8b70efa0
2 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/splay_tree.c
View file

@ -418,6 +418,7 @@ splay_node_t *splay_insert_node(splay_tree_t *tree, splay_node_t *node) {
void splay_insert_top(splay_tree_t *tree, splay_node_t *node) { void splay_insert_top(splay_tree_t *tree, splay_node_t *node) {
node->prev = node->next = node->left = node->right = node->parent = NULL; node->prev = node->next = node->left = node->right = node->parent = NULL;
tree->head = tree->tail = tree->root = node; tree->head = tree->tail = tree->root = node;
tree->count++;
} }
void splay_insert_before(splay_tree_t *tree, splay_node_t *before, splay_node_t *node) { void splay_insert_before(splay_tree_t *tree, splay_node_t *before, splay_node_t *node) {
@ -446,6 +447,7 @@ void splay_insert_before(splay_tree_t *tree, splay_node_t *before, splay_node_t
node->parent = NULL; node->parent = NULL;
tree->root = node; tree->root = node;
tree->count++;
} }
void splay_insert_after(splay_tree_t *tree, splay_node_t *after, splay_node_t *node) { void splay_insert_after(splay_tree_t *tree, splay_node_t *after, splay_node_t *node) {
@ -474,6 +476,7 @@ void splay_insert_after(splay_tree_t *tree, splay_node_t *after, splay_node_t *n
node->parent = NULL; node->parent = NULL;
tree->root = node; tree->root = node;
tree->count++;
} }
splay_node_t *splay_unlink(splay_tree_t *tree, void *data) { splay_node_t *splay_unlink(splay_tree_t *tree, void *data) {
@ -511,6 +514,8 @@ void splay_unlink_node(splay_tree_t *tree, splay_node_t *node) {
} else { } else {
tree->root = NULL; tree->root = NULL;
} }
tree->count--;
} }
void splay_delete_node(splay_tree_t *tree, splay_node_t *node) { void splay_delete_node(splay_tree_t *tree, splay_node_t *node) {

2
src/splay_tree.h
View file

@ -58,6 +58,8 @@ typedef struct splay_tree_t {
splay_compare_t compare; splay_compare_t compare;
splay_action_t delete; splay_action_t delete;
int count;
} splay_tree_t; } splay_tree_t;
/* (De)constructors */ /* (De)constructors */