projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Non-zero exit code when reloading config file fails after SIGHUP.
[tinc]
/
src
/
splay_tree.c
diff --git
a/src/splay_tree.c
b/src/splay_tree.c
index
07478f2
..
6b5b56f
100644
(file)
--- a/
src/splay_tree.c
+++ b/
src/splay_tree.c
@@
-238,7
+238,7
@@
static void splay_bottom_up(splay_tree_t *tree, splay_node_t *node) {
splay_tree_t *splay_alloc_tree(splay_compare_t compare, splay_action_t delete) {
splay_tree_t *tree;
splay_tree_t *splay_alloc_tree(splay_compare_t compare, splay_action_t delete) {
splay_tree_t *tree;
- tree = x
malloc_and_zero
(sizeof(splay_tree_t));
+ tree = x
zalloc
(sizeof(splay_tree_t));
tree->compare = compare;
tree->delete = delete;
tree->compare = compare;
tree->delete = delete;
@@
-250,7
+250,7
@@
void splay_free_tree(splay_tree_t *tree) {
}
splay_node_t *splay_alloc_node(void) {
}
splay_node_t *splay_alloc_node(void) {
- return x
malloc_and_zero
(sizeof(splay_node_t));
+ return x
zalloc
(sizeof(splay_node_t));
}
void splay_free_node(splay_tree_t *tree, splay_node_t *node) {
}
void splay_free_node(splay_tree_t *tree, splay_node_t *node) {
@@
-398,6
+398,8
@@
splay_node_t *splay_insert_node(splay_tree_t *tree, splay_node_t *node) {
splay_node_t *closest;
int result;
splay_node_t *closest;
int result;
+ node->left = node->right = node->parent = node->next = node->prev = NULL;
+
if(!tree->root)
splay_insert_top(tree, node);
else {
if(!tree->root)
splay_insert_top(tree, node);
else {