diff options
| author | David Aguilar <davvid@gmail.com> | 2025-02-11 22:04:16 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-02-12 09:41:16 -0800 |
| commit | 2dc6cf247e907009950a46c400cbd5efc563a3a2 (patch) | |
| tree | 42f48e3d440931e4101d930ed5ecab74343835f2 /xdiff | |
| parent | 46fb0843536f2e9281c45042b024098a38236b17 (diff) | |
| download | git-2dc6cf247e907009950a46c400cbd5efc563a3a2.tar.gz | |
xdiff: avoid signed vs. unsigned comparisons in xhistogram.c
The comparisons all involve unsigned variables. Cast the comparison
to unsigned to eliminate the mismatch.
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/xhistogram.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/xdiff/xhistogram.c b/xdiff/xhistogram.c index 3d2b190fa6..040d81e0bc 100644 --- a/xdiff/xhistogram.c +++ b/xdiff/xhistogram.c @@ -41,8 +41,6 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#define DISABLE_SIGN_COMPARE_WARNINGS - #include "xinclude.h" #define MAX_PTR UINT_MAX @@ -108,7 +106,7 @@ static int scanA(struct histindex *index, int line1, int count1) unsigned int chain_len; struct record **rec_chain, *rec; - for (ptr = LINE_END(1); line1 <= ptr; ptr--) { + for (ptr = LINE_END(1); (unsigned int)line1 <= ptr; ptr--) { tbl_idx = TABLE_HASH(index, 1, ptr); rec_chain = index->records + tbl_idx; rec = *rec_chain; @@ -183,14 +181,14 @@ static int try_lcs(struct histindex *index, struct region *lcs, int b_ptr, be = bs; rc = rec->cnt; - while (line1 < as && line2 < bs + while ((unsigned int)line1 < as && (unsigned int)line2 < bs && CMP(index, 1, as - 1, 2, bs - 1)) { as--; bs--; if (1 < rc) rc = XDL_MIN(rc, CNT(index, as)); } - while (ae < LINE_END(1) && be < LINE_END(2) + while (ae < (unsigned int)LINE_END(1) && be < (unsigned int)LINE_END(2) && CMP(index, 1, ae + 1, 2, be + 1)) { ae++; be++; @@ -315,7 +313,7 @@ redo: if (count1 <= 0 && count2 <= 0) return 0; - if (LINE_END(1) >= MAX_PTR) + if ((unsigned int)LINE_END(1) >= MAX_PTR) return -1; if (!count1) { |