diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2014-07-22 22:49:09 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2014-07-29 14:05:17 +0200 |
| commit | b767683a5ea38b0b947e9f26f4b91cf730b5e217 (patch) | |
| tree | 97cb54cadef8464308379e2edb5d75a58b65eed2 /testsuites/sptests | |
| parent | rbtree: Simplify off-tree handling (diff) | |
| download | rtems-b767683a5ea38b0b947e9f26f4b91cf730b5e217.tar.bz2 | |
rbtree: Rename find header in find control
Simplify _RBTree_Find_control(). Avoid superfluous NULL pointer checks.
Diffstat (limited to 'testsuites/sptests')
| -rw-r--r-- | testsuites/sptests/sprbtree01/init.c | 9 | ||||
| -rw-r--r-- | testsuites/sptests/sprbtree01/sprbtree01.scn | 2 |
2 files changed, 3 insertions, 8 deletions
diff --git a/testsuites/sptests/sprbtree01/init.c b/testsuites/sptests/sprbtree01/init.c index 68b2c92039..c43871a441 100644 --- a/testsuites/sptests/sprbtree01/init.c +++ b/testsuites/sptests/sprbtree01/init.c @@ -580,8 +580,8 @@ rtems_task Init( rtems_task_argument ignored ) } p = rb_find_unique(&rbtree1, &search_node.Node); - puts( "INIT - Verify rtems_rbtree_find_header" ); - if (rtems_rbtree_find_header(p) != &rbtree1) { + puts( "INIT - Verify rtems_rbtree_find_control" ); + if (rtems_rbtree_find_control(p) != &rbtree1) { puts ("INIT - ERROR ON RBTREE HEADER MISMATCH"); rtems_test_exit(0); } @@ -620,11 +620,6 @@ rtems_task Init( rtems_task_argument ignored ) rtems_test_exit(0); } - if (rtems_rbtree_find_header(NULL) != NULL) { - puts ("INIT - ERROR ON RBTREE HEADER MISMATCH"); - rtems_test_exit(0); - } - puts("INIT - Insert 20 random numbers"); for (i = 0; i < 20; i++) { node_array[i].id = numbers[i]; diff --git a/testsuites/sptests/sprbtree01/sprbtree01.scn b/testsuites/sptests/sprbtree01/sprbtree01.scn index 0d37566770..73491be6bc 100644 --- a/testsuites/sptests/sprbtree01/sprbtree01.scn +++ b/testsuites/sptests/sprbtree01/sprbtree01.scn @@ -18,7 +18,7 @@ INIT - Removing 100 nodes INIT - Verify rtems_rbtree_get_max with 100 nodes value [0,99] INIT - Verify rtems_rbtree_find INIT - Verify rtems_rbtree_predecessor/successor -INIT - Verify rtems_rbtree_find_header +INIT - Verify rtems_rbtree_find_control INIT - Removing 100 nodes INIT - Insert 20 random numbers INIT - Removing 20 nodes |