Re: [PATCH 1/6] xdiff: drop unused mmfile parameters from xdl_do_histogram_diff()

From: Phillip Wood <phillip.wood123@gmail.com>
Date: Aug 19, 2022, 13:32 UTC
Message-ID: <CAPoeCOa6BDsunamy7_GtaSy-gL_0r3kAwDJ7ffA_uiFUzhen9w@mail.gmail.com>
In-Reply-To: <Yv9OpXIQ9dYMQJ4B@coredump.intra.peff.net>

Hi Peff

On Fri, 19 Aug 2022 at 09:49, Jeff King <peff@peff.net> wrote:

Show 5 quoted lines

>
> These are no longer used since 9df0fc3d57 (xdiff: fix a memory leak,
> 2022-02-16), as the caller is expected to call xdl_prepare_env() itself.
> After that change the histogram code only examines the prepared
> xdfenv_t, not the original buffers.

Thanks, I seem to have a blind spot for unused parameters (I think this is at least the third such fix from you for one of my commits), I'm really looking forward to having -Wunused-parameter enabled, thanks for working on it. Looking at the xpatience.c I think we can remove the mmfile_t parameters there as well, they are only end up being used because patience_diff() gets called recursively. I'm about to go off list for a week, but I can look at putting a patch together for that when I get back unless you want to.

Best Wishes

Phillip

Show 51 quoted lines

>
> Signed-off-by: Jeff King <peff@peff.net>
> ---
>  xdiff/xdiffi.c     | 2 +-
>  xdiff/xdiffi.h     | 3 +--
>  xdiff/xhistogram.c | 3 +--
>  3 files changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c
> index 53e803e6bc..8c64519eac 100644
> --- a/xdiff/xdiffi.c
> +++ b/xdiff/xdiffi.c
> @@ -326,7 +326,7 @@ int xdl_do_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
>         }
>
>         if (XDF_DIFF_ALG(xpp->flags) == XDF_HISTOGRAM_DIFF) {
> -               res = xdl_do_histogram_diff(mf1, mf2, xpp, xe);
> +               res = xdl_do_histogram_diff(xpp, xe);
>                 goto out;
>         }
>
> diff --git a/xdiff/xdiffi.h b/xdiff/xdiffi.h
> index 8f1c7c8b04..9d988e0263 100644
> --- a/xdiff/xdiffi.h
> +++ b/xdiff/xdiffi.h
> @@ -58,7 +58,6 @@ int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,
>                   xdemitconf_t const *xecfg);
>  int xdl_do_patience_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
>                 xdfenv_t *env);
> -int xdl_do_histogram_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
> -               xdfenv_t *env);
> +int xdl_do_histogram_diff(xpparam_t const *xpp, xdfenv_t *env);
>
>  #endif /* #if !defined(XDIFFI_H) */
> diff --git a/xdiff/xhistogram.c b/xdiff/xhistogram.c
> index df909004c1..16a8fe2f3f 100644
> --- a/xdiff/xhistogram.c
> +++ b/xdiff/xhistogram.c
> @@ -362,8 +362,7 @@ static int histogram_diff(xpparam_t const *xpp, xdfenv_t *env,
>         return result;
>  }
>
> -int xdl_do_histogram_diff(mmfile_t *file1, mmfile_t *file2,
> -       xpparam_t const *xpp, xdfenv_t *env)
> +int xdl_do_histogram_diff(xpparam_t const *xpp, xdfenv_t *env)
>  {
>         return histogram_diff(xpp, env,
>                 env->xdf1.dstart + 1, env->xdf1.dend - env->xdf1.dstart + 1,
> --
> 2.37.2.928.g0821088f4a
>