From: Phillip Wood <phillip.wood123@gmail.com>
Date: Mon, 09 Aug 2021 15:17:39 GMT
Subject: Re: [PATCH] diff: drop unused options parameter from cmp_in_block_with_wsd()
Message-ID: <ecb2961f-090e-aa84-4180-65ab43c8920d@gmail.com>
In-Reply-To: <YQxOevw7Q+NYX2YF@coredump.intra.peff.net>

On 05/08/2021 21:47, Jeff King wrote:
> When 8e809cbb2f (diff --color-moved-ws=allow-indentation-change:
> simplify and optimize, 2021-07-20) stopped looking at o->emitted_symbols
> and instead took the symbol as a parameter, we no longer need to look at
> the diff_options struct at all.
> 
> Dropping the unused parameter makes it clear that the function is
> independent of the diff options.

Thanks Peff

Best Wishes

Phillip

> Signed-off-by: Jeff King <peff@peff.net>
> ---
> Just a small cleanup on top of pw/diff-color-moved-fix, which is now in
> 'next'. I noticed due to my -Wunused-parameters patches (which one day
> I'll finally clean up enough to send to the list).
> 
>   diff.c | 5 ++---
>   1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/diff.c b/diff.c
> index 2956c8f710..164af13b4f 100644
> --- a/diff.c
> +++ b/diff.c
> @@ -863,8 +863,7 @@ static int compute_ws_delta(const struct emitted_diff_symbol *a,
>   	return a_width - b_width;
>   }
>   
> -static int cmp_in_block_with_wsd(const struct diff_options *o,
> -				 const struct moved_entry *cur,
> +static int cmp_in_block_with_wsd(const struct moved_entry *cur,
>   				 const struct emitted_diff_symbol *l,
>   				 struct moved_block *pmb)
>   {
> @@ -1016,7 +1015,7 @@ static void pmb_advance_or_null(struct diff_options *o,
>   		if (o->color_moved_ws_handling &
>   		    COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE)
>   			match = cur &&
> -				!cmp_in_block_with_wsd(o, cur, l, &pmb[i]);
> +				!cmp_in_block_with_wsd(cur, l, &pmb[i]);
>   		else
>   			match = cur && cur->es->id == l->id;
>   
>