diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2015-07-10 19:32:04 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2015-07-10 19:32:04 +0200 |
| commit | 1cd96016167d169df7fcd7527e326241e2d2a52c (patch) | |
| tree | a1f8261d540e75bfebce99ce6870e3e9bb3bad30 /src | |
| parent | a1687f7855cabed8adde9457d76c51cc2ce4cf38 (diff) | |
| parent | 9c0331026b71ed801baa969c308598d59c6891c7 (diff) | |
| download | libgit2-1cd96016167d169df7fcd7527e326241e2d2a52c.tar.gz | |
Merge pull request #3301 from ethomson/warnings
Clean up some warnings
Diffstat (limited to 'src')
| -rw-r--r-- | src/khash.h | 2 | ||||
| -rw-r--r-- | src/xdiff/xdiffi.c | 2 | ||||
| -rw-r--r-- | src/xdiff/xemit.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/khash.h b/src/khash.h index 818ac833b..71eb583d5 100644 --- a/src/khash.h +++ b/src/khash.h @@ -619,4 +619,4 @@ typedef const char *kh_cstr_t; #define KHASH_MAP_INIT_STR(name, khval_t) \ KHASH_INIT(name, kh_cstr_t, khval_t, 1, kh_str_hash_func, kh_str_hash_equal) -#endif /* __AC_KHASH_H */
\ No newline at end of file +#endif /* __AC_KHASH_H */ 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; |