projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix the scripts test.
[tinc]
/
src
/
splay_tree.c
diff --git
a/src/splay_tree.c
b/src/splay_tree.c
index
2b6186f
..
4d97373
100644
(file)
--- a/
src/splay_tree.c
+++ b/
src/splay_tree.c
@@
-25,7
+25,7
@@
/* Splay operation */
static splay_node_t *splay_top_down(splay_tree_t *tree, const void *data, int *result) {
/* Splay operation */
static splay_node_t *splay_top_down(splay_tree_t *tree, const void *data, int *result) {
- splay_node_t left = {
NULL}, right = {NULL
};
+ splay_node_t left = {
0}, right = {0
};
splay_node_t *leftbottom = &left, *rightbottom = &right, *child, *grandchild;
splay_node_t *root = tree->root;
int c;
splay_node_t *leftbottom = &left, *rightbottom = &right, *child, *grandchild;
splay_node_t *root = tree->root;
int c;
@@
-463,6
+463,7
@@
void splay_insert_top(splay_tree_t *tree, splay_node_t *node) {
node->prev = node->next = node->left = node->right = node->parent = NULL;
tree->head = tree->tail = tree->root = node;
tree->count++;
node->prev = node->next = node->left = node->right = node->parent = NULL;
tree->head = tree->tail = tree->root = node;
tree->count++;
+ tree->generation++;
}
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) {
@@
-500,6
+501,7
@@
void splay_insert_before(splay_tree_t *tree, splay_node_t *before, splay_node_t
node->parent = NULL;
tree->root = node;
tree->count++;
node->parent = NULL;
tree->root = node;
tree->count++;
+ tree->generation++;
}
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) {
@@
-537,6
+539,7
@@
void splay_insert_after(splay_tree_t *tree, splay_node_t *after, splay_node_t *n
node->parent = NULL;
tree->root = node;
tree->count++;
node->parent = NULL;
tree->root = node;
tree->count++;
+ tree->generation++;
}
splay_node_t *splay_unlink(splay_tree_t *tree, void *data) {
}
splay_node_t *splay_unlink(splay_tree_t *tree, void *data) {
@@
-581,6
+584,7
@@
void splay_unlink_node(splay_tree_t *tree, splay_node_t *node) {
}
tree->count--;
}
tree->count--;
+ tree->generation++;
}
void splay_delete_node(splay_tree_t *tree, splay_node_t *node) {
}
void splay_delete_node(splay_tree_t *tree, splay_node_t *node) {