xdiff: cleanup xdl_clean_mmatch()

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>

diff --git a/xdiff/xprepare.c b/xdiff/xprepare.c
index 3b6bae0d1581b7c189c62e33c7e588b6fc22d4b9..81de412875abb4d86e95278ea72054a60a47e548 100644 (file)
--- 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
@@ -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;