aboutsummaryrefslogtreecommitdiffstats
path: root/lib/rbtree.c
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2006-06-05 15:19:05 -0400
committerDavid Woodhouse <dwmw2@infradead.org>2006-06-05 15:19:05 -0400
commit2f3243aebd8df4d9eecaeca04bbff6c7dbfb2142 (patch)
treea5b5e3ec2be7f9497dc991b7c7914df6fde27b98 /lib/rbtree.c
parentaa783a8f31c79f493bd49ba926b171b79b9839fb (diff)
[RBTREE] Switch rb_colour() et al to en_US spelling of 'color' for consistency
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>
Diffstat (limited to 'lib/rbtree.c')
-rw-r--r--lib/rbtree.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/rbtree.c b/lib/rbtree.c
index 4a7173cad149..1e55ba1c2edf 100644
--- a/lib/rbtree.c
+++ b/lib/rbtree.c
@@ -170,7 +170,7 @@ static void __rb_erase_color(struct rb_node *node, struct rb_node *parent,
170 __rb_rotate_right(other, root); 170 __rb_rotate_right(other, root);
171 other = parent->rb_right; 171 other = parent->rb_right;
172 } 172 }
173 rb_set_colour(other, rb_colour(parent)); 173 rb_set_color(other, rb_color(parent));
174 rb_set_black(parent); 174 rb_set_black(parent);
175 if (other->rb_right) 175 if (other->rb_right)
176 rb_set_black(other->rb_right); 176 rb_set_black(other->rb_right);
@@ -207,7 +207,7 @@ static void __rb_erase_color(struct rb_node *node, struct rb_node *parent,
207 __rb_rotate_left(other, root); 207 __rb_rotate_left(other, root);
208 other = parent->rb_left; 208 other = parent->rb_left;
209 } 209 }
210 rb_set_colour(other, rb_colour(parent)); 210 rb_set_color(other, rb_color(parent));
211 rb_set_black(parent); 211 rb_set_black(parent);
212 if (other->rb_left) 212 if (other->rb_left)
213 rb_set_black(other->rb_left); 213 rb_set_black(other->rb_left);
@@ -239,7 +239,7 @@ void rb_erase(struct rb_node *node, struct rb_root *root)
239 node = left; 239 node = left;
240 child = node->rb_right; 240 child = node->rb_right;
241 parent = rb_parent(node); 241 parent = rb_parent(node);
242 color = rb_colour(node); 242 color = rb_color(node);
243 243
244 if (child) 244 if (child)
245 rb_set_parent(child, parent); 245 rb_set_parent(child, parent);
@@ -249,7 +249,7 @@ void rb_erase(struct rb_node *node, struct rb_root *root)
249 } else 249 } else
250 parent->rb_left = child; 250 parent->rb_left = child;
251 251
252 node->rb_parent_colour = old->rb_parent_colour; 252 node->rb_parent_color = old->rb_parent_color;
253 node->rb_right = old->rb_right; 253 node->rb_right = old->rb_right;
254 node->rb_left = old->rb_left; 254 node->rb_left = old->rb_left;
255 255
@@ -269,7 +269,7 @@ void rb_erase(struct rb_node *node, struct rb_root *root)
269 } 269 }
270 270
271 parent = rb_parent(node); 271 parent = rb_parent(node);
272 color = rb_colour(node); 272 color = rb_color(node);
273 273
274 if (child) 274 if (child)
275 rb_set_parent(child, parent); 275 rb_set_parent(child, parent);