diff options
author | Zack Weinberg <zackw@panix.com> | 2016-11-20 20:46:30 -0500 |
---|---|---|
committer | Zack Weinberg <zackw@panix.com> | 2017-02-25 09:59:46 -0500 |
commit | e15f7de60c26bb75fe1923b17c5f0461164d1a41 (patch) | |
tree | d13a54b7a2d5c1f0046a5c7a704c42a6a8248219 /stdio-common | |
parent | 7caa5054afc1754a871333b1539e08a4af79444e (diff) | |
download | glibc-e15f7de60c26bb75fe1923b17c5f0461164d1a41.tar.gz |
Split DIAG_* macros to new header libc-diag.h.
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).
Diffstat (limited to 'stdio-common')
-rw-r--r-- | stdio-common/bug21.c | 2 | ||||
-rw-r--r-- | stdio-common/scanf14.c | 2 | ||||
-rw-r--r-- | stdio-common/scanf4.c | 2 | ||||
-rw-r--r-- | stdio-common/scanf7.c | 2 | ||||
-rw-r--r-- | stdio-common/test-vfprintf.c | 2 | ||||
-rw-r--r-- | stdio-common/tst-printf.c | 2 | ||||
-rw-r--r-- | stdio-common/tst-printfsz.c | 2 | ||||
-rw-r--r-- | stdio-common/tst-sprintf.c | 2 | ||||
-rw-r--r-- | stdio-common/tst-unlockedio.c | 2 | ||||
-rw-r--r-- | stdio-common/tstdiomisc.c | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/stdio-common/bug21.c b/stdio-common/bug21.c index ca27272ba1..7a8c6a3542 100644 --- a/stdio-common/bug21.c +++ b/stdio-common/bug21.c @@ -1,5 +1,5 @@ #include <stdio.h> -#include <libc-internal.h> +#include <libc-diag.h> static int do_test (void) diff --git a/stdio-common/scanf14.c b/stdio-common/scanf14.c index cffccb0b19..2bcd9c9893 100644 --- a/stdio-common/scanf14.c +++ b/stdio-common/scanf14.c @@ -2,7 +2,7 @@ #include <stdlib.h> #include <string.h> #include <wchar.h> -#include <libc-internal.h> +#include <libc-diag.h> #define FAIL() \ do { \ diff --git a/stdio-common/scanf4.c b/stdio-common/scanf4.c index 9bb14bb16b..7a2abec89b 100644 --- a/stdio-common/scanf4.c +++ b/stdio-common/scanf4.c @@ -1,6 +1,6 @@ #include <stdio.h> #include <stdlib.h> -#include <libc-internal.h> +#include <libc-diag.h> int main(int arc, char *argv[]) diff --git a/stdio-common/scanf7.c b/stdio-common/scanf7.c index 53ddf4cb09..f568738d7e 100644 --- a/stdio-common/scanf7.c +++ b/stdio-common/scanf7.c @@ -1,6 +1,6 @@ #include <stdio.h> #include <stdlib.h> -#include <libc-internal.h> +#include <libc-diag.h> int main (int argc, char *argv[]) diff --git a/stdio-common/test-vfprintf.c b/stdio-common/test-vfprintf.c index f1805d5d00..f8bb9cee58 100644 --- a/stdio-common/test-vfprintf.c +++ b/stdio-common/test-vfprintf.c @@ -25,7 +25,7 @@ #include <string.h> #include <unistd.h> #include <sys/stat.h> -#include <libc-internal.h> +#include <libc-diag.h> const char *locs[] = diff --git a/stdio-common/tst-printf.c b/stdio-common/tst-printf.c index 719b3eb08c..b6d62a5a2f 100644 --- a/stdio-common/tst-printf.c +++ b/stdio-common/tst-printf.c @@ -26,7 +26,7 @@ #endif #include <float.h> -#include <libc-internal.h> +#include <libc-diag.h> /* This whole file is picayune tests of corner cases of printf format strings. The compiler warnings are not useful here. */ diff --git a/stdio-common/tst-printfsz.c b/stdio-common/tst-printfsz.c index 8a3385f94d..47aa8536b3 100644 --- a/stdio-common/tst-printfsz.c +++ b/stdio-common/tst-printfsz.c @@ -2,7 +2,7 @@ #include <printf.h> #include <stdio.h> #include <string.h> -#include <libc-internal.h> +#include <libc-diag.h> #define V 12345678.12345678 diff --git a/stdio-common/tst-sprintf.c b/stdio-common/tst-sprintf.c index d5284b9697..cbd35447a9 100644 --- a/stdio-common/tst-sprintf.c +++ b/stdio-common/tst-sprintf.c @@ -2,7 +2,7 @@ #include <stdlib.h> #include <locale.h> #include <string.h> -#include <libc-internal.h> +#include <libc-diag.h> static int diff --git a/stdio-common/tst-unlockedio.c b/stdio-common/tst-unlockedio.c index 6eec6fdbac..35652ce772 100644 --- a/stdio-common/tst-unlockedio.c +++ b/stdio-common/tst-unlockedio.c @@ -20,7 +20,7 @@ #include <stdlib.h> #include <stdio.h> #include <string.h> -#include <libc-internal.h> +#include <libc-diag.h> int fd; static void do_prepare (void); diff --git a/stdio-common/tstdiomisc.c b/stdio-common/tstdiomisc.c index 9c7342d55f..89009e0549 100644 --- a/stdio-common/tstdiomisc.c +++ b/stdio-common/tstdiomisc.c @@ -3,7 +3,7 @@ #include <stdio.h> #include <string.h> #include <wchar.h> -#include <libc-internal.h> +#include <libc-diag.h> static int t1 (void) |