From 312ac4074a03931da0752de67fd1c83e54acf93c Mon Sep 17 00:00:00 2001
From: Wolfram Strepp <wstrepp@gmx.de>
Date: Tue, 31 Mar 2009 15:23:45 -0700
Subject: [PATCH] --- yaml --- r: 139180 b: refs/heads/master c:
 55a63998b8967615a15e2211ba0ff3a84a565824 h: refs/heads/master v: v3

---
 [refs]             |  2 +-
 trunk/lib/rbtree.c | 14 ++++----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 084a8931f52a..06e8d3d7f8f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53d6660836f233df66490707365ab177e5fb2bb4
+refs/heads/master: 55a63998b8967615a15e2211ba0ff3a84a565824
diff --git a/trunk/lib/rbtree.c b/trunk/lib/rbtree.c
index 9956b99649f0..f653659e0bc1 100644
--- a/trunk/lib/rbtree.c
+++ b/trunk/lib/rbtree.c
@@ -163,17 +163,14 @@ static void __rb_erase_color(struct rb_node *node, struct rb_node *parent,
 			{
 				if (!other->rb_right || rb_is_black(other->rb_right))
 				{
-					struct rb_node *o_left;
-					if ((o_left = other->rb_left))
-						rb_set_black(o_left);
+					rb_set_black(other->rb_left);
 					rb_set_red(other);
 					__rb_rotate_right(other, root);
 					other = parent->rb_right;
 				}
 				rb_set_color(other, rb_color(parent));
 				rb_set_black(parent);
-				if (other->rb_right)
-					rb_set_black(other->rb_right);
+				rb_set_black(other->rb_right);
 				__rb_rotate_left(parent, root);
 				node = root->rb_node;
 				break;
@@ -200,17 +197,14 @@ static void __rb_erase_color(struct rb_node *node, struct rb_node *parent,
 			{
 				if (!other->rb_left || rb_is_black(other->rb_left))
 				{
-					register struct rb_node *o_right;
-					if ((o_right = other->rb_right))
-						rb_set_black(o_right);
+					rb_set_black(other->rb_right);
 					rb_set_red(other);
 					__rb_rotate_left(other, root);
 					other = parent->rb_left;
 				}
 				rb_set_color(other, rb_color(parent));
 				rb_set_black(parent);
-				if (other->rb_left)
-					rb_set_black(other->rb_left);
+				rb_set_black(other->rb_left);
 				__rb_rotate_right(parent, root);
 				node = root->rb_node;
 				break;