From: Junio C Hamano Date: Thu, 02 Apr 2026 19:20:06 GMT Subject: Re: [PATCH 2/4] xdiff: cleanup xdl_clean_mmatch() Message-ID: In-Reply-To: <78e9313fd44c7cd9f820109edb103a680aa73ad3.1775141855.git.phillip.wood@dunelm.org.uk> Phillip Wood writes: > From: Phillip Wood > > Remove the "s" parameter as, since the last commit, this function > is always called with s == 0. Also change parameter "e" to expect a > length, rather than the index of the last line to simplify the caller. > > Signed-off-by: Phillip Wood > --- > xdiff/xprepare.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) Very logical consequence, given what the previous step did. Makes sense. > > diff --git a/xdiff/xprepare.c b/xdiff/xprepare.c > index 4bb3a8ef41c..f8e6a6d74d5 100644 > --- a/xdiff/xprepare.c > +++ b/xdiff/xprepare.c > @@ -197,8 +197,9 @@ void xdl_free_env(xdfenv_t *xe) { > } > > > -static bool xdl_clean_mmatch(uint8_t const *action, ptrdiff_t i, ptrdiff_t s, ptrdiff_t e) { > +static bool xdl_clean_mmatch(uint8_t const *action, ptrdiff_t i, ptrdiff_t len) { > ptrdiff_t r, rdis0, rpdis0, rdis1, rpdis1; > + ptrdiff_t s = 0, e = len - 1; > > /* > * Limits the window that is examined during the similar-lines > @@ -333,7 +334,7 @@ static int xdl_cleanup_records(xdlclassifier_t *cf, xdfile_t *xdf1, xdfile_t *xd > xdf1->nreff = 0; > for (i = 0; i < len1; i++) { > if (action1[i] == INVESTIGATE) { > - if (!xdl_clean_mmatch(action1, i, 0, len1 - 1)) > + if (!xdl_clean_mmatch(action1, i, len1)) > action1[i] = KEEP; > else > action1[i] = DISCARD; > @@ -351,7 +352,7 @@ static int xdl_cleanup_records(xdlclassifier_t *cf, xdfile_t *xdf1, xdfile_t *xd > xdf2->nreff = 0; > for (i = 0; i < len2; i++) { > if (action2[i] == INVESTIGATE) { > - if (!xdl_clean_mmatch(action2, i, 0, len2 - 1)) > + if (!xdl_clean_mmatch(action2, i, len2)) > action2[i] = KEEP; > else > action2[i] = DISCARD;