git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 2/4] xdiff: cleanup xdl_clean_mmatch()

From
PWPhillip Wood <phillip.wood123@gmail.com>
Date
Apr 2, 2026, 14:57 UTC
Message-ID
<78e9313fd44c7cd9f820109edb103a680aa73ad3.1775141855.git.phillip.wood@dunelm.org.uk>
In-Reply-To
<cover.1775141855.git.phillip.wood@dunelm.org.uk>
From: Phillip Wood <phillip.wood@dunelm.org.uk>

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>
---
 xdiff/xprepare.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
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;
-- 
2.52.0.362.g884e03848a9.dirty
Previous: Junio C HamanoNext: Junio C Hamano
Message 4 of 14 in “xdiff: reduce the size of a couple of arrays”
  1. 0/4 xdiff: reduce the size of a couple of arraysPhillip Wood, Apr 2, 2026
  2. 1/4 xdiff: reduce size of action arraysPhillip Wood, Apr 2, 2026
  3. Junio C HamanoApr 2, 2026
  4. 2/4 xdiff: cleanup xdl_clean_mmatch()Phillip Wood, Apr 2, 2026
  5. Junio C HamanoApr 2, 2026
  6. 3/4 xprepare: simplify error handlingPhillip Wood, Apr 2, 2026
  7. Junio C HamanoApr 2, 2026
  8. 4/4 xdiff: reduce the size of arrayPhillip Wood, Apr 2, 2026
  9. Junio C HamanoApr 2, 2026
  10. 0/4 xdiff: reduce the size of a couple of arraysPhillip Wood, May 4, 2026
  11. 1/4 xdiff: reduce size of action arraysPhillip Wood, May 4, 2026
  12. 2/4 xdiff: cleanup xdl_clean_mmatch()Phillip Wood, May 4, 2026
  13. 3/4 xprepare: simplify error handlingPhillip Wood, May 4, 2026
  14. 4/4 xdiff: reduce the size of arrayPhillip Wood, May 4, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.