From: Maciej W. Rozycki Date: Sat, 23 Aug 2025 00:02:10 +0000 (+0100) Subject: stdio-common: Adjust header inclusion in scanf input specifier tests X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a1e5ee13ab9b786f291c8f55f93db11be1ae286c;p=thirdparty%2Fglibc.git stdio-common: Adjust header inclusion in scanf input specifier tests Move the inclusion of the data class header from the individual tests to the data-type-specific skeleton, providing for the use of the data type under test in the data class header and reducing duplication. Reviewed-by: Adhemerval Zanella --- diff --git a/stdio-common/tst-scanf-format-f-c.c b/stdio-common/tst-scanf-format-f-c.c index 144221a6d9..143f94a700 100644 --- a/stdio-common/tst-scanf-format-f-c.c +++ b/stdio-common/tst-scanf-format-f-c.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-f.h" -#include "tst-scanf-format-character.h" #include diff --git a/stdio-common/tst-scanf-format-f-char.c b/stdio-common/tst-scanf-format-f-char.c index efa7c1a4b2..ba70d6ebe3 100644 --- a/stdio-common/tst-scanf-format-f-char.c +++ b/stdio-common/tst-scanf-format-f-char.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-f.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-f-double.c b/stdio-common/tst-scanf-format-f-double.c index 668a975c1e..45e6fee71c 100644 --- a/stdio-common/tst-scanf-format-f-double.c +++ b/stdio-common/tst-scanf-format-f-double.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-f.h" -#include "tst-scanf-format-real.h" #include diff --git a/stdio-common/tst-scanf-format-f-float.c b/stdio-common/tst-scanf-format-f-float.c index 07d65efd81..fcf6132427 100644 --- a/stdio-common/tst-scanf-format-f-float.c +++ b/stdio-common/tst-scanf-format-f-float.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-f.h" -#include "tst-scanf-format-real.h" #include diff --git a/stdio-common/tst-scanf-format-f-int.c b/stdio-common/tst-scanf-format-f-int.c index 4b1a5f0f72..cec4352c51 100644 --- a/stdio-common/tst-scanf-format-f-int.c +++ b/stdio-common/tst-scanf-format-f-int.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-f.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-f-ldouble.c b/stdio-common/tst-scanf-format-f-ldouble.c index 2aacd9de59..01285976a1 100644 --- a/stdio-common/tst-scanf-format-f-ldouble.c +++ b/stdio-common/tst-scanf-format-f-ldouble.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-f.h" -#include "tst-scanf-format-real.h" #include diff --git a/stdio-common/tst-scanf-format-f-llong.c b/stdio-common/tst-scanf-format-f-llong.c index 45d0f8b1d3..63ff399843 100644 --- a/stdio-common/tst-scanf-format-f-llong.c +++ b/stdio-common/tst-scanf-format-f-llong.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-f.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-f-long.c b/stdio-common/tst-scanf-format-f-long.c index bcb2e23ec5..fa08ef220c 100644 --- a/stdio-common/tst-scanf-format-f-long.c +++ b/stdio-common/tst-scanf-format-f-long.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-f.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-f-short.c b/stdio-common/tst-scanf-format-f-short.c index e384f3d1d1..c901fbc824 100644 --- a/stdio-common/tst-scanf-format-f-short.c +++ b/stdio-common/tst-scanf-format-f-short.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-f.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-f-uchar.c b/stdio-common/tst-scanf-format-f-uchar.c index 0037aeafc5..6d0ab1a7bb 100644 --- a/stdio-common/tst-scanf-format-f-uchar.c +++ b/stdio-common/tst-scanf-format-f-uchar.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-f.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-f-uint.c b/stdio-common/tst-scanf-format-f-uint.c index 6e7a85a80a..b7971f893f 100644 --- a/stdio-common/tst-scanf-format-f-uint.c +++ b/stdio-common/tst-scanf-format-f-uint.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-f.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-f-ullong.c b/stdio-common/tst-scanf-format-f-ullong.c index 71124ea4d7..5faa5d67f7 100644 --- a/stdio-common/tst-scanf-format-f-ullong.c +++ b/stdio-common/tst-scanf-format-f-ullong.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-f.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-f-ulong.c b/stdio-common/tst-scanf-format-f-ulong.c index c0226c601e..ba664986b3 100644 --- a/stdio-common/tst-scanf-format-f-ulong.c +++ b/stdio-common/tst-scanf-format-f-ulong.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-f.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-f-ushort.c b/stdio-common/tst-scanf-format-f-ushort.c index b4aeb33914..35264ee8a7 100644 --- a/stdio-common/tst-scanf-format-f-ushort.c +++ b/stdio-common/tst-scanf-format-f-ushort.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-f.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-s-c.c b/stdio-common/tst-scanf-format-s-c.c index bbfc0000ff..6778cd18b0 100644 --- a/stdio-common/tst-scanf-format-s-c.c +++ b/stdio-common/tst-scanf-format-s-c.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-s.h" -#include "tst-scanf-format-character.h" #include diff --git a/stdio-common/tst-scanf-format-s-char.c b/stdio-common/tst-scanf-format-s-char.c index c13527deb8..b06756a62c 100644 --- a/stdio-common/tst-scanf-format-s-char.c +++ b/stdio-common/tst-scanf-format-s-char.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-s.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-s-double.c b/stdio-common/tst-scanf-format-s-double.c index 4baad01d51..8af7b91e8e 100644 --- a/stdio-common/tst-scanf-format-s-double.c +++ b/stdio-common/tst-scanf-format-s-double.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-s.h" -#include "tst-scanf-format-real.h" #include diff --git a/stdio-common/tst-scanf-format-s-float.c b/stdio-common/tst-scanf-format-s-float.c index 301b2621e9..b14f4c4dda 100644 --- a/stdio-common/tst-scanf-format-s-float.c +++ b/stdio-common/tst-scanf-format-s-float.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-s.h" -#include "tst-scanf-format-real.h" #include diff --git a/stdio-common/tst-scanf-format-s-int.c b/stdio-common/tst-scanf-format-s-int.c index e176fe9df4..368aafccdb 100644 --- a/stdio-common/tst-scanf-format-s-int.c +++ b/stdio-common/tst-scanf-format-s-int.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-s.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-s-ldouble.c b/stdio-common/tst-scanf-format-s-ldouble.c index dbb007ce93..67718c22ba 100644 --- a/stdio-common/tst-scanf-format-s-ldouble.c +++ b/stdio-common/tst-scanf-format-s-ldouble.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-s.h" -#include "tst-scanf-format-real.h" #include diff --git a/stdio-common/tst-scanf-format-s-llong.c b/stdio-common/tst-scanf-format-s-llong.c index fe3d11a982..51a98e75a8 100644 --- a/stdio-common/tst-scanf-format-s-llong.c +++ b/stdio-common/tst-scanf-format-s-llong.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-s.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-s-long.c b/stdio-common/tst-scanf-format-s-long.c index 415e5fae2c..2061d9c01d 100644 --- a/stdio-common/tst-scanf-format-s-long.c +++ b/stdio-common/tst-scanf-format-s-long.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-s.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-s-short.c b/stdio-common/tst-scanf-format-s-short.c index d545ee26d7..11a7bc1904 100644 --- a/stdio-common/tst-scanf-format-s-short.c +++ b/stdio-common/tst-scanf-format-s-short.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-s.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-s-uchar.c b/stdio-common/tst-scanf-format-s-uchar.c index a1a7f73f84..abde422809 100644 --- a/stdio-common/tst-scanf-format-s-uchar.c +++ b/stdio-common/tst-scanf-format-s-uchar.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-s.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-s-uint.c b/stdio-common/tst-scanf-format-s-uint.c index 27b0f4af5a..b51f11ec6c 100644 --- a/stdio-common/tst-scanf-format-s-uint.c +++ b/stdio-common/tst-scanf-format-s-uint.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-s.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-s-ullong.c b/stdio-common/tst-scanf-format-s-ullong.c index 9cc45b4257..0ecf363239 100644 --- a/stdio-common/tst-scanf-format-s-ullong.c +++ b/stdio-common/tst-scanf-format-s-ullong.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-s.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-s-ulong.c b/stdio-common/tst-scanf-format-s-ulong.c index 9c5543e5ed..9531e7c540 100644 --- a/stdio-common/tst-scanf-format-s-ulong.c +++ b/stdio-common/tst-scanf-format-s-ulong.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-s.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-s-ushort.c b/stdio-common/tst-scanf-format-s-ushort.c index 052a1caa7b..49ff05bdcb 100644 --- a/stdio-common/tst-scanf-format-s-ushort.c +++ b/stdio-common/tst-scanf-format-s-ushort.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-s.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-skeleton-c.c b/stdio-common/tst-scanf-format-skeleton-c.c index 181077fb38..a25fda00cd 100644 --- a/stdio-common/tst-scanf-format-skeleton-c.c +++ b/stdio-common/tst-scanf-format-skeleton-c.c @@ -18,4 +18,5 @@ typedef char *type_t; +#include "tst-scanf-format-character.h" #include "tst-scanf-format-skeleton.c" diff --git a/stdio-common/tst-scanf-format-skeleton-char.c b/stdio-common/tst-scanf-format-skeleton-char.c index a694de4892..b419d94ad3 100644 --- a/stdio-common/tst-scanf-format-skeleton-char.c +++ b/stdio-common/tst-scanf-format-skeleton-char.c @@ -18,4 +18,5 @@ typedef signed char type_t; +#include "tst-scanf-format-integer.h" #include "tst-scanf-format-skeleton.c" diff --git a/stdio-common/tst-scanf-format-skeleton-double.c b/stdio-common/tst-scanf-format-skeleton-double.c index 502f2ad3f7..c3aeef7f33 100644 --- a/stdio-common/tst-scanf-format-skeleton-double.c +++ b/stdio-common/tst-scanf-format-skeleton-double.c @@ -18,4 +18,5 @@ typedef double type_t; +#include "tst-scanf-format-real.h" #include "tst-scanf-format-skeleton.c" diff --git a/stdio-common/tst-scanf-format-skeleton-float.c b/stdio-common/tst-scanf-format-skeleton-float.c index 2104c0f6c9..5b34ee8204 100644 --- a/stdio-common/tst-scanf-format-skeleton-float.c +++ b/stdio-common/tst-scanf-format-skeleton-float.c @@ -18,4 +18,5 @@ typedef float type_t; +#include "tst-scanf-format-real.h" #include "tst-scanf-format-skeleton.c" diff --git a/stdio-common/tst-scanf-format-skeleton-int.c b/stdio-common/tst-scanf-format-skeleton-int.c index eb4e9de2db..483d4a995b 100644 --- a/stdio-common/tst-scanf-format-skeleton-int.c +++ b/stdio-common/tst-scanf-format-skeleton-int.c @@ -18,4 +18,5 @@ typedef int type_t; +#include "tst-scanf-format-integer.h" #include "tst-scanf-format-skeleton.c" diff --git a/stdio-common/tst-scanf-format-skeleton-ldouble.c b/stdio-common/tst-scanf-format-skeleton-ldouble.c index 3649110ed3..83a3de716a 100644 --- a/stdio-common/tst-scanf-format-skeleton-ldouble.c +++ b/stdio-common/tst-scanf-format-skeleton-ldouble.c @@ -18,4 +18,5 @@ typedef long double type_t; +#include "tst-scanf-format-real.h" #include "tst-scanf-format-skeleton.c" diff --git a/stdio-common/tst-scanf-format-skeleton-llong.c b/stdio-common/tst-scanf-format-skeleton-llong.c index 8b8324e99f..e669f41d2f 100644 --- a/stdio-common/tst-scanf-format-skeleton-llong.c +++ b/stdio-common/tst-scanf-format-skeleton-llong.c @@ -18,4 +18,5 @@ typedef long long int type_t; +#include "tst-scanf-format-integer.h" #include "tst-scanf-format-skeleton.c" diff --git a/stdio-common/tst-scanf-format-skeleton-long.c b/stdio-common/tst-scanf-format-skeleton-long.c index 91aa0913fd..cdf3cc358a 100644 --- a/stdio-common/tst-scanf-format-skeleton-long.c +++ b/stdio-common/tst-scanf-format-skeleton-long.c @@ -18,4 +18,5 @@ typedef long int type_t; +#include "tst-scanf-format-integer.h" #include "tst-scanf-format-skeleton.c" diff --git a/stdio-common/tst-scanf-format-skeleton-short.c b/stdio-common/tst-scanf-format-skeleton-short.c index ca51a2533c..329722cdd5 100644 --- a/stdio-common/tst-scanf-format-skeleton-short.c +++ b/stdio-common/tst-scanf-format-skeleton-short.c @@ -18,4 +18,5 @@ typedef short int type_t; +#include "tst-scanf-format-integer.h" #include "tst-scanf-format-skeleton.c" diff --git a/stdio-common/tst-scanf-format-skeleton-uchar.c b/stdio-common/tst-scanf-format-skeleton-uchar.c index 6be8917e3b..fb52e1e3a7 100644 --- a/stdio-common/tst-scanf-format-skeleton-uchar.c +++ b/stdio-common/tst-scanf-format-skeleton-uchar.c @@ -19,4 +19,5 @@ #define TYPE_T_UNSIGNED_P 1 typedef unsigned char type_t; +#include "tst-scanf-format-integer.h" #include "tst-scanf-format-skeleton.c" diff --git a/stdio-common/tst-scanf-format-skeleton-uint.c b/stdio-common/tst-scanf-format-skeleton-uint.c index 1508dc3919..5b5a64326b 100644 --- a/stdio-common/tst-scanf-format-skeleton-uint.c +++ b/stdio-common/tst-scanf-format-skeleton-uint.c @@ -19,4 +19,5 @@ #define TYPE_T_UNSIGNED_P 1 typedef unsigned int type_t; +#include "tst-scanf-format-integer.h" #include "tst-scanf-format-skeleton.c" diff --git a/stdio-common/tst-scanf-format-skeleton-ullong.c b/stdio-common/tst-scanf-format-skeleton-ullong.c index b0b8050e2d..99dc8a7be8 100644 --- a/stdio-common/tst-scanf-format-skeleton-ullong.c +++ b/stdio-common/tst-scanf-format-skeleton-ullong.c @@ -19,4 +19,5 @@ #define TYPE_T_UNSIGNED_P 1 typedef unsigned long long int type_t; +#include "tst-scanf-format-integer.h" #include "tst-scanf-format-skeleton.c" diff --git a/stdio-common/tst-scanf-format-skeleton-ulong.c b/stdio-common/tst-scanf-format-skeleton-ulong.c index 319882511e..e0989b336d 100644 --- a/stdio-common/tst-scanf-format-skeleton-ulong.c +++ b/stdio-common/tst-scanf-format-skeleton-ulong.c @@ -19,4 +19,5 @@ #define TYPE_T_UNSIGNED_P 1 typedef unsigned long int type_t; +#include "tst-scanf-format-integer.h" #include "tst-scanf-format-skeleton.c" diff --git a/stdio-common/tst-scanf-format-skeleton-ushort.c b/stdio-common/tst-scanf-format-skeleton-ushort.c index 2b710c5eca..fe006d23d8 100644 --- a/stdio-common/tst-scanf-format-skeleton-ushort.c +++ b/stdio-common/tst-scanf-format-skeleton-ushort.c @@ -19,4 +19,5 @@ #define TYPE_T_UNSIGNED_P 1 typedef unsigned short int type_t; +#include "tst-scanf-format-integer.h" #include "tst-scanf-format-skeleton.c" diff --git a/stdio-common/tst-scanf-format-ss-c.c b/stdio-common/tst-scanf-format-ss-c.c index 2dcb6a2b27..02e79eb305 100644 --- a/stdio-common/tst-scanf-format-ss-c.c +++ b/stdio-common/tst-scanf-format-ss-c.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-ss.h" -#include "tst-scanf-format-character.h" #include diff --git a/stdio-common/tst-scanf-format-ss-char.c b/stdio-common/tst-scanf-format-ss-char.c index 8e8fbf4a3c..268914a66e 100644 --- a/stdio-common/tst-scanf-format-ss-char.c +++ b/stdio-common/tst-scanf-format-ss-char.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-ss.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-ss-double.c b/stdio-common/tst-scanf-format-ss-double.c index a272ef7226..da29cfbd55 100644 --- a/stdio-common/tst-scanf-format-ss-double.c +++ b/stdio-common/tst-scanf-format-ss-double.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-ss.h" -#include "tst-scanf-format-real.h" #include diff --git a/stdio-common/tst-scanf-format-ss-float.c b/stdio-common/tst-scanf-format-ss-float.c index 23818b6e34..01ccea4184 100644 --- a/stdio-common/tst-scanf-format-ss-float.c +++ b/stdio-common/tst-scanf-format-ss-float.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-ss.h" -#include "tst-scanf-format-real.h" #include diff --git a/stdio-common/tst-scanf-format-ss-int.c b/stdio-common/tst-scanf-format-ss-int.c index 99f8e9d834..8367995027 100644 --- a/stdio-common/tst-scanf-format-ss-int.c +++ b/stdio-common/tst-scanf-format-ss-int.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-ss.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-ss-ldouble.c b/stdio-common/tst-scanf-format-ss-ldouble.c index ddfe50fbd3..842d75896d 100644 --- a/stdio-common/tst-scanf-format-ss-ldouble.c +++ b/stdio-common/tst-scanf-format-ss-ldouble.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-ss.h" -#include "tst-scanf-format-real.h" #include diff --git a/stdio-common/tst-scanf-format-ss-llong.c b/stdio-common/tst-scanf-format-ss-llong.c index 642cbe929c..04d802d8c8 100644 --- a/stdio-common/tst-scanf-format-ss-llong.c +++ b/stdio-common/tst-scanf-format-ss-llong.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-ss.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-ss-long.c b/stdio-common/tst-scanf-format-ss-long.c index a1d302c345..4850e02b57 100644 --- a/stdio-common/tst-scanf-format-ss-long.c +++ b/stdio-common/tst-scanf-format-ss-long.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-ss.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-ss-short.c b/stdio-common/tst-scanf-format-ss-short.c index 87aac399bd..f1d6a838ed 100644 --- a/stdio-common/tst-scanf-format-ss-short.c +++ b/stdio-common/tst-scanf-format-ss-short.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-ss.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-ss-uchar.c b/stdio-common/tst-scanf-format-ss-uchar.c index fb70215fc9..ee8eedeef3 100644 --- a/stdio-common/tst-scanf-format-ss-uchar.c +++ b/stdio-common/tst-scanf-format-ss-uchar.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-ss.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-ss-uint.c b/stdio-common/tst-scanf-format-ss-uint.c index ef8f274bcd..9ba39dc5b6 100644 --- a/stdio-common/tst-scanf-format-ss-uint.c +++ b/stdio-common/tst-scanf-format-ss-uint.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-ss.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-ss-ullong.c b/stdio-common/tst-scanf-format-ss-ullong.c index c74d757665..4b71d8ce69 100644 --- a/stdio-common/tst-scanf-format-ss-ullong.c +++ b/stdio-common/tst-scanf-format-ss-ullong.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-ss.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-ss-ulong.c b/stdio-common/tst-scanf-format-ss-ulong.c index ac8644ee10..613ccafc1f 100644 --- a/stdio-common/tst-scanf-format-ss-ulong.c +++ b/stdio-common/tst-scanf-format-ss-ulong.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-ss.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-ss-ushort.c b/stdio-common/tst-scanf-format-ss-ushort.c index 51ec0c3072..91459693f9 100644 --- a/stdio-common/tst-scanf-format-ss-ushort.c +++ b/stdio-common/tst-scanf-format-ss-ushort.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-ss.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-v-c.c b/stdio-common/tst-scanf-format-v-c.c index 15e4a41b8c..6ff87822ab 100644 --- a/stdio-common/tst-scanf-format-v-c.c +++ b/stdio-common/tst-scanf-format-v-c.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-v.h" -#include "tst-scanf-format-character.h" #include diff --git a/stdio-common/tst-scanf-format-v-char.c b/stdio-common/tst-scanf-format-v-char.c index ed27c3c8a2..7e1ccf7a6a 100644 --- a/stdio-common/tst-scanf-format-v-char.c +++ b/stdio-common/tst-scanf-format-v-char.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-v.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-v-double.c b/stdio-common/tst-scanf-format-v-double.c index 6803d3a74e..5dfa11082b 100644 --- a/stdio-common/tst-scanf-format-v-double.c +++ b/stdio-common/tst-scanf-format-v-double.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-v.h" -#include "tst-scanf-format-real.h" #include diff --git a/stdio-common/tst-scanf-format-v-float.c b/stdio-common/tst-scanf-format-v-float.c index ecd094973e..2243dd6323 100644 --- a/stdio-common/tst-scanf-format-v-float.c +++ b/stdio-common/tst-scanf-format-v-float.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-v.h" -#include "tst-scanf-format-real.h" #include diff --git a/stdio-common/tst-scanf-format-v-int.c b/stdio-common/tst-scanf-format-v-int.c index 0574fc0bf5..5d59e395af 100644 --- a/stdio-common/tst-scanf-format-v-int.c +++ b/stdio-common/tst-scanf-format-v-int.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-v.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-v-ldouble.c b/stdio-common/tst-scanf-format-v-ldouble.c index 9adbb81e5b..0527f0d0ac 100644 --- a/stdio-common/tst-scanf-format-v-ldouble.c +++ b/stdio-common/tst-scanf-format-v-ldouble.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-v.h" -#include "tst-scanf-format-real.h" #include diff --git a/stdio-common/tst-scanf-format-v-llong.c b/stdio-common/tst-scanf-format-v-llong.c index 427be60e75..3f635d97bf 100644 --- a/stdio-common/tst-scanf-format-v-llong.c +++ b/stdio-common/tst-scanf-format-v-llong.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-v.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-v-long.c b/stdio-common/tst-scanf-format-v-long.c index 9b10ff63de..3473093a12 100644 --- a/stdio-common/tst-scanf-format-v-long.c +++ b/stdio-common/tst-scanf-format-v-long.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-v.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-v-short.c b/stdio-common/tst-scanf-format-v-short.c index 597e7ea646..61a66ba0a6 100644 --- a/stdio-common/tst-scanf-format-v-short.c +++ b/stdio-common/tst-scanf-format-v-short.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-v.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-v-uchar.c b/stdio-common/tst-scanf-format-v-uchar.c index 9cb0d22b5c..7e98b61354 100644 --- a/stdio-common/tst-scanf-format-v-uchar.c +++ b/stdio-common/tst-scanf-format-v-uchar.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-v.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-v-uint.c b/stdio-common/tst-scanf-format-v-uint.c index af8eab2d1c..82ae619681 100644 --- a/stdio-common/tst-scanf-format-v-uint.c +++ b/stdio-common/tst-scanf-format-v-uint.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-v.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-v-ullong.c b/stdio-common/tst-scanf-format-v-ullong.c index bf7ff85264..a76790658e 100644 --- a/stdio-common/tst-scanf-format-v-ullong.c +++ b/stdio-common/tst-scanf-format-v-ullong.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-v.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-v-ulong.c b/stdio-common/tst-scanf-format-v-ulong.c index 0d3d8b76a3..1b50b79a3a 100644 --- a/stdio-common/tst-scanf-format-v-ulong.c +++ b/stdio-common/tst-scanf-format-v-ulong.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-v.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-v-ushort.c b/stdio-common/tst-scanf-format-v-ushort.c index 27bde536bf..e268273ad3 100644 --- a/stdio-common/tst-scanf-format-v-ushort.c +++ b/stdio-common/tst-scanf-format-v-ushort.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-v.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-vf-c.c b/stdio-common/tst-scanf-format-vf-c.c index f6e6bcdcf1..d69b816c13 100644 --- a/stdio-common/tst-scanf-format-vf-c.c +++ b/stdio-common/tst-scanf-format-vf-c.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vf.h" -#include "tst-scanf-format-character.h" #include diff --git a/stdio-common/tst-scanf-format-vf-char.c b/stdio-common/tst-scanf-format-vf-char.c index 0d9a28cccf..7ce3b1c7a6 100644 --- a/stdio-common/tst-scanf-format-vf-char.c +++ b/stdio-common/tst-scanf-format-vf-char.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vf.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-vf-double.c b/stdio-common/tst-scanf-format-vf-double.c index bc0e315c3f..596514415e 100644 --- a/stdio-common/tst-scanf-format-vf-double.c +++ b/stdio-common/tst-scanf-format-vf-double.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vf.h" -#include "tst-scanf-format-real.h" #include diff --git a/stdio-common/tst-scanf-format-vf-float.c b/stdio-common/tst-scanf-format-vf-float.c index 7b8a2a1b0b..34b069dfd8 100644 --- a/stdio-common/tst-scanf-format-vf-float.c +++ b/stdio-common/tst-scanf-format-vf-float.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vf.h" -#include "tst-scanf-format-real.h" #include diff --git a/stdio-common/tst-scanf-format-vf-int.c b/stdio-common/tst-scanf-format-vf-int.c index e055b62585..289595b4cf 100644 --- a/stdio-common/tst-scanf-format-vf-int.c +++ b/stdio-common/tst-scanf-format-vf-int.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vf.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-vf-ldouble.c b/stdio-common/tst-scanf-format-vf-ldouble.c index 8c5557519c..33937038ee 100644 --- a/stdio-common/tst-scanf-format-vf-ldouble.c +++ b/stdio-common/tst-scanf-format-vf-ldouble.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vf.h" -#include "tst-scanf-format-real.h" #include diff --git a/stdio-common/tst-scanf-format-vf-llong.c b/stdio-common/tst-scanf-format-vf-llong.c index 3ef4a77c83..ccc09128ea 100644 --- a/stdio-common/tst-scanf-format-vf-llong.c +++ b/stdio-common/tst-scanf-format-vf-llong.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vf.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-vf-long.c b/stdio-common/tst-scanf-format-vf-long.c index c5eb1e5e35..d5499afc41 100644 --- a/stdio-common/tst-scanf-format-vf-long.c +++ b/stdio-common/tst-scanf-format-vf-long.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vf.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-vf-short.c b/stdio-common/tst-scanf-format-vf-short.c index 9c6e2c476f..715967da7c 100644 --- a/stdio-common/tst-scanf-format-vf-short.c +++ b/stdio-common/tst-scanf-format-vf-short.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vf.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-vf-uchar.c b/stdio-common/tst-scanf-format-vf-uchar.c index b24fb60136..61635457f6 100644 --- a/stdio-common/tst-scanf-format-vf-uchar.c +++ b/stdio-common/tst-scanf-format-vf-uchar.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vf.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-vf-uint.c b/stdio-common/tst-scanf-format-vf-uint.c index 0434b4119a..af240c5e0c 100644 --- a/stdio-common/tst-scanf-format-vf-uint.c +++ b/stdio-common/tst-scanf-format-vf-uint.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vf.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-vf-ullong.c b/stdio-common/tst-scanf-format-vf-ullong.c index 020d0d5a83..4863b48cfb 100644 --- a/stdio-common/tst-scanf-format-vf-ullong.c +++ b/stdio-common/tst-scanf-format-vf-ullong.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vf.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-vf-ulong.c b/stdio-common/tst-scanf-format-vf-ulong.c index 28e5efd5b7..886c771fba 100644 --- a/stdio-common/tst-scanf-format-vf-ulong.c +++ b/stdio-common/tst-scanf-format-vf-ulong.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vf.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-vf-ushort.c b/stdio-common/tst-scanf-format-vf-ushort.c index eca5fd21ad..b356598ed7 100644 --- a/stdio-common/tst-scanf-format-vf-ushort.c +++ b/stdio-common/tst-scanf-format-vf-ushort.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vf.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-vs-c.c b/stdio-common/tst-scanf-format-vs-c.c index 19875e0edc..fb3f380d2b 100644 --- a/stdio-common/tst-scanf-format-vs-c.c +++ b/stdio-common/tst-scanf-format-vs-c.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vs.h" -#include "tst-scanf-format-character.h" #include diff --git a/stdio-common/tst-scanf-format-vs-char.c b/stdio-common/tst-scanf-format-vs-char.c index 3f06ff77a6..5161d7202b 100644 --- a/stdio-common/tst-scanf-format-vs-char.c +++ b/stdio-common/tst-scanf-format-vs-char.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vs.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-vs-double.c b/stdio-common/tst-scanf-format-vs-double.c index 910d9f879c..042d3d9094 100644 --- a/stdio-common/tst-scanf-format-vs-double.c +++ b/stdio-common/tst-scanf-format-vs-double.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vs.h" -#include "tst-scanf-format-real.h" #include diff --git a/stdio-common/tst-scanf-format-vs-float.c b/stdio-common/tst-scanf-format-vs-float.c index 71566ee698..2d25132d05 100644 --- a/stdio-common/tst-scanf-format-vs-float.c +++ b/stdio-common/tst-scanf-format-vs-float.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vs.h" -#include "tst-scanf-format-real.h" #include diff --git a/stdio-common/tst-scanf-format-vs-int.c b/stdio-common/tst-scanf-format-vs-int.c index bee243020c..b3a40d6296 100644 --- a/stdio-common/tst-scanf-format-vs-int.c +++ b/stdio-common/tst-scanf-format-vs-int.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vs.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-vs-ldouble.c b/stdio-common/tst-scanf-format-vs-ldouble.c index a744d9661b..0ccc6b6412 100644 --- a/stdio-common/tst-scanf-format-vs-ldouble.c +++ b/stdio-common/tst-scanf-format-vs-ldouble.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vs.h" -#include "tst-scanf-format-real.h" #include diff --git a/stdio-common/tst-scanf-format-vs-llong.c b/stdio-common/tst-scanf-format-vs-llong.c index d0368ede49..100587eb29 100644 --- a/stdio-common/tst-scanf-format-vs-llong.c +++ b/stdio-common/tst-scanf-format-vs-llong.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vs.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-vs-long.c b/stdio-common/tst-scanf-format-vs-long.c index 4949f18e44..6f609d13a3 100644 --- a/stdio-common/tst-scanf-format-vs-long.c +++ b/stdio-common/tst-scanf-format-vs-long.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vs.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-vs-short.c b/stdio-common/tst-scanf-format-vs-short.c index 47ee05e07a..e97faee347 100644 --- a/stdio-common/tst-scanf-format-vs-short.c +++ b/stdio-common/tst-scanf-format-vs-short.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vs.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-vs-uchar.c b/stdio-common/tst-scanf-format-vs-uchar.c index 794803506c..2ec9c898ac 100644 --- a/stdio-common/tst-scanf-format-vs-uchar.c +++ b/stdio-common/tst-scanf-format-vs-uchar.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vs.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-vs-uint.c b/stdio-common/tst-scanf-format-vs-uint.c index 7832e80bd1..40553cf680 100644 --- a/stdio-common/tst-scanf-format-vs-uint.c +++ b/stdio-common/tst-scanf-format-vs-uint.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vs.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-vs-ullong.c b/stdio-common/tst-scanf-format-vs-ullong.c index 63ac934f55..a50e1730e9 100644 --- a/stdio-common/tst-scanf-format-vs-ullong.c +++ b/stdio-common/tst-scanf-format-vs-ullong.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vs.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-vs-ulong.c b/stdio-common/tst-scanf-format-vs-ulong.c index 3debd44470..e2076b6a6d 100644 --- a/stdio-common/tst-scanf-format-vs-ulong.c +++ b/stdio-common/tst-scanf-format-vs-ulong.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vs.h" -#include "tst-scanf-format-integer.h" #include diff --git a/stdio-common/tst-scanf-format-vs-ushort.c b/stdio-common/tst-scanf-format-vs-ushort.c index 92f19a97f0..af2a63f587 100644 --- a/stdio-common/tst-scanf-format-vs-ushort.c +++ b/stdio-common/tst-scanf-format-vs-ushort.c @@ -18,5 +18,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vs.h" -#include "tst-scanf-format-integer.h" #include diff --git a/sysdeps/ieee754/ldbl-96/tst-scanf-format-skeleton-ldouble.c b/sysdeps/ieee754/ldbl-96/tst-scanf-format-skeleton-ldouble.c index 7e8c1d66a6..79903ccb58 100644 --- a/sysdeps/ieee754/ldbl-96/tst-scanf-format-skeleton-ldouble.c +++ b/sysdeps/ieee754/ldbl-96/tst-scanf-format-skeleton-ldouble.c @@ -20,6 +20,10 @@ #include #include +typedef long double type_t; + +#include "tst-scanf-format-real.h" + #undef compare_real #define compare_real(x, y) \ ({ \ @@ -28,6 +32,4 @@ && ux.parts.sign_exponent == uy.parts.sign_exponent); \ }) -typedef long double type_t; - #include "tst-scanf-format-skeleton.c"