rb_tree: reorganize code in rb_erase() for additional changes
PATCH 1/3 rb_tree: reorganize code in rb_erase() for additional changes
First, move some code around in order to make the next change more obvious.
Signed-off-by Peter Zijlstra <[email protected]>
Signed-off-by Wolfram Strepp <[email protected]>
--- lib/rbtree.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
lib/rbtree.c +10 -9
@@ -237,6 +237,16 @@ void rb_erase(struct rb_node *node, stru node = node->rb_right;while ((left = node->rb_left) !=NULL ) node = left; + +if (rb_parent (old)) + { +if (rb_parent (old)->rb_left == old) +rb_parent (old)->rb_left = node; +else +rb_parent (old)->rb_right = node; + }else + root->rb_node = node; + child = node->rb_right; parent =rb_parent (node); color =rb_color (node);
@@ -253,15 +263,6 @@ void rb_erase(struct rb_node *node, stru node->rb_right = old->rb_right; node->rb_left = old->rb_left; -if (rb_parent (old)) - { -if (rb_parent (old)->rb_left == old) -rb_parent (old)->rb_left = node; -else -rb_parent (old)->rb_right = node; - }else - root->rb_node = node; -rb_set_parent (old->rb_left, node);if (old->rb_right)rb_set_parent (old->rb_right, node);
Signature · 1 line
Psssst! Schon vom neuen GMX MultiMessenger gehört? Der kann`s mit allen: http://www.gmx.net/de/go/multimessenger01