averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-05-31 11:19:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

xdiff: cleanup xdl_clean_mmatch()

Browse Source 
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 <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Phillip Wood
2026-05-04 15:06:19 +01:00
committed by Junio C Hamano
parent a814112533
commit 53d13887b8
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xdiff/xprepare.c
+4 -3
View File
@@ -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
@@ -342,7 +343,7 @@ static int xdl_cleanup_records(xdlclassifier_t *cf, xdfile_t *xdf1, xdfile_t *xd
uint8_t action = action1[i];
if (action == INVESTIGATE) {
if (!xdl_clean_mmatch(action1, i, 0, len1 - 1))
if (!xdl_clean_mmatch(action1, i, len1))
action = KEEP;
else
action = DISCARD;
@@ -363,7 +364,7 @@ static int xdl_cleanup_records(xdlclassifier_t *cf, xdfile_t *xdf1, xdfile_t *xd
uint8_t action = action2[i];
if (action == INVESTIGATE) {
if (!xdl_clean_mmatch(action2, i, 0, len2 - 1))
if (!xdl_clean_mmatch(action2, i, len2))
action = KEEP;
else
action = DISCARD;