Skip to content

Commit 042cefe

Browse files
ezekielnewrengitster
authored andcommitted
xdiff/xdl_cleanup_records: use unambiguous types
Change the parameters of xdl_clean_mmatch() and the local variables i, nm, mlim in xdl_cleanup_records() to use unambiguous types. Best viewed with --color-words. Signed-off-by: Ezekiel Newren <ezekielnewren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent e85a416 commit 042cefe

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

xdiff/xprepare.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,8 @@ void xdl_free_env(xdfenv_t *xe) {
197197
}
198198

199199

200-
static bool xdl_clean_mmatch(uint8_t const *action, long i, long s, long e) {
201-
long r, rdis0, rpdis0, rdis1, rpdis1;
200+
static bool xdl_clean_mmatch(uint8_t const *action, ptrdiff_t i, ptrdiff_t s, ptrdiff_t e) {
201+
ptrdiff_t r, rdis0, rpdis0, rdis1, rpdis1;
202202

203203
/*
204204
* Limits the window that is examined during the similar-lines
@@ -268,7 +268,7 @@ static bool xdl_clean_mmatch(uint8_t const *action, long i, long s, long e) {
268268
* might be potentially discarded if they appear in a run of discardable.
269269
*/
270270
static int xdl_cleanup_records(xdlclassifier_t *cf, xdfile_t *xdf1, xdfile_t *xdf2) {
271-
long i, nm, mlim;
271+
ptrdiff_t i, nm, mlim;
272272
xdlclass_t *rcrec;
273273
uint8_t *action1 = NULL, *action2 = NULL;
274274
bool need_min = !!(cf->flags & XDF_NEED_MINIMAL);

0 commit comments

Comments
 (0)