lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-10-24 13:33:08 +03:00
Code Activity

stdio-common: Convert macros across scanf input specifier tests

Browse Source 
Convert 'compare_real', 'read_real', and 'verify_input' macros to
functions so as to improve readability and avoid pitfalls.

Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
This commit is contained in:
Maciej W. Rozycki
2025-08-23 01:02:10 +01:00
parent a1e5ee13ab
commit aa4dbb2eeb
5 changed files with 411 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

133
stdio-common/tst-scanf-format-character.h
View File

@@ -16,6 +16,7 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
#include <stdbool.h>
#include <string.h>
#include <support/next_to_fault.h>
@@ -62,69 +63,69 @@ do \
} \
while (0)
#define verify_input(f, val, count, errp) \
({ \
__label__ out, skip; \
bool match = true; \
int err = 0; \
size_t i; \
int ch; \
\
for (i = 0; i < count; i++) \
{ \
ch = read_input (); \
if (ch < 0) \
{ \
err = ch; \
goto out; \
} \
if (ch == ':' && val[i] == '\0' && f == 's') \
goto skip; \
if (ch != val[i]) \
{ \
match = false; \
goto out; \
} \
} \
ch = read_input (); \
if (ch < 0) \
{ \
err = ch; \
goto out; \
} \
\
skip: \
if (f != 'c' && val[i++] != '\0') \
{ \
err = OUTPUT_TERM; \
goto out; \
} \
if (val[i] != '\xa5') \
{ \
err = OUTPUT_OVERRUN; \
goto out; \
} \
\
while (ch != ':') \
{ \
ch = read_input (); \
if (ch < 0) \
{ \
err = ch; \
goto out; \
} \
match = false; \
} \
\
out: \
if (err || !match) \
{ \
printf ("error: %s:%d: input buffer: `", __FILE__, __LINE__); \
for (size_t j = 0; j <= i; j++) \
printf ("%c", val[j]); \
printf ("'\n"); \
} \
\
*errp = err; \
match; \
})
static bool
verify_input (char f, type_t val, long long count, int *errp)
{
bool match = true;
int err = 0;
size_t i;
int ch;
for (i = 0; i < count; i++)
{
ch = read_input ();
if (ch < 0)
{
err = ch;
goto out;
}
if (ch == ':' && val[i] == '\0' && f == 's')
goto skip;
if (ch != val[i])
{
match = false;
goto out;
}
}
ch = read_input ();
if (ch < 0)
{
err = ch;
goto out;
}
skip:
if (f != 'c' && val[i++] != '\0')
{
err = OUTPUT_TERM;
goto out;
}
if (val[i] != '\xa5')
{
err = OUTPUT_OVERRUN;
goto out;
}
while (ch != ':')
{
ch = read_input ();
if (ch < 0)
{
err = ch;
goto out;
}
match = false;
}
out:
if (err || !match)
{
printf ("error: %s:%d: input buffer: `", __FILE__, __LINE__);
for (size_t j = 0; j <= i; j++)
printf ("%c", val[j]);
printf ("'\n");
}
*errp = err;
return match;
}