diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2014-07-12 14:22:22 -0500 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@oarcorp.com> | 2014-07-15 10:03:48 -0500 |
commit | 64939bc9efcaf945b493e9c371901de33c3868a3 (patch) | |
tree | e196959688afe714c8c334f93598cb99234970e4 /cpukit/score/src/rbtree.c | |
parent | rbtree: Delete unused functions (diff) | |
download | rtems-64939bc9efcaf945b493e9c371901de33c3868a3.tar.bz2 |
rbtree: Reduce RBTree_Control size
Remove compare function and is unique indicator from the control
structure. Rename RBTree_Compare_function to RBTree_Compare. Rename
rtems_rbtree_compare_function to rtems_rbtree_compare. Provide C++
compatible initializers. Add compare function and is unique indicator
to _RBTree_Find(), _RBTree_Insert(), rtems_rbtree_find() and
rtems_rbtree_insert(). Remove _RBTree_Is_unique() and
rtems_rbtree_is_unique(). Remove compare function and is unique
indicator from _RBTree_Initialize_empty() and
rtems_rbtree_initialize_empty().
Diffstat (limited to 'cpukit/score/src/rbtree.c')
-rw-r--r-- | cpukit/score/src/rbtree.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/cpukit/score/src/rbtree.c b/cpukit/score/src/rbtree.c index 958aed005a..5e8520da5e 100644 --- a/cpukit/score/src/rbtree.c +++ b/cpukit/score/src/rbtree.c @@ -23,12 +23,12 @@ #include <rtems/score/isr.h> void _RBTree_Initialize( - RBTree_Control *the_rbtree, - RBTree_Compare_function compare_function, - void *starting_address, - size_t number_nodes, - size_t node_size, - bool is_unique + RBTree_Control *the_rbtree, + RBTree_Compare compare, + void *starting_address, + size_t number_nodes, + size_t node_size, + bool is_unique ) { size_t count; @@ -38,13 +38,12 @@ void _RBTree_Initialize( if (!the_rbtree) return; /* could do sanity checks here */ - _RBTree_Initialize_empty(the_rbtree, compare_function, is_unique); + _RBTree_Initialize_empty( the_rbtree ); count = number_nodes; next = starting_address; while ( count-- ) { - _RBTree_Insert(the_rbtree, next); - next = (RBTree_Node *) - _Addresses_Add_offset( (void *) next, node_size ); + _RBTree_Insert( the_rbtree, next, compare, is_unique ); + next = (RBTree_Node *) _Addresses_Add_offset( next, node_size ); } } |