From: David Aguilar Date: Wed, 12 Feb 2025 06:04:15 +0000 (-0800) Subject: xdiff: avoid signed vs. unsigned comparisons in xemit.c X-Git-Tag: v2.49.0-rc0~11^2~3 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=46fb0843536f2e9281c45042b024098a38236b17;p=thirdparty%2Fgit.git xdiff: avoid signed vs. unsigned comparisons in xemit.c The unsigned `ignored` variable causes expressions to promote to unsigned. Use a signed value to make comparisons use the same types. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano --- diff --git a/xdiff/xemit.c b/xdiff/xemit.c index 2b394a4806..f8e3f25b03 100644 --- a/xdiff/xemit.c +++ b/xdiff/xemit.c @@ -20,8 +20,6 @@ * */ -#define DISABLE_SIGN_COMPARE_WARNINGS - #include "xinclude.h" static long xdl_get_rec(xdfile_t *xdf, long ri, char const **rec) { @@ -56,7 +54,7 @@ xdchange_t *xdl_get_hunk(xdchange_t **xscr, xdemitconf_t const *xecfg) xdchange_t *xch, *xchp, *lxch; long max_common = 2 * xecfg->ctxlen + xecfg->interhunkctxlen; long max_ignorable = xecfg->ctxlen; - unsigned long ignored = 0; /* number of ignored blank lines */ + long ignored = 0; /* number of ignored blank lines */ /* remove ignorable changes that are too far before other changes */ for (xchp = *xscr; xchp && xchp->ignore; xchp = xchp->next) {