diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2014-07-22 19:42:54 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2014-07-29 14:05:08 +0200 |
| commit | 6e93c836e26c28a01e2e6c4a14470b93aed03999 (patch) | |
| tree | 57a3fc35c5e0b28ef8fb49061d0d8ff04c318690 /testsuites/sptests/sprbtree01 | |
| parent | Delete unused *_Is_null() functions (diff) | |
| download | rtems-6e93c836e26c28a01e2e6c4a14470b93aed03999.tar.bz2 | |
rbtree: Simplify off-tree handling
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().
Diffstat (limited to 'testsuites/sptests/sprbtree01')
| -rw-r--r-- | testsuites/sptests/sprbtree01/init.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/testsuites/sptests/sprbtree01/init.c b/testsuites/sptests/sprbtree01/init.c index 2c62d12b6d..68b2c92039 100644 --- a/testsuites/sptests/sprbtree01/init.c +++ b/testsuites/sptests/sprbtree01/init.c @@ -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 ; |