[PATCH] diff: drop unused options parameter from cmp_in_block_with_wsd()

[PATCH] diff: drop unused options parameter from cmp_in_block_with_wsd()

[Jeff King]

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.

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;
 
-- 
2.33.0.rc0.523.g07fb5e6bbb

Re: [PATCH] diff: drop unused options parameter from cmp_in_block_with_wsd()

[Junio C Hamano]

Jeff King <peff@peff.net> writes:

> 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.
>
> 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).

Nice.

>
>  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;

Re: [PATCH] diff: drop unused options parameter from cmp_in_block_with_wsd()

[Phillip Wood]

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;
>   
>