Changeset 0ef6e3bf in rtems

Timestamp:

07/24/14 15:50:58 (9 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

4.11, 5, master

Children:

0b9fe3ec

Parents:

993f5ac

git-author:

Sebastian Huber <sebastian.huber@…> (07/24/14 15:50:58)

git-committer:

Sebastian Huber <sebastian.huber@…> (08/07/14 13:59:29)

Message:

rbtree: Simplify _RBTree_Extract()

File:

• cpukit/score/src/rbtreeextract.c (modified) (3 diffs)

cpukit/score/src/rbtreeextract.c

@@ -24 +24 @@
 {
   RBTree_Node     *parent;
-  RBTree_Direction dir;
 
   parent = the_node->parent;
@@ -41 +40 @@
      */
     if ( _RBTree_Is_red( sibling ) ) {
+      RBTree_Direction dir = _RBTree_Direction( the_node, parent );
+      RBTree_Direction opp_dir = _RBTree_Opposite_direction( dir );
+
       parent->color = RBT_RED;
       sibling->color = RBT_BLACK;
-      dir = the_node != parent->child[ 0 ];
       _RBTree_Rotate( parent, dir );
-      sibling = parent->child[ _RBTree_Opposite_direction( dir ) ];
+      sibling = parent->child[ opp_dir ];
     }
 
@@ -67 +68 @@
        * Then switch the sibling and parent colors, and rotate through parent.
        */
-      dir = the_node != parent->child[ 0 ];
+      RBTree_Direction dir = _RBTree_Direction( the_node, parent );
+      RBTree_Direction opp_dir = _RBTree_Opposite_direction( dir );
 
       if (
-        !_RBTree_Is_red( sibling->child[ _RBTree_Opposite_direction( dir ) ] )
+        !_RBTree_Is_red( sibling->child[ opp_dir ] )
       ) {
         sibling->color = RBT_RED;
         sibling->child[ dir ]->color = RBT_BLACK;
-        _RBTree_Rotate( sibling, _RBTree_Opposite_direction( dir ) );
-        sibling = parent->child[ _RBTree_Opposite_direction( dir ) ];
+        _RBTree_Rotate( sibling, opp_dir );
+        sibling = parent->child[ opp_dir ];
       }
 
       sibling->color = parent->color;
       parent->color = RBT_BLACK;
-      sibling->child[ _RBTree_Opposite_direction( dir ) ]->color = RBT_BLACK;
+      sibling->child[ opp_dir ]->color = RBT_BLACK;
       _RBTree_Rotate( parent, dir );
       break; /* done */