From fee078ad4ced742f436a86dfcf8d10820fbe7b2e Mon Sep 17 00:00:00 2001 From: Ezekiel Newren Date: Fri, 2 Jan 2026 18:52:22 +0000 Subject: [PATCH] xdiff: replace xdfile_t.dend with xdfenv_t.delta_end View with --color-words. Same argument as delta_start. Signed-off-by: Ezekiel Newren Signed-off-by: Junio C Hamano --- xdiff/xhistogram.c | 7 +++++-- xdiff/xpatience.c | 7 +++++-- xdiff/xprepare.c | 19 ++++++++++--------- xdiff/xtypes.h | 3 +-- 4 files changed, 21 insertions(+), 15 deletions(-) diff --git a/xdiff/xhistogram.c b/xdiff/xhistogram.c index eb6a52d9ba..b4d6f88748 100644 --- a/xdiff/xhistogram.c +++ b/xdiff/xhistogram.c @@ -364,7 +364,10 @@ out: int xdl_do_histogram_diff(xpparam_t const *xpp, xdfenv_t *env) { + ptrdiff_t dend1 = env->xdf1.nrec - 1 - env->delta_end; + ptrdiff_t dend2 = env->xdf2.nrec - 1 - env->delta_end; + return histogram_diff(xpp, env, - env->delta_start + 1, env->xdf1.dend - env->delta_start + 1, - env->delta_start + 1, env->xdf2.dend - env->delta_start + 1); + env->delta_start + 1, dend1 - env->delta_start + 1, + env->delta_start + 1, dend2 - env->delta_start + 1); } diff --git a/xdiff/xpatience.c b/xdiff/xpatience.c index bd0ffbb417..5b8bb34d2b 100644 --- a/xdiff/xpatience.c +++ b/xdiff/xpatience.c @@ -373,7 +373,10 @@ static int patience_diff(xpparam_t const *xpp, xdfenv_t *env, int xdl_do_patience_diff(xpparam_t const *xpp, xdfenv_t *env) { + ptrdiff_t dend1 = env->xdf1.nrec - 1 - env->delta_end; + ptrdiff_t dend2 = env->xdf2.nrec - 1 - env->delta_end; + return patience_diff(xpp, env, - env->delta_start + 1, env->xdf1.dend - env->delta_start + 1, - env->delta_start + 1, env->xdf2.dend - env->delta_start + 1); + env->delta_start + 1, dend1 - env->delta_start + 1, + env->delta_start + 1, dend2 - env->delta_start + 1); } diff --git a/xdiff/xprepare.c b/xdiff/xprepare.c index e88468e74c..d3cdb6ac02 100644 --- a/xdiff/xprepare.c +++ b/xdiff/xprepare.c @@ -173,7 +173,6 @@ static int xdl_prepare_ctx(mmfile_t *mf, xdfile_t *xdf, uint64_t flags) { xdf->changed += 1; xdf->nreff = 0; - xdf->dend = xdf->nrec - 1; return 0; @@ -267,6 +266,8 @@ static int xdl_cleanup_records(xdlclassifier_t *cf, xdfenv_t *xe) { uint8_t *action1 = NULL, *action2 = NULL; bool need_min = !!(cf->flags & XDF_NEED_MINIMAL); int ret = 0; + ptrdiff_t dend1 = xe->xdf1.nrec - 1 - xe->delta_end; + ptrdiff_t dend2 = xe->xdf2.nrec - 1 - xe->delta_end; /* * Create temporary arrays that will help us decide if @@ -286,7 +287,7 @@ static int xdl_cleanup_records(xdlclassifier_t *cf, xdfenv_t *xe) { */ if ((mlim = xdl_bogosqrt((long)xe->xdf1.nrec)) > XDL_MAX_EQLIMIT) mlim = XDL_MAX_EQLIMIT; - for (i = xe->delta_start, recs = &xe->xdf1.recs[xe->delta_start]; i <= xe->xdf1.dend; i++, recs++) { + for (i = xe->delta_start, recs = &xe->xdf1.recs[xe->delta_start]; i <= dend1; i++, recs++) { rcrec = cf->rcrecs[recs->minimal_perfect_hash]; nm = rcrec ? rcrec->len2 : 0; action1[i] = (nm == 0) ? DISCARD: (nm >= mlim && !need_min) ? INVESTIGATE: KEEP; @@ -294,7 +295,7 @@ static int xdl_cleanup_records(xdlclassifier_t *cf, xdfenv_t *xe) { if ((mlim = xdl_bogosqrt((long)xe->xdf2.nrec)) > XDL_MAX_EQLIMIT) mlim = XDL_MAX_EQLIMIT; - for (i = xe->delta_start, recs = &xe->xdf2.recs[xe->delta_start]; i <= xe->xdf2.dend; i++, recs++) { + for (i = xe->delta_start, recs = &xe->xdf2.recs[xe->delta_start]; i <= dend2; i++, recs++) { rcrec = cf->rcrecs[recs->minimal_perfect_hash]; nm = rcrec ? rcrec->len1 : 0; action2[i] = (nm == 0) ? DISCARD: (nm >= mlim && !need_min) ? INVESTIGATE: KEEP; @@ -306,9 +307,9 @@ static int xdl_cleanup_records(xdlclassifier_t *cf, xdfenv_t *xe) { */ xe->xdf1.nreff = 0; for (i = xe->delta_start, recs = &xe->xdf1.recs[xe->delta_start]; - i <= xe->xdf1.dend; i++, recs++) { + i <= dend1; i++, recs++) { if (action1[i] == KEEP || - (action1[i] == INVESTIGATE && !xdl_clean_mmatch(action1, i, xe->delta_start, xe->xdf1.dend))) { + (action1[i] == INVESTIGATE && !xdl_clean_mmatch(action1, i, xe->delta_start, dend1))) { xe->xdf1.reference_index[xe->xdf1.nreff++] = i; /* changed[i] remains false, i.e. keep */ } else @@ -318,9 +319,9 @@ static int xdl_cleanup_records(xdlclassifier_t *cf, xdfenv_t *xe) { xe->xdf2.nreff = 0; for (i = xe->delta_start, recs = &xe->xdf2.recs[xe->delta_start]; - i <= xe->xdf2.dend; i++, recs++) { + i <= dend2; i++, recs++) { if (action2[i] == KEEP || - (action2[i] == INVESTIGATE && !xdl_clean_mmatch(action2, i, xe->delta_start, xe->xdf2.dend))) { + (action2[i] == INVESTIGATE && !xdl_clean_mmatch(action2, i, xe->delta_start, dend2))) { xe->xdf2.reference_index[xe->xdf2.nreff++] = i; /* changed[i] remains false, i.e. keep */ } else @@ -357,8 +358,7 @@ static void xdl_trim_ends(xdfenv_t *xe) size_t mph1 = xe->xdf1.recs[xe->xdf1.nrec - 1 - i].minimal_perfect_hash; size_t mph2 = xe->xdf2.recs[xe->xdf2.nrec - 1 - i].minimal_perfect_hash; if (mph1 != mph2) { - xe->xdf1.dend = xe->xdf1.nrec - 1 - i; - xe->xdf2.dend = xe->xdf2.nrec - 1 - i; + xe->delta_end = i; break; } } @@ -370,6 +370,7 @@ int xdl_prepare_env(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdlclassifier_t cf; xe->delta_start = 0; + xe->delta_end = 0; if (xdl_prepare_ctx(mf1, &xe->xdf1, xpp->flags) < 0) { diff --git a/xdiff/xtypes.h b/xdiff/xtypes.h index bda1f85eb0..a939396064 100644 --- a/xdiff/xtypes.h +++ b/xdiff/xtypes.h @@ -48,7 +48,6 @@ typedef struct s_xrecord { typedef struct s_xdfile { xrecord_t *recs; size_t nrec; - ptrdiff_t dend; bool *changed; size_t *reference_index; size_t nreff; @@ -56,7 +55,7 @@ typedef struct s_xdfile { typedef struct s_xdfenv { xdfile_t xdf1, xdf2; - size_t delta_start; + size_t delta_start, delta_end; } xdfenv_t;