[PATCH 1/6] xdiff: drop unused mmfile parameters from xdl_do_histogram_diff()
- From
Jeff King <peff@peff.net>
- Date
- Aug 19, 2022, 08:49 UTC
- Message-ID
- <Yv9OpXIQ9dYMQJ4B@coredump.intra.peff.net>
- In-Reply-To
- <Yv9Oay+tNqhLDqVl@coredump.intra.peff.net>
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.
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