diff options
| author | Jeff King <peff@peff.net> | 2022-08-19 08:49:41 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-08-19 19:20:24 (GMT) |
| commit | f1d019071ea68cb2bd2602b925d7a3726ded22e9 (patch) | |
| tree | 5414a91709bc190c9d5501e80f219aa14920c816 /xdiff | |
| parent | 795ea8776befc95ea2becd8020c7a284677b4161 (diff) | |
| download | git-f1d019071ea68cb2bd2602b925d7a3726ded22e9.zip git-f1d019071ea68cb2bd2602b925d7a3726ded22e9.tar.gz git-f1d019071ea68cb2bd2602b925d7a3726ded22e9.tar.bz2 | |
xdiff: drop unused mmfile parameters from xdl_do_histogram_diff()
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff')
| -rw-r--r-- | xdiff/xdiffi.c | 2 | ||||
| -rw-r--r-- | xdiff/xdiffi.h | 3 | ||||
| -rw-r--r-- | xdiff/xhistogram.c | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c index 53e803e..8c64519 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 8f1c7c8..9d988e0 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 df90900..16a8fe2 100644 --- a/xdiff/xhistogram.c +++ b/xdiff/xhistogram.c @@ -362,8 +362,7 @@ out: 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, |