mirror of
https://git.proxmox.com/git/libgit2
synced 2025-05-07 23:19:28 +00:00
xdiff: cleanup some warnings
This commit is contained in:
parent
9847d80ddc
commit
a3c00cd8e3
@ -544,6 +544,8 @@ static int xdl_call_hunk_func(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,
|
|||||||
{
|
{
|
||||||
xdchange_t *xch, *xche;
|
xdchange_t *xch, *xche;
|
||||||
|
|
||||||
|
(void)xe;
|
||||||
|
|
||||||
for (xch = xscr; xch; xch = xche->next) {
|
for (xch = xscr; xch; xch = xche->next) {
|
||||||
xche = xdl_get_hunk(&xch, xecfg);
|
xche = xdl_get_hunk(&xch, xecfg);
|
||||||
if (!xch)
|
if (!xch)
|
||||||
|
@ -90,7 +90,7 @@ xdchange_t *xdl_get_hunk(xdchange_t **xscr, xdemitconf_t const *xecfg)
|
|||||||
} else if (distance < max_ignorable && xch->ignore) {
|
} else if (distance < max_ignorable && 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) > (unsigned long)max_common) {
|
||||||
break;
|
break;
|
||||||
} else if (!xch->ignore) {
|
} else if (!xch->ignore) {
|
||||||
lxch = xch;
|
lxch = xch;
|
||||||
|
Loading…
Reference in New Issue
Block a user