From: David Aguilar <davvid@gmail•com>
To: git@vger•kernel.org
Cc: "Patrick Steinhardt" <ps@pks•im>,
"Junio C Hamano" <gitster@pobox•com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail•com>,
"Jeff King" <peff@peff•net>,
"Phillip Wood" <phillip.wood@dunelm•org.uk>
Subject: [PATCH 3/6] xdiff: avoid signed vs. unsigned comparisons in xemit.c
Date: Tue, 11 Feb 2025 22:04:15 -0800 [thread overview]
Message-ID: <20250212060418.1645241-3-davvid@gmail.com> (raw)
In-Reply-To: <20250212060418.1645241-1-davvid@gmail.com>
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
next prev parent reply other threads:[~2025-02-12 6:04 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2025-02-12 6:04 ` [PATCH 4/6] xdiff: avoid signed vs. unsigned comparisons in xhistogram.c 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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250212060418.1645241-3-davvid@gmail.com \
--to=davvid@gmail$(echo .)com \
--cc=avarab@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=peff@peff$(echo .)net \
--cc=phillip.wood@dunelm$(echo .)org.uk \
--cc=ps@pks$(echo .)im \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox