From f53aa8d3026eb97e3c67e44a1c931442dbc95010 Mon Sep 17 00:00:00 2001 From: Gedare Bloom Date: Thu, 3 May 2012 12:43:29 -0400 Subject: rbtree: API changes. Remove rbtree control node from RBTree_Next. The implementation of RBTree_Next was using an awkward construction to detect and avoid accessing the false root of the red-black tree. To deal with the false root, RBTree_Next was comparing node parents with the control node. Instead the false root can be detected by checking if the grandparent of a node exists; the grandparent of the tree's true root is NULL by definition so the root of the tree is found while walking up the tree by checking for the non-existence of a grandparent. This change propagates into the predecessor/successor and iterate functions. --- cpukit/sapi/inline/rtems/rbtree.inl | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'cpukit/sapi/inline') diff --git a/cpukit/sapi/inline/rtems/rbtree.inl b/cpukit/sapi/inline/rtems/rbtree.inl index 804cf382ca..dc53fa0381 100644 --- a/cpukit/sapi/inline/rtems/rbtree.inl +++ b/cpukit/sapi/inline/rtems/rbtree.inl @@ -283,44 +283,40 @@ RTEMS_INLINE_ROUTINE rtems_rbtree_node* rtems_rbtree_find( * @copydoc _RBTree_Predecessor_unprotected() */ RTEMS_INLINE_ROUTINE rtems_rbtree_node* rtems_rbtree_predecessor_unprotected( - const rtems_rbtree_control *rbtree, const rtems_rbtree_node *node ) { - return _RBTree_Predecessor_unprotected( rbtree, node ); + return _RBTree_Predecessor_unprotected( node ); } /** * @copydoc _RBTree_Predecessor() */ RTEMS_INLINE_ROUTINE rtems_rbtree_node* rtems_rbtree_predecessor( - const rtems_rbtree_control *rbtree, const rtems_rbtree_node *node ) { - return _RBTree_Predecessor( rbtree, node ); + return _RBTree_Predecessor( node ); } /** * @copydoc _RBTree_Successor_unprotected() */ RTEMS_INLINE_ROUTINE rtems_rbtree_node* rtems_rbtree_successor_unprotected( - const rtems_rbtree_control *rbtree, const rtems_rbtree_node *node ) { - return _RBTree_Successor_unprotected( rbtree, node ); + return _RBTree_Successor_unprotected( node ); } /** * @copydoc _RBTree_Successor() */ RTEMS_INLINE_ROUTINE rtems_rbtree_node* rtems_rbtree_successor( - const rtems_rbtree_control *rbtree, const rtems_rbtree_node *node ) { - return _RBTree_Successor( rbtree, node ); + return _RBTree_Successor( node ); } /** -- cgit v1.2.3