diff options
author | Edward Thomson <ethomson@edwardthomson.com> | 2015-07-10 09:21:59 -0500 |
---|---|---|
committer | Edward Thomson <ethomson@edwardthomson.com> | 2015-07-10 09:41:56 -0500 |
commit | a3c00cd8e36b303f0753412d12203d68af8c07e4 (patch) | |
tree | b7595f18ee145471789d4466e91afc7223a65d5c | |
parent | 9847d80ddc97b85ca38e158dc4781f0a3c6081ca (diff) | |
download | libgit2-a3c00cd8e36b303f0753412d12203d68af8c07e4.tar.gz |
xdiff: cleanup some warnings
-rw-r--r-- | src/xdiff/xdiffi.c | 2 | ||||
-rw-r--r-- | src/xdiff/xemit.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/xdiff/xdiffi.c b/src/xdiff/xdiffi.c index 2358a2d63..0620e5fff 100644 --- a/src/xdiff/xdiffi.c +++ b/src/xdiff/xdiffi.c @@ -544,6 +544,8 @@ static int xdl_call_hunk_func(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb, { xdchange_t *xch, *xche; + (void)xe; + for (xch = xscr; xch; xch = xche->next) { xche = xdl_get_hunk(&xch, xecfg); if (!xch) diff --git a/src/xdiff/xemit.c b/src/xdiff/xemit.c index 750a97294..600fd1fdd 100644 --- a/src/xdiff/xemit.c +++ b/src/xdiff/xemit.c @@ -90,7 +90,7 @@ xdchange_t *xdl_get_hunk(xdchange_t **xscr, xdemitconf_t const *xecfg) } else if (distance < max_ignorable && xch->ignore) { ignored += xch->chg2; } else if (lxch != xchp && - xch->i1 + ignored - (lxch->i1 + lxch->chg1) > max_common) { + xch->i1 + ignored - (lxch->i1 + lxch->chg1) > (unsigned long)max_common) { break; } else if (!xch->ignore) { lxch = xch; |