From: "Frédéric Bérat" <fberat@redhat.com>
To: libc-alpha@sourceware.org
Cc: siddhesh@gotplt.org, fberat@redhat.com,
Siddhesh Poyarekar <siddhesh@sourceware.org>
Subject: [PATCH v4 14/15] sysdeps/ieee754/ldbl-128ibm-compat: Fix warn unused result
Date: Tue, 4 Jul 2023 18:55:53 +0200 [thread overview]
Message-ID: <20230704165554.239581-15-fberat@redhat.com> (raw)
In-Reply-To: <20230704165554.239581-1-fberat@redhat.com>
Return value from *scanf and *asprintf routines are now properly checked
in test-scanf-ldbl-compat-template.c and test-printf-ldbl-compat.c.
Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
---
.../test-printf-ldbl-compat.c | 10 +++++----
.../test-scanf-ldbl-compat-template.c | 21 ++++++++++---------
2 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-ldbl-compat.c b/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-ldbl-compat.c
index 3c759e1427..be37af7c31 100644
--- a/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-ldbl-compat.c
+++ b/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-ldbl-compat.c
@@ -30,12 +30,13 @@ do_test_call_varg (FILE *stream, const char *format, ...)
char *buffer = NULL;
char string[128];
va_list args;
+ int ret;
printf ("%15s", "vasprintf: ");
va_start (args, format);
- vasprintf (&buffer, format, args);
+ ret = vasprintf (&buffer, format, args);
va_end (args);
- if (buffer == NULL)
+ if (ret == -1 || buffer == NULL)
printf ("Error using vasprintf\n");
else
{
@@ -82,10 +83,11 @@ do_test_call_rarg (FILE *stream, const char *format, long double ld, double d)
{
char *buffer = NULL;
char string[128];
+ int ret;
printf ("%15s", "asprintf: ");
- asprintf (&buffer, format, ld, d);
- if (buffer == NULL)
+ ret = asprintf (&buffer, format, ld, d);
+ if (ret == -1 || buffer == NULL)
printf ("Error using asprintf\n");
else
{
diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/test-scanf-ldbl-compat-template.c b/sysdeps/ieee754/ldbl-128ibm-compat/test-scanf-ldbl-compat-template.c
index e8da3a67f0..776c12dd16 100644
--- a/sysdeps/ieee754/ldbl-128ibm-compat/test-scanf-ldbl-compat-template.c
+++ b/sysdeps/ieee754/ldbl-128ibm-compat/test-scanf-ldbl-compat-template.c
@@ -37,10 +37,10 @@
ldptr = va_arg (args, long double *); \
fptr = va_arg (args, float *); \
va_end (args); \
- if (*ldptr == -1 && *fptr == -2) \
+ if (*ldptr == -1 && *fptr == -2 && ret == 2) \
printf ("OK"); \
else \
- printf ("ERROR (%Lf %f)", *ldptr, *fptr); \
+ printf ("ERROR (%Lf %f %d)", *ldptr, *fptr, ret); \
printf ("\n");
#define CLEAR_VALUE \
@@ -48,10 +48,10 @@
f = 0;
#define CHECK_VALUE \
- if (ld == -1 && f == -2) \
+ if (ld == -1 && f == -2 && ret == 2) \
printf ("OK"); \
else \
- printf ("ERROR (%Lf %f)", ld, f); \
+ printf ("ERROR (%Lf %f %d)", ld, f, ret); \
printf ("\n");
static void
@@ -62,40 +62,41 @@ do_test_call (FILE *stream, CHAR *string, const CHAR *format, ...)
float *fptr;
long double *ldptr;
va_list args;
+ int ret;
CLEAR_VALUE
printf ("fscanf: ");
- FSCANF (stream, format, &ld, &f);
+ ret = FSCANF (stream, format, &ld, &f);
CHECK_VALUE
CLEAR_VALUE
printf ("scanf: ");
- SCANF (format, &ld, &f);
+ ret = SCANF (format, &ld, &f);
CHECK_VALUE
CLEAR_VALUE
printf ("sscanf: ");
- SSCANF (string, format, &ld, &f);
+ ret = SSCANF (string, format, &ld, &f);
CHECK_VALUE
CLEAR_VARGS
printf ("vfscanf: ");
va_start (args, format);
- VFSCANF (stream, format, args);
+ ret = VFSCANF (stream, format, args);
va_end (args);
CHECK_VARGS
CLEAR_VARGS
printf ("vscanf: ");
va_start (args, format);
- VSCANF (format, args);
+ ret = VSCANF (format, args);
va_end (args);
CHECK_VARGS
CLEAR_VARGS
printf ("vsscanf: ");
va_start (args, format);
- VSSCANF (string, format, args);
+ ret = VSSCANF (string, format, args);
va_end (args);
CHECK_VARGS
}
--
2.41.0
next prev parent reply other threads:[~2023-07-04 16:56 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-04 16:55 [PATCH v4 00/15] Allow glibc to be built with _FORTIFY_SOURCE Frédéric Bérat
2023-07-04 16:55 ` [PATCH v4 01/15] " Frédéric Bérat
2023-07-04 23:45 ` Siddhesh Poyarekar
2023-07-04 16:55 ` [PATCH v4 02/15] Exclude routines from fortification Frédéric Bérat
2023-07-04 23:48 ` Siddhesh Poyarekar
2023-07-04 16:55 ` [PATCH v4 03/15] sysdeps: Ensure ieee128*_chk routines to be properly named Frédéric Bérat
2023-07-04 16:55 ` [PATCH v4 04/15] string: Ensure *_chk routines have their hidden builtin definition available Frédéric Bérat
2023-07-04 16:55 ` [PATCH v4 05/15] stdio: " Frédéric Bérat
2023-07-04 23:49 ` Siddhesh Poyarekar
2023-07-06 21:15 ` Paul E Murphy
2023-07-05 12:12 ` Carlos O'Donell
2023-07-04 16:55 ` [PATCH v4 06/15] misc/sys/cdefs.h: Create FORTIFY redirects for internal calls Frédéric Bérat
2023-07-04 16:55 ` [PATCH v4 07/15] wchar: Avoid PLT entries with _FORTIFY_SOURCE Frédéric Bérat
2023-07-04 23:51 ` Siddhesh Poyarekar
2023-07-04 16:55 ` [PATCH v4 08/15] posix/bits/unistd.h: Clearly separate declaration from definitions Frédéric Bérat
2023-07-04 16:55 ` [PATCH v4 09/15] unistd: Avoid PLT entries with _FORTIFY_SOURCE Frédéric Bérat
2023-07-04 23:52 ` Siddhesh Poyarekar
2023-07-04 16:55 ` [PATCH v4 10/15] misc/bits/select2.h: Clearly separate declaration from definitions Frédéric Bérat
2023-07-04 23:53 ` Siddhesh Poyarekar
2023-07-04 16:55 ` [PATCH v4 11/15] misc/bits/syslog.h: Clearly separate declaration from definition Frédéric Bérat
2023-07-04 16:55 ` [PATCH v4 12/15] libio/bits/stdio2.h: Clearly separate declaration from definitions Frédéric Bérat
2023-07-04 16:55 ` [PATCH v4 13/15] libio/bits/stdio2-decl.h: Avoid PLT entries with _FORTIFY_SOURCE Frédéric Bérat
2023-07-04 16:55 ` Frédéric Bérat [this message]
2023-07-04 16:55 ` [PATCH v4 15/15] Add --enable-fortify-source option Frédéric Bérat
2023-07-05 0:02 ` Siddhesh Poyarekar
2023-07-05 0:13 ` [PATCH v4 00/15] Allow glibc to be built with _FORTIFY_SOURCE Siddhesh Poyarekar
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=20230704165554.239581-15-fberat@redhat.com \
--to=fberat@redhat.com \
--cc=libc-alpha@sourceware.org \
--cc=siddhesh@gotplt.org \
--cc=siddhesh@sourceware.org \
/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).