Re: [PATCH 2/5] kern (rbtree_insert_rebalance): rewrite node swap

[Samuel Thibault]

Marin Ramesa, le Sun 10 Nov 2013 22:50:21 +0100, a écrit :
> Value of node is never read. Simplify the node swap to one assignment
> and remove the temporary variable.
> 
> * kern/rbtree.c (rbtree_insert_rebalance): Simplify node swap.

I'd rather keep it as such, as an expression of the rbtree rotation.

> ---
>  kern/rbtree.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/kern/rbtree.c b/kern/rbtree.c
> index 0f5eb9a..d90a8bc 100644
> --- a/kern/rbtree.c
> +++ b/kern/rbtree.c
> @@ -147,7 +147,7 @@ static void rbtree_rotate(struct rbtree *tree, struct 
> rbtree_node *node,
>  void rbtree_insert_rebalance(struct rbtree *tree, struct rbtree_node *parent,
>                               int index, struct rbtree_node *node)
>  {
> -    struct rbtree_node *grand_parent, *uncle, *tmp;
> +    struct rbtree_node *grand_parent, *uncle;
>      int left, right;
>  
>      assert(rbtree_check_alignment(parent));
> @@ -196,9 +196,7 @@ void rbtree_insert_rebalance(struct rbtree *tree, struct 
> rbtree_node *parent,
>           */
>          if (parent->children[right] == node) {
>              rbtree_rotate(tree, parent, left);
> -            tmp = node;
> -            node = parent;
> -            parent = tmp;
> +            parent = node;
>          }
>  
>          /*
> -- 
> 1.8.1.4
> 
> 

-- 
Samuel
<N> un driver qui fait quoi, alors ?
<y> ben pour les bips
<s> pour passer les oops en morse
 -+- #ens-mim - vive les rapports de bug -+-