RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

rbtree: Simplify off-tree handling

Browse Source 
Only use the parent pointer, since this pointer is never NULL for nodes
which are part of a tree.

Rename functions from *_off_rbtree() to *_off_tree().
This commit is contained in:
Sebastian Huber
2014-07-22 19:42:54 +02:00
parent 4cd55724bb
commit 6e93c836e2
3 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
testsuites/sptests/sprbtree01/init.c
View File

@@ -235,8 +235,8 @@ rtems_task Init( rtems_task_argument ignored )
puts( "Init - Initialize rbtree empty" );
rtems_rbtree_initialize_empty( &rbtree1 );
rtems_rbtree_set_off_rbtree( &node1.Node );
rtems_test_assert( rtems_rbtree_is_node_off_rbtree( &node1.Node ) );
rtems_rbtree_set_off_tree( &node1.Node );
rtems_test_assert( rtems_rbtree_is_node_off_tree( &node1.Node ) );
/* verify that the rbtree insert work */
puts( "INIT - Verify rtems_rbtree_insert with two nodes" );
@@ -247,7 +247,7 @@ rtems_task Init( rtems_task_argument ignored )
rb_insert_unique( &rbtree1, &node1.Node );
rb_insert_unique( &rbtree1, &node2.Node );
rtems_test_assert( !rtems_rbtree_is_node_off_rbtree( &node1.Node ) );
rtems_test_assert( !rtems_rbtree_is_node_off_tree( &node1.Node ) );
_RBTree_Rotate(NULL, RBT_LEFT);
i = (node1.Node.parent == &node2.Node);
@@ -360,7 +360,7 @@ rtems_task Init( rtems_task_argument ignored )
puts( "INIT - rtems_rbtree_extract failed");
rtems_test_exit(0);
}
rtems_test_assert( !rtems_rbtree_is_node_off_rbtree( p ) );
rtems_test_assert( !rtems_rbtree_is_node_off_tree( p ) );
rb_insert_unique(&rbtree1, p);
for ( p = rtems_rbtree_get_min(&rbtree1), id = 1 ; p ;