X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Favl_tree.c;fp=src%2Favl_tree.c;h=86eb38823477e72b9f13a37c17153eb281e54cc8;hp=293db45d408903580fb001747082af28ac6b97bc;hb=4a0639235f5f6e28ce9c9cbd21edc71199f85d09;hpb=543d8a6b89049aff65fa7eabf5f4b376a196c8d2 diff --git a/src/avl_tree.c b/src/avl_tree.c index 293db45d..86eb3882 100644 --- a/src/avl_tree.c +++ b/src/avl_tree.c @@ -127,15 +127,6 @@ avl_get_balance_factor(const struct avl_tree_node *node) return (int)(node->parent_balance & 3) - 1; } -/* Sets the balance factor of the specified AVL tree node. This must be - * -1, 0, or 1. */ -static AVL_INLINE void -avl_set_balance_factor(struct avl_tree_node *node, int balance_factor) -{ - node->parent_balance = - (node->parent_balance & ~3) | (balance_factor + 1); -} - /* Adds @amount to the balance factor of the specified AVL tree node. * The caller must ensure this still results in a valid balance factor * (-1, 0, or 1). */ @@ -380,12 +371,10 @@ avl_handle_subtree_growth(struct avl_tree_node ** const root_ptr, */ avl_rotate(root_ptr, parent, -sign); - /* Equivalent to: - * avl_set_balance_factor(parent, 0); */ + /* Equivalent to setting @parent's balance factor to 0. */ avl_adjust_balance_factor(parent, -sign); /* A */ - /* Equivalent to: - * avl_set_balance_factor(node, 0); */ + /* Equivalent to setting @node's balance factor to 0. */ avl_adjust_balance_factor(node, -sign); /* B */ } else { /* @node (B below) is heavy in the direction opposite