From ed8601cf325b08899bad9da43f4851cd4239192c Mon Sep 17 00:00:00 2001 From: Michel Lespinasse Date: Mon, 8 Oct 2012 16:30:42 -0700 Subject: [PATCH] --- yaml --- r: 332389 b: refs/heads/master c: 1f0528653e41ec230c60f5738820e8a544731399 h: refs/heads/master i: 332387: 9a64d3e46237bb2876b3979ef3618fa0b9cbeb3e v: v3 --- [refs] | 2 +- trunk/lib/rbtree.c | 14 ++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 4c899ce199bd..6c8d7967906e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 910a742d4ba863848c7283d69c21bfa779d3b9a8 +refs/heads/master: 1f0528653e41ec230c60f5738820e8a544731399 diff --git a/trunk/lib/rbtree.c b/trunk/lib/rbtree.c index ccada9abe6f5..12abb8abf442 100644 --- a/trunk/lib/rbtree.c +++ b/trunk/lib/rbtree.c @@ -109,18 +109,15 @@ void rb_insert_color(struct rb_node *node, struct rb_root *root) } } - if (parent->rb_right == node) - { - register struct rb_node *tmp; + if (parent->rb_right == node) { __rb_rotate_left(parent, root); - tmp = parent; parent = node; - node = tmp; } rb_set_black(parent); rb_set_red(gparent); __rb_rotate_right(gparent, root); + break; } else { { register struct rb_node *uncle = gparent->rb_left; @@ -134,18 +131,15 @@ void rb_insert_color(struct rb_node *node, struct rb_root *root) } } - if (parent->rb_left == node) - { - register struct rb_node *tmp; + if (parent->rb_left == node) { __rb_rotate_right(parent, root); - tmp = parent; parent = node; - node = tmp; } rb_set_black(parent); rb_set_red(gparent); __rb_rotate_left(gparent, root); + break; } }