diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2014-07-23 13:03:54 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2014-08-07 15:59:29 +0200 |
| commit | 993f5acd25cc3d140689c7a0f2c1912da7b2f0f3 (patch) | |
| tree | b29e5c13f45c05e31e1260f13f800caed13cf2a3 /testsuites/sptests/sprbtree01 | |
| parent | rbtree: Simplify _RBTree_Rotate() (diff) | |
| download | rtems-993f5acd25cc3d140689c7a0f2c1912da7b2f0f3.tar.bz2 | |
rbtree: Simplify insert and extract
Simplify _RBTree_Insert() and _RBTree_Extract(). Remove more
superfluous NULL pointer checks. Change _RBTree_Is_root() to use only
the node. Add parent parameter to _RBTree_Sibling(). Delete
_RBTree_Grandparent() and _RBTree_Parent_sibling().
Diffstat (limited to 'testsuites/sptests/sprbtree01')
| -rw-r--r-- | testsuites/sptests/sprbtree01/init.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/testsuites/sptests/sprbtree01/init.c b/testsuites/sptests/sprbtree01/init.c index 734530e6bd..6a02a53413 100644 --- a/testsuites/sptests/sprbtree01/init.c +++ b/testsuites/sptests/sprbtree01/init.c @@ -816,13 +816,13 @@ static bool visit_nodes( rtems_test_assert( td->key == tn->key ); if ( td->parent == NULL ) { - rtems_test_assert( td->parent == tn->Node.parent->parent ); + rtems_test_assert( rtems_rbtree_is_root( &tn->Node ) ); } else { - rtems_test_assert( td->parent == tn->Node.parent ); + rtems_test_assert( td->parent == rtems_rbtree_parent( &tn->Node ) ); } - rtems_test_assert( td->left == tn->Node.child[ RBT_LEFT ] ); - rtems_test_assert( td->right == tn->Node.child[ RBT_RIGHT ] ); + rtems_test_assert( td->left == rtems_rbtree_left( &tn->Node ) ); + rtems_test_assert( td->right == rtems_rbtree_right( &tn->Node ) ); rtems_test_assert( td->color == tn->Node.color ); ++ctx->current; @@ -1194,12 +1194,6 @@ rtems_task Init( rtems_task_argument ignored ) rtems_test_exit(0); } - if ( _RBTree_Sibling( NULL ) != NULL ) - puts ( "INIT - ERROR ON RBTREE NULL SIBLING MISMATCH" ); - if ( _RBTree_Sibling( rbtree1.root ) != NULL ) - puts ( "INIT - ERROR ON RBTREE NULL SIBLING MISMATCH" ); - if ( _RBTree_Grandparent( NULL ) != NULL ) - puts ( "INIT - ERROR ON RBTREE NULL GRANDPARENT MISMATCH" ); if ( _RBTree_Is_red( NULL ) != 0 ) puts ( "INIT - ERROR ON RBTREE NULL IS RED MISMATCH" ); if ( _RBTree_Is_red( rbtree1.root ) != 0 ) |