mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-25 14:30:06 +00:00
e15f7de60c
Quite a few tests include libc-internal.h just for the DIAG_* macros. Split those macros to their own file, which can be included safely in _ISOMAC mode. I also moved ignore_value, since it seems logically related, even though I didn't notice any tests needing it. Also add -Wnonnull suppressions to two tests that _should_ have them, but the error is masked when compiling against internal headers. * include/libc-diag.h: New file. Define ignore_value, DIAG_PUSH_NEEDS_COMMENT, DIAG_POP_NEEDS_COMMENT, DIAG_IGNORE_NEEDS_COMMENT, and DIAG_IGNORE_Os_NEEDS_COMMENT here. * include/libc-internal.h: Definitions of above macros moved from here. Include libc-diag.h. Add copyright notice. * malloc/tst-malloc.c, malloc/tst-memcheck.c, malloc/tst-realloc.c * misc/tst-error1.c, posix/tst-dir.c, stdio-common/bug21.c * stdio-common/scanf14.c, stdio-common/scanf4.c, stdio-common/scanf7.c * stdio-common/test-vfprintf.c, stdio-common/tst-printf.c * stdio-common/tst-printfsz.c, stdio-common/tst-sprintf.c * stdio-common/tst-unlockedio.c, stdio-common/tstdiomisc.c * stdlib/bug-getcontext.c, string/tester.c, string/tst-endian.c * time/tst-strptime2.c, wcsmbs/tst-wcstof.c: Include libc-diag.h instead of libc-internal.h. * stdlib/tst-environ.c: Include libc-diag.h. Suppress -Wnonnull for call to unsetenv (NULL). * nptl/tst-mutex1.c: Include libc-diag.h. Suppress -Wnonnull for call to pthread_mutexattr_destroy (NULL).
138 lines
3.2 KiB
C
138 lines
3.2 KiB
C
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <wchar.h>
|
|
#include <libc-diag.h>
|
|
|
|
#define FAIL() \
|
|
do { \
|
|
result = 1; \
|
|
printf ("test at line %d failed\n", __LINE__); \
|
|
} while (0)
|
|
|
|
int
|
|
main (void)
|
|
{
|
|
wchar_t *lsp;
|
|
char *sp;
|
|
float f;
|
|
double d;
|
|
char c[8];
|
|
int result = 0;
|
|
|
|
if (sscanf (" 0.25s x", "%e%3c", &f, c) != 2)
|
|
FAIL ();
|
|
else if (f != 0.25 || memcmp (c, "s x", 3) != 0)
|
|
FAIL ();
|
|
/* GCC in C99 mode treats %a as the C99 format expecting float *,
|
|
but glibc with _GNU_SOURCE treats %as as the GNU allocation
|
|
extension, so resulting in "warning: format '%a' expects argument
|
|
of type 'float *', but argument 3 has type 'char **'". This
|
|
applies to the other %as, %aS and %a[] formats below as well. */
|
|
DIAG_PUSH_NEEDS_COMMENT;
|
|
DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wformat");
|
|
if (sscanf (" 1.25s x", "%as%2c", &sp, c) != 2)
|
|
FAIL ();
|
|
else
|
|
{
|
|
if (strcmp (sp, "1.25s") != 0 || memcmp (c, " x", 2) != 0)
|
|
FAIL ();
|
|
memset (sp, 'x', sizeof "1.25s");
|
|
free (sp);
|
|
}
|
|
DIAG_POP_NEEDS_COMMENT;
|
|
if (sscanf (" 2.25s x", "%las%2c", &d, c) != 2)
|
|
FAIL ();
|
|
else if (d != 2.25 || memcmp (c, " x", 2) != 0)
|
|
FAIL ();
|
|
/* See explanation above. */
|
|
DIAG_PUSH_NEEDS_COMMENT;
|
|
DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wformat");
|
|
if (sscanf (" 3.25S x", "%4aS%3c", &lsp, c) != 2)
|
|
FAIL ();
|
|
else
|
|
{
|
|
if (wcscmp (lsp, L"3.25") != 0 || memcmp (c, "S x", 3) != 0)
|
|
FAIL ();
|
|
memset (lsp, 'x', sizeof L"3.25");
|
|
free (lsp);
|
|
}
|
|
if (sscanf ("4.25[0-9.] x", "%a[0-9.]%8c", &sp, c) != 2)
|
|
FAIL ();
|
|
else
|
|
{
|
|
if (strcmp (sp, "4.25") != 0 || memcmp (c, "[0-9.] x", 8) != 0)
|
|
FAIL ();
|
|
memset (sp, 'x', sizeof "4.25");
|
|
free (sp);
|
|
}
|
|
DIAG_POP_NEEDS_COMMENT;
|
|
if (sscanf ("5.25[0-9.] x", "%la[0-9.]%2c", &d, c) != 2)
|
|
FAIL ();
|
|
else if (d != 5.25 || memcmp (c, " x", 2) != 0)
|
|
FAIL ();
|
|
|
|
const char *tmpdir = getenv ("TMPDIR");
|
|
if (tmpdir == NULL || tmpdir[0] == '\0')
|
|
tmpdir = "/tmp";
|
|
|
|
char fname[strlen (tmpdir) + sizeof "/tst-scanf14.XXXXXX"];
|
|
sprintf (fname, "%s/tst-scanf14.XXXXXX", tmpdir);
|
|
if (fname == NULL)
|
|
FAIL ();
|
|
|
|
/* Create a temporary file. */
|
|
int fd = mkstemp (fname);
|
|
if (fd == -1)
|
|
FAIL ();
|
|
|
|
FILE *fp = fdopen (fd, "w+");
|
|
if (fp == NULL)
|
|
FAIL ();
|
|
else
|
|
{
|
|
if (fputs (" 1.25s x", fp) == EOF)
|
|
FAIL ();
|
|
if (fseek (fp, 0, SEEK_SET) != 0)
|
|
FAIL ();
|
|
/* See explanation above. */
|
|
DIAG_PUSH_NEEDS_COMMENT;
|
|
DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wformat");
|
|
if (fscanf (fp, "%as%2c", &sp, c) != 2)
|
|
FAIL ();
|
|
else
|
|
{
|
|
if (strcmp (sp, "1.25s") != 0 || memcmp (c, " x", 2) != 0)
|
|
FAIL ();
|
|
memset (sp, 'x', sizeof "1.25s");
|
|
free (sp);
|
|
}
|
|
DIAG_POP_NEEDS_COMMENT;
|
|
|
|
if (freopen (fname, "r", stdin) == NULL)
|
|
FAIL ();
|
|
else
|
|
{
|
|
/* See explanation above. */
|
|
DIAG_PUSH_NEEDS_COMMENT;
|
|
DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wformat");
|
|
if (scanf ("%as%2c", &sp, c) != 2)
|
|
FAIL ();
|
|
else
|
|
{
|
|
if (strcmp (sp, "1.25s") != 0 || memcmp (c, " x", 2) != 0)
|
|
FAIL ();
|
|
memset (sp, 'x', sizeof "1.25s");
|
|
free (sp);
|
|
}
|
|
DIAG_POP_NEEDS_COMMENT;
|
|
}
|
|
|
|
fclose (fp);
|
|
}
|
|
|
|
remove (fname);
|
|
|
|
return result;
|
|
}
|