diff options
| author | David Aguilar <davvid@gmail.com> | 2025-02-11 22:04:18 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-02-12 09:41:17 -0800 |
| commit | a3b56f5f431d2421b575f329d401361e3196b467 (patch) | |
| tree | 332c78531f0b9443cee1ba8e9f029ed6e45f6a26 /xdiff | |
| parent | 13b67f15c13d2e45215da8950f31ef27645733c3 (diff) | |
| download | git-a3b56f5f431d2421b575f329d401361e3196b467.tar.gz | |
xdiff: avoid signed vs. unsigned comparisons in xutils.c
The comparisons all involve comparisons against unsigned values.
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff')
| -rw-r--r-- | xdiff/xutils.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/xdiff/xutils.c b/xdiff/xutils.c index 169edff5ab..444a108f87 100644 --- a/xdiff/xutils.c +++ b/xdiff/xutils.c @@ -20,8 +20,6 @@ * */ -#define DISABLE_SIGN_COMPARE_WARNINGS - #include "xinclude.h" @@ -377,7 +375,7 @@ static int xdl_format_hunk_hdr(long s1, long c1, long s2, long c2, nb += 3; if (func && funclen) { buf[nb++] = ' '; - if (funclen > sizeof(buf) - nb - 1) + if ((size_t)funclen > sizeof(buf) - nb - 1) funclen = sizeof(buf) - nb - 1; memcpy(buf + nb, func, funclen); nb += funclen; @@ -439,7 +437,7 @@ void* xdl_alloc_grow_helper(void *p, long nr, long *alloc, size_t size) { void *tmp = NULL; size_t n = ((LONG_MAX - 16) / 2 >= *alloc) ? 2 * *alloc + 16 : LONG_MAX; - if (nr > n) + if ((size_t)nr > n) n = nr; if (SIZE_MAX / size >= n) tmp = xdl_realloc(p, n * size); |