This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2766

xdiff: resolve signed unsigned comparison warning
ClosedPublic

Authored by quark on Mar 9 2018, 5:54 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGe5b14f5b8b94: xdiff: resolve signed unsigned comparison warning
rHG9ddc9aa26801: xdiff: resolve signed unsigned comparison warning
Summary

Since the value won't be changed inside the code (because context lines
feature was removed by D2705), let's just remove the variable and inline
the 0 value.

The code might be potentially further simplified. But I'd like to make sure
correctness is easily verifiable in this patch.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

quark created this revision.Mar 9 2018, 5:54 PM
indygreg accepted this revision.Mar 9 2018, 6:22 PM
This revision is now accepted and ready to land.Mar 9 2018, 6:22 PM
Closed by commit rHG9ddc9aa26801: xdiff: resolve signed unsigned comparison warning (authored by quark). · Explain WhyMar 9 2018, 6:24 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/thirdparty/xdiff/xdiffi.c (12 lines)

Diff 6810

mercurial/thirdparty/xdiff/xdiffi.c

/* /*
* Starting at the passed change atom, find the latest change atom to be included * Starting at the passed change atom, find the latest change atom to be included
* inside the differential hunk according to the specified configuration. * inside the differential hunk according to the specified configuration.
* Also advance xscr if the first changes must be discarded. * Also advance xscr if the first changes must be discarded.
*/ */
xdchange_t *xdl_get_hunk(xdchange_t **xscr) xdchange_t *xdl_get_hunk(xdchange_t **xscr)
{ {
xdchange_t *xch, *xchp, *lxch; xdchange_t *xch, *xchp, *lxch;
int64_t max_common = 0;
int64_t max_ignorable = 0;
uint64_t ignored = 0; /* number of ignored blank lines */ uint64_t ignored = 0; /* number of ignored blank lines */
/* remove ignorable changes that are too far before other changes */ /* remove ignorable changes that are too far before other changes */
for (xchp = *xscr; xchp && xchp->ignore; xchp = xchp->next) { for (xchp = *xscr; xchp && xchp->ignore; xchp = xchp->next) {
xch = xchp->next; xch = xchp->next;
if (xch == NULL || if (xch == NULL ||
xch->i1 - (xchp->i1 + xchp->chg1) >= max_ignorable) xch->i1 - (xchp->i1 + xchp->chg1) >= 0)
*xscr = xch; *xscr = xch;
} }
if (*xscr == NULL) if (*xscr == NULL)
return NULL; return NULL;
lxch = *xscr; lxch = *xscr;
for (xchp = *xscr, xch = xchp->next; xch; xchp = xch, xch = xch->next) { for (xchp = *xscr, xch = xchp->next; xch; xchp = xch, xch = xch->next) {
int64_t distance = xch->i1 - (xchp->i1 + xchp->chg1); int64_t distance = xch->i1 - (xchp->i1 + xchp->chg1);
if (distance > max_common) if (distance > 0)
break; break;
if (distance < max_ignorable && (!xch->ignore || lxch == xchp)) { if (distance < 0 && (!xch->ignore || lxch == xchp)) {
lxch = xch; lxch = xch;
ignored = 0; ignored = 0;
} else if (distance < max_ignorable && xch->ignore) { } else if (distance < 0 && xch->ignore) {
ignored += xch->chg2; ignored += xch->chg2;
} else if (lxch != xchp && } else if (lxch != xchp &&
xch->i1 + ignored - (lxch->i1 + lxch->chg1) > max_common) { xch->i1 + ignored - (lxch->i1 + lxch->chg1) > 0) {
break; break;
} else if (!xch->ignore) { } else if (!xch->ignore) {
lxch = xch; lxch = xch;
ignored = 0; ignored = 0;
} else { } else {
ignored += xch->chg2; ignored += xch->chg2;
} }
} }