bekucera/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-09-10 22:44:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

xdiff: avoid signed vs. unsigned comparisons in xhistogram.c

Browse Source 
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>
This commit is contained in:
David Aguilar
2025-02-11 22:04:16 -08:00
committed by Junio C Hamano
parent 46fb084353
commit 2dc6cf247e
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
xdiff/xhistogram.c
View File

@@ -41,8 +41,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#define DISABLE_SIGN_COMPARE_WARNINGS
#include "xinclude.h" #include "xinclude.h"
#define MAX_PTR UINT_MAX #define MAX_PTR UINT_MAX
@@ -108,7 +106,7 @@ static int scanA(struct histindex *index, int line1, int count1)
unsigned int chain_len; unsigned int chain_len;
struct record **rec_chain, *rec; 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); tbl_idx = TABLE_HASH(index, 1, ptr);
rec_chain = index->records + tbl_idx; rec_chain = index->records + tbl_idx;
rec = *rec_chain; rec = *rec_chain;
@@ -183,14 +181,14 @@ static int try_lcs(struct histindex *index, struct region *lcs, int b_ptr,
be = bs; be = bs;
rc = rec->cnt; 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)) { && CMP(index, 1, as - 1, 2, bs - 1)) {
as--; as--;
bs--; bs--;
if (1 < rc) if (1 < rc)
rc = XDL_MIN(rc, CNT(index, as)); 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)) { && CMP(index, 1, ae + 1, 2, be + 1)) {
ae++; ae++;
be++; be++;
@@ -315,7 +313,7 @@ redo:
if (count1 <= 0 && count2 <= 0) if (count1 <= 0 && count2 <= 0)
return 0; return 0;
if (LINE_END(1) >= MAX_PTR) if ((unsigned int)LINE_END(1) >= MAX_PTR)
return -1; return -1;
if (!count1) { if (!count1) {