From: Robbie Harwood <rharwood@redhat.com>
To: bug-gnulib@gnu.org
Cc: Peter Jones <pjones@redhat.com>, Robbie Harwood <rharwood@redhat.com>
Subject: [PATCH 08/11] Fix __argp_fmtstream_point()'s return type and comparisons with it
Date: Mon, 25 Oct 2021 17:55:41 -0400 [thread overview]
Message-ID: <20211025215543.111906-9-rharwood@redhat.com> (raw)
In-Reply-To: <20211025215543.111906-1-rharwood@redhat.com>
From: Peter Jones <pjones@redhat.com>
gcc -Werror=sign-compare produces:
argp-help.c:1545:15: error: comparison of integer expressions of different signedness: ‘int’ and ‘size_t’ {aka ‘long unsigned int’} [-Werror=sign-compare]
1545 | > __argp_fmtstream_lmargin (stream))
| ^
Some code seems to assume the point_col field (which
__argp_fmtstream_point() returns) can be -1, and it's an ssize_t, so
this makes the function correctly return ssize_t in all cases, and also
fixes the comparison to check for the -1 case.
Signed-off-by: Peter Jones <pjones@redhat.com>
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
---
lib/argp-fmtstream.h | 6 +++---
lib/argp-help.c | 7 +++++--
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/lib/argp-fmtstream.h b/lib/argp-fmtstream.h
index 3384a0012..f47e24c5c 100644
--- a/lib/argp-fmtstream.h
+++ b/lib/argp-fmtstream.h
@@ -164,8 +164,8 @@ extern size_t __argp_fmtstream_set_wmargin (argp_fmtstream_t __fs,
size_t __wmargin);
/* Return the column number of the current output point in __FS. */
-extern size_t argp_fmtstream_point (argp_fmtstream_t __fs);
-extern size_t __argp_fmtstream_point (argp_fmtstream_t __fs);
+extern ssize_t argp_fmtstream_point (argp_fmtstream_t __fs);
+extern ssize_t __argp_fmtstream_point (argp_fmtstream_t __fs);
#endif
/* Internal routines. */
@@ -272,7 +272,7 @@ __argp_fmtstream_set_wmargin (argp_fmtstream_t __fs, size_t __wmargin)
}
/* Return the column number of the current output point in __FS. */
-ARGP_FS_EI size_t
+ARGP_FS_EI ssize_t
__argp_fmtstream_point (argp_fmtstream_t __fs)
{
if ((size_t) (__fs->p - __fs->buf) > __fs->point_offs)
diff --git a/lib/argp-help.c b/lib/argp-help.c
index 84013b002..93e40cad7 100644
--- a/lib/argp-help.c
+++ b/lib/argp-help.c
@@ -1631,7 +1631,9 @@ argp_doc (const struct argp *argp, const struct argp_state *state,
else
__argp_fmtstream_puts (stream, text);
- if (__argp_fmtstream_point (stream) > __argp_fmtstream_lmargin (stream))
+ if (__argp_fmtstream_point (stream) < 0 ||
+ (size_t)__argp_fmtstream_point (stream)
+ > __argp_fmtstream_lmargin (stream))
__argp_fmtstream_putc (stream, '\n');
anything = 1;
@@ -1652,7 +1654,8 @@ argp_doc (const struct argp *argp, const struct argp_state *state,
__argp_fmtstream_putc (stream, '\n');
__argp_fmtstream_puts (stream, text);
free ((char *) text);
- if (__argp_fmtstream_point (stream)
+ if (__argp_fmtstream_point (stream) < 0 ||
+ (size_t)__argp_fmtstream_point (stream)
> __argp_fmtstream_lmargin (stream))
__argp_fmtstream_putc (stream, '\n');
anything = 1;
--
2.33.0
next prev parent reply other threads:[~2021-10-25 22:18 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-25 21:55 [PATCH 00/11] Code hygiene fixes from grub Robbie Harwood
2021-10-25 21:55 ` [PATCH 01/11] Fix base64 module to work with grub codebase Robbie Harwood
2021-10-27 11:15 ` Simon Josefsson via Gnulib discussion list
2021-10-28 19:32 ` Robbie Harwood
2021-11-09 18:35 ` Simon Josefsson via Gnulib discussion list
2021-11-09 18:52 ` Paul Eggert
2021-11-09 19:34 ` Robbie Harwood
2021-11-23 16:24 ` Daniel Kiper
2021-12-09 15:43 ` Daniel Kiper
2021-10-25 21:55 ` [PATCH 02/11] argp-parse.c (__argp_input): Don't crash if pstate is NULL Robbie Harwood
2021-10-25 21:55 ` [PATCH 03/11] gnulib/regexec: Fix possible null-dereference Robbie Harwood
2021-10-25 21:55 ` [PATCH 04/11] gnulib/regexec: Resolve unused variable Robbie Harwood
2021-10-25 21:55 ` [PATCH 05/11] Fix width computation Robbie Harwood
2021-10-25 21:55 ` [PATCH 06/11] Make gnulib's regcomp not abort() Robbie Harwood
2021-10-25 21:55 ` [PATCH 07/11] Make CFLAGS less painful Robbie Harwood
2021-10-25 21:55 ` Robbie Harwood [this message]
2021-10-25 21:55 ` [PATCH 09/11] Fix up a bunch of "gcc -Werror=sign-compare" complaints Robbie Harwood
2021-10-25 21:55 ` [PATCH 10/11] Paper over a stringop-overflow warning about wide char handling Robbie Harwood
2021-10-25 21:55 ` [PATCH 11/11] Fixup for -Werror=ignored-qualifiers issues Robbie Harwood
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
List information: https://lists.gnu.org/mailman/listinfo/bug-gnulib
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211025215543.111906-9-rharwood@redhat.com \
--to=rharwood@redhat.com \
--cc=bug-gnulib@gnu.org \
--cc=pjones@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).