[PATCH 3/6] xdiff: avoid signed vs. unsigned comparisons in xemit.c
- From
David Aguilar <davvid@gmail.com>
- Date
- Feb 12, 2025, 06:04 UTC
- Message-ID
- <20250212060418.1645241-3-davvid@gmail.com>
- In-Reply-To
- <20250212060418.1645241-1-davvid@gmail.com>
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 <davvid@gmail.com> --- xdiff/xemit.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
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) {
-- 2.48.1.643.g61982db19f