michaelh/zephyr
1
0
Fork 0
Code Releases Activity

lib: rb: Fix violations to rule 14.4

Browse source 
get_child does not return an essentially boolean type, so it has to be
properly checked against a pointer.

Signed-off-by: Flavio Ceolin <flavio.ceolin@intel.com>
This commit is contained in:
Flavio Ceolin 2021-04-19 10:30:39 -07:00 • committed by Anas Nashif
commit f83c004319
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/os/rb.c
View file

@ -159,8 +159,10 @@ static void fix_extra_red(struct rbnode **stack, int stacksz)
struct rbnode *parent = stack[stacksz - 2];
/* Correct child colors are a precondition of the loop */
CHECK(!get_child(node, 0U) || is_black(get_child(node, 0U)));
CHECK(!get_child(node, 1U) || is_black(get_child(node, 1U)));
CHECK((get_child(node, 0U) == NULL) ||
is_black(get_child(node, 0U)));
CHECK((get_child(node, 1U) == NULL) ||
is_black(get_child(node, 1U)));
if (is_black(parent)) {
return;
@ -389,7 +391,7 @@ void rb_remove(struct rbtree *tree, struct rbnode *node)
hiparent = stacksz > 1 ? stack[stacksz - 2] : NULL;
stack[stacksz++] = node2;
while (get_child(node2, 1U)) {
while (get_child(node2, 1U) != NULL) {
node2 = get_child(node2, 1U);
stack[stacksz++] = node2;
}
@ -441,7 +443,8 @@ void rb_remove(struct rbtree *tree, struct rbnode *node)
set_color(node2, ctmp);
}
CHECK(!get_child(node, 0U) || !get_child(node, 1U));
CHECK((get_child(node, 0U) == NULL) ||
(get_child(node, 1U) == NULL));
struct rbnode *child = get_child(node, 0U);