* [PATCH 2/6] xdiff: avoid signed vs. unsigned comparisons in xdiffi.c
2025-02-12 6:04 [PATCH 1/6] xdiff: move sign comparison warning guard into each file David Aguilar
@ 2025-02-12 6:04 ` David Aguilar
2025-02-12 6:04 ` [PATCH 3/6] xdiff: avoid signed vs. unsigned comparisons in xemit.c David Aguilar
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: David Aguilar @ 2025-02-12 6:04 UTC (permalink / raw)
To: git
Cc: Patrick Steinhardt, Junio C Hamano,
Ævar Arnfjörð Bjarmason, Jeff King, Phillip Wood
The loop iteration variable is non-negative and only used in comparisons
against other size_t values.
Signed-off-by: David Aguilar <davvid@gmail.com>
---
xdiff/xdiffi.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c
index 4685ba6137..8889b8b62a 100644
--- a/xdiff/xdiffi.c
+++ b/xdiff/xdiffi.c
@@ -19,7 +19,6 @@
* Davide Libenzi <davidel@xmailserver.org>
*
*/
-#define DISABLE_SIGN_COMPARE_WARNINGS
#include "xinclude.h"
@@ -1014,7 +1013,7 @@ static void xdl_mark_ignorable_lines(xdchange_t *xscr, xdfenv_t *xe, long flags)
static int record_matches_regex(xrecord_t *rec, xpparam_t const *xpp) {
regmatch_t regmatch;
- int i;
+ size_t i;
for (i = 0; i < xpp->ignore_regex_nr; i++)
if (!regexec_buf(xpp->ignore_regex[i], rec->ptr, rec->size, 1,
--
2.48.1.643.g61982db19f
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/6] xdiff: avoid signed vs. unsigned comparisons in xemit.c
2025-02-12 6:04 [PATCH 1/6] xdiff: move sign comparison warning guard into each file David Aguilar
2025-02-12 6:04 ` [PATCH 2/6] xdiff: avoid signed vs. unsigned comparisons in xdiffi.c David Aguilar
@ 2025-02-12 6:04 ` David Aguilar
2025-02-12 6:04 ` [PATCH 4/6] xdiff: avoid signed vs. unsigned comparisons in xhistogram.c David Aguilar
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: David Aguilar @ 2025-02-12 6:04 UTC (permalink / raw)
To: git
Cc: Patrick Steinhardt, Junio C Hamano,
Ævar Arnfjörð Bjarmason, Jeff King, Phillip Wood
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
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 4/6] xdiff: avoid signed vs. unsigned comparisons in xhistogram.c
2025-02-12 6:04 [PATCH 1/6] xdiff: move sign comparison warning guard into each file David Aguilar
2025-02-12 6:04 ` [PATCH 2/6] xdiff: avoid signed vs. unsigned comparisons in xdiffi.c David Aguilar
2025-02-12 6:04 ` [PATCH 3/6] xdiff: avoid signed vs. unsigned comparisons in xemit.c David Aguilar
@ 2025-02-12 6:04 ` David Aguilar
2025-02-12 6:04 ` [PATCH 5/6] xdiff: avoid signed vs. unsigned comparisons in xpatience.c David Aguilar
2025-02-12 6:04 ` [PATCH 6/6] xdiff: avoid signed vs. unsigned comparisons in xutils.c David Aguilar
4 siblings, 0 replies; 6+ messages in thread
From: David Aguilar @ 2025-02-12 6:04 UTC (permalink / raw)
To: git
Cc: Patrick Steinhardt, Junio C Hamano,
Ævar Arnfjörð Bjarmason, Jeff King, Phillip Wood
The comparisons all involve unsigned variables. Cast the comparison
to unsigned to eliminate the mismatch.
Signed-off-by: David Aguilar <davvid@gmail.com>
---
xdiff/xhistogram.c | 10 ++++------
1 file 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 @@ static int histogram_diff(xpparam_t const *xpp, xdfenv_t *env,
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) {
--
2.48.1.643.g61982db19f
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 5/6] xdiff: avoid signed vs. unsigned comparisons in xpatience.c
2025-02-12 6:04 [PATCH 1/6] xdiff: move sign comparison warning guard into each file David Aguilar
` (2 preceding siblings ...)
2025-02-12 6:04 ` [PATCH 4/6] xdiff: avoid signed vs. unsigned comparisons in xhistogram.c David Aguilar
@ 2025-02-12 6:04 ` David Aguilar
2025-02-12 6:04 ` [PATCH 6/6] xdiff: avoid signed vs. unsigned comparisons in xutils.c David Aguilar
4 siblings, 0 replies; 6+ messages in thread
From: David Aguilar @ 2025-02-12 6:04 UTC (permalink / raw)
To: git
Cc: Patrick Steinhardt, Junio C Hamano,
Ævar Arnfjörð Bjarmason, Jeff King, Phillip Wood
The loop iteration variable is non-negative and used in comparisons
against a size_t value. Use size_t to eliminate the mismatch.
Signed-off-by: David Aguilar <davvid@gmail.com>
---
xdiff/xpatience.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/xdiff/xpatience.c b/xdiff/xpatience.c
index b0ba421b28..82f663004e 100644
--- a/xdiff/xpatience.c
+++ b/xdiff/xpatience.c
@@ -20,8 +20,6 @@
*
*/
-#define DISABLE_SIGN_COMPARE_WARNINGS
-
#include "xinclude.h"
/*
@@ -78,7 +76,7 @@ struct hashmap {
static int is_anchor(xpparam_t const *xpp, const char *line)
{
- int i;
+ size_t i;
for (i = 0; i < xpp->anchors_nr; i++) {
if (!strncmp(line, xpp->anchors[i], strlen(xpp->anchors[i])))
return 1;
--
2.48.1.643.g61982db19f
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 6/6] xdiff: avoid signed vs. unsigned comparisons in xutils.c
2025-02-12 6:04 [PATCH 1/6] xdiff: move sign comparison warning guard into each file David Aguilar
` (3 preceding siblings ...)
2025-02-12 6:04 ` [PATCH 5/6] xdiff: avoid signed vs. unsigned comparisons in xpatience.c David Aguilar
@ 2025-02-12 6:04 ` David Aguilar
4 siblings, 0 replies; 6+ messages in thread
From: David Aguilar @ 2025-02-12 6:04 UTC (permalink / raw)
To: git
Cc: Patrick Steinhardt, Junio C Hamano,
Ævar Arnfjörð Bjarmason, Jeff King, Phillip Wood
The comparisons all involve comparisons against unsigned values.
Signed-off-by: David Aguilar <davvid@gmail.com>
---
xdiff/xutils.c | 6 ++----
1 file 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);
--
2.48.1.643.g61982db19f
^ permalink raw reply related [flat|nested] 6+ messages in thread