diff options
| author | David Aguilar <davvid@gmail.com> | 2025-02-11 22:04:15 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-02-12 09:41:16 -0800 |
| commit | 46fb0843536f2e9281c45042b024098a38236b17 (patch) | |
| tree | 3b487f5660ae3f47048c79ded97d3aa41c082355 | |
| parent | 0d31bab479820c1536893f6fbc0dbb1ef1637eb0 (diff) | |
| download | git-46fb0843536f2e9281c45042b024098a38236b17.tar.gz | |
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 <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | xdiff/xemit.c | 4 |
1 files changed, 1 insertions, 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) { |