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
58b8b84
..
fcfbb94
100644
(file)
--- a/
src/daemon/utils_avltree.c
+++ b/
src/daemon/utils_avltree.c
@@
-245,7
+245,7
@@
static void rebalance (c_avl_tree_t *t, c_avl_node_t *n)
{
assert (n->right != NULL);
b_bottom = BALANCE (n->right);
{
assert (n->right != NULL);
b_bottom = BALANCE (n->right);
- assert ((b_bottom >= -1)
||
(b_bottom <= 1));
+ assert ((b_bottom >= -1)
&&
(b_bottom <= 1));
if (b_bottom == 1)
n = rotate_right_left (t, n);
else
if (b_bottom == 1)
n = rotate_right_left (t, n);
else
@@
-255,7
+255,7
@@
static void rebalance (c_avl_tree_t *t, c_avl_node_t *n)
{
assert (n->left != NULL);
b_bottom = BALANCE (n->left);
{
assert (n->left != NULL);
b_bottom = BALANCE (n->left);
- assert ((b_bottom >= -1)
||
(b_bottom <= 1));
+ assert ((b_bottom >= -1)
&&
(b_bottom <= 1));
if (b_bottom == -1)
n = rotate_left_right (t, n);
else
if (b_bottom == -1)
n = rotate_left_right (t, n);
else