GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-22 06:32:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[RBTREE] Switch rb_colour() et al to en_US spelling of 'color' for consistency

Browse source 
Since rb_insert_color() is part of the _public_ API, while the others are
purely internal, switch to be consistent with that.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
This commit is contained in:
David Woodhouse 2006-06-05 20:19:05 +01:00
parent aa783a8f31
commit 2f3243aebd
2 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/rbtree.c
View file

@ -170,7 +170,7 @@ static void __rb_erase_color(struct rb_node *node, struct rb_node *parent,
__rb_rotate_right(other, root);
other = parent->rb_right;
}
rb_set_colour(other, rb_colour(parent));
rb_set_color(other, rb_color(parent));
rb_set_black(parent);
if (other->rb_right)
rb_set_black(other->rb_right);
@ -207,7 +207,7 @@ static void __rb_erase_color(struct rb_node *node, struct rb_node *parent,
__rb_rotate_left(other, root);
other = parent->rb_left;
}
rb_set_colour(other, rb_colour(parent));
rb_set_color(other, rb_color(parent));
rb_set_black(parent);
if (other->rb_left)
rb_set_black(other->rb_left);
@ -239,7 +239,7 @@ void rb_erase(struct rb_node *node, struct rb_root *root)
node = left;
child = node->rb_right;
parent = rb_parent(node);
color = rb_colour(node);
color = rb_color(node);
if (child)
rb_set_parent(child, parent);
@ -249,7 +249,7 @@ void rb_erase(struct rb_node *node, struct rb_root *root)
} else
parent->rb_left = child;
node->rb_parent_colour = old->rb_parent_colour;
node->rb_parent_color = old->rb_parent_color;
node->rb_right = old->rb_right;
node->rb_left = old->rb_left;
@ -269,7 +269,7 @@ void rb_erase(struct rb_node *node, struct rb_root *root)
}
parent = rb_parent(node);
color = rb_colour(node);
color = rb_color(node);
if (child)
rb_set_parent(child, parent);