projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.4' into collectd-5.5
[collectd.git]
/
src
/
daemon
/
utils_avltree.c
diff --git
a/src/daemon/utils_avltree.c
b/src/daemon/utils_avltree.c
index
04e5403
..
da793b3
100644
(file)
--- a/
src/daemon/utils_avltree.c
+++ b/
src/daemon/utils_avltree.c
@@
-617,10
+617,18
@@
int c_avl_pick (c_avl_tree_t *t, void **key, void **value)
n = t->root;
while ((n->left != NULL) || (n->right != NULL))
{
n = t->root;
while ((n->left != NULL) || (n->right != NULL))
{
- int height_left = (n->left == NULL) ? 0 : n->left->height;
- int height_right = (n->right == NULL) ? 0 : n->right->height;
+ if (n->left == NULL)
+ {
+ n = n->right;
+ continue;
+ }
+ else if (n->right == NULL)
+ {
+ n = n->left;
+ continue;
+ }
- if (
height_left > height_r
ight)
+ if (
n->left->height > n->right->he
ight)
n = n->left;
else
n = n->right;
n = n->left;
else
n = n->right;