From: Maciej W. Rozycki Date: Sat, 23 Aug 2025 00:02:10 +0000 (+0100) Subject: stdio-common: Include correct skeleton in scanf input specifier tests X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2419637eb034d2be63707de035b8ac1c877a903d;p=thirdparty%2Fglibc.git stdio-common: Include correct skeleton in scanf input specifier tests Follow 'scanf' itself and use the system header inclusion variant for the data-type-specific skeleton consistently across the remaining scanf family functions so that any sysdeps/ variant takes precedence even in the presence of a corresponding skeleton in stdio-common/ (though we have no such arrangement at the moment). 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 75ce3cd7c3..144221a6d9 100644 --- a/stdio-common/tst-scanf-format-f-c.c +++ b/stdio-common/tst-scanf-format-f-c.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-f.h" #include "tst-scanf-format-character.h" -#include "tst-scanf-format-skeleton-c.c" +#include diff --git a/stdio-common/tst-scanf-format-f-char.c b/stdio-common/tst-scanf-format-f-char.c index ee5fbe9e1f..efa7c1a4b2 100644 --- a/stdio-common/tst-scanf-format-f-char.c +++ b/stdio-common/tst-scanf-format-f-char.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-f.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-char.c" +#include diff --git a/stdio-common/tst-scanf-format-f-double.c b/stdio-common/tst-scanf-format-f-double.c index 1fb25b56b2..668a975c1e 100644 --- a/stdio-common/tst-scanf-format-f-double.c +++ b/stdio-common/tst-scanf-format-f-double.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-f.h" #include "tst-scanf-format-real.h" -#include "tst-scanf-format-skeleton-double.c" +#include diff --git a/stdio-common/tst-scanf-format-f-float.c b/stdio-common/tst-scanf-format-f-float.c index b5a6ae4b1e..07d65efd81 100644 --- a/stdio-common/tst-scanf-format-f-float.c +++ b/stdio-common/tst-scanf-format-f-float.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-f.h" #include "tst-scanf-format-real.h" -#include "tst-scanf-format-skeleton-float.c" +#include diff --git a/stdio-common/tst-scanf-format-f-int.c b/stdio-common/tst-scanf-format-f-int.c index 961d66bfa0..4b1a5f0f72 100644 --- a/stdio-common/tst-scanf-format-f-int.c +++ b/stdio-common/tst-scanf-format-f-int.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-f.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-int.c" +#include diff --git a/stdio-common/tst-scanf-format-f-ldouble.c b/stdio-common/tst-scanf-format-f-ldouble.c index 6198d35041..2aacd9de59 100644 --- a/stdio-common/tst-scanf-format-f-ldouble.c +++ b/stdio-common/tst-scanf-format-f-ldouble.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-f.h" #include "tst-scanf-format-real.h" -#include "tst-scanf-format-skeleton-ldouble.c" +#include diff --git a/stdio-common/tst-scanf-format-f-llong.c b/stdio-common/tst-scanf-format-f-llong.c index 1af672f9c2..45d0f8b1d3 100644 --- a/stdio-common/tst-scanf-format-f-llong.c +++ b/stdio-common/tst-scanf-format-f-llong.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-f.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-llong.c" +#include diff --git a/stdio-common/tst-scanf-format-f-long.c b/stdio-common/tst-scanf-format-f-long.c index fc908111d9..bcb2e23ec5 100644 --- a/stdio-common/tst-scanf-format-f-long.c +++ b/stdio-common/tst-scanf-format-f-long.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-f.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-long.c" +#include diff --git a/stdio-common/tst-scanf-format-f-short.c b/stdio-common/tst-scanf-format-f-short.c index 61697e2598..e384f3d1d1 100644 --- a/stdio-common/tst-scanf-format-f-short.c +++ b/stdio-common/tst-scanf-format-f-short.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-f.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-short.c" +#include diff --git a/stdio-common/tst-scanf-format-f-uchar.c b/stdio-common/tst-scanf-format-f-uchar.c index b4b8af38e6..0037aeafc5 100644 --- a/stdio-common/tst-scanf-format-f-uchar.c +++ b/stdio-common/tst-scanf-format-f-uchar.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-f.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-uchar.c" +#include diff --git a/stdio-common/tst-scanf-format-f-uint.c b/stdio-common/tst-scanf-format-f-uint.c index af226b0d10..6e7a85a80a 100644 --- a/stdio-common/tst-scanf-format-f-uint.c +++ b/stdio-common/tst-scanf-format-f-uint.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-f.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-uint.c" +#include diff --git a/stdio-common/tst-scanf-format-f-ullong.c b/stdio-common/tst-scanf-format-f-ullong.c index 50ea8123bb..71124ea4d7 100644 --- a/stdio-common/tst-scanf-format-f-ullong.c +++ b/stdio-common/tst-scanf-format-f-ullong.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-f.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-ullong.c" +#include diff --git a/stdio-common/tst-scanf-format-f-ulong.c b/stdio-common/tst-scanf-format-f-ulong.c index 673e770326..c0226c601e 100644 --- a/stdio-common/tst-scanf-format-f-ulong.c +++ b/stdio-common/tst-scanf-format-f-ulong.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-f.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-ulong.c" +#include diff --git a/stdio-common/tst-scanf-format-f-ushort.c b/stdio-common/tst-scanf-format-f-ushort.c index 413ba670e9..b4aeb33914 100644 --- a/stdio-common/tst-scanf-format-f-ushort.c +++ b/stdio-common/tst-scanf-format-f-ushort.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-f.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-ushort.c" +#include diff --git a/stdio-common/tst-scanf-format-ss-c.c b/stdio-common/tst-scanf-format-ss-c.c index 58a7ce8f63..2dcb6a2b27 100644 --- a/stdio-common/tst-scanf-format-ss-c.c +++ b/stdio-common/tst-scanf-format-ss-c.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-ss.h" #include "tst-scanf-format-character.h" -#include "tst-scanf-format-skeleton-c.c" +#include diff --git a/stdio-common/tst-scanf-format-ss-char.c b/stdio-common/tst-scanf-format-ss-char.c index 66eb04c0d6..8e8fbf4a3c 100644 --- a/stdio-common/tst-scanf-format-ss-char.c +++ b/stdio-common/tst-scanf-format-ss-char.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-ss.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-char.c" +#include diff --git a/stdio-common/tst-scanf-format-ss-double.c b/stdio-common/tst-scanf-format-ss-double.c index 2a9fd8afb5..a272ef7226 100644 --- a/stdio-common/tst-scanf-format-ss-double.c +++ b/stdio-common/tst-scanf-format-ss-double.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-ss.h" #include "tst-scanf-format-real.h" -#include "tst-scanf-format-skeleton-double.c" +#include diff --git a/stdio-common/tst-scanf-format-ss-float.c b/stdio-common/tst-scanf-format-ss-float.c index 640e35dbeb..23818b6e34 100644 --- a/stdio-common/tst-scanf-format-ss-float.c +++ b/stdio-common/tst-scanf-format-ss-float.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-ss.h" #include "tst-scanf-format-real.h" -#include "tst-scanf-format-skeleton-float.c" +#include diff --git a/stdio-common/tst-scanf-format-ss-int.c b/stdio-common/tst-scanf-format-ss-int.c index c01a0a3f1f..99f8e9d834 100644 --- a/stdio-common/tst-scanf-format-ss-int.c +++ b/stdio-common/tst-scanf-format-ss-int.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-ss.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-int.c" +#include diff --git a/stdio-common/tst-scanf-format-ss-ldouble.c b/stdio-common/tst-scanf-format-ss-ldouble.c index 3e57ab568f..ddfe50fbd3 100644 --- a/stdio-common/tst-scanf-format-ss-ldouble.c +++ b/stdio-common/tst-scanf-format-ss-ldouble.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-ss.h" #include "tst-scanf-format-real.h" -#include "tst-scanf-format-skeleton-ldouble.c" +#include diff --git a/stdio-common/tst-scanf-format-ss-llong.c b/stdio-common/tst-scanf-format-ss-llong.c index 9c1603c869..642cbe929c 100644 --- a/stdio-common/tst-scanf-format-ss-llong.c +++ b/stdio-common/tst-scanf-format-ss-llong.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-ss.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-llong.c" +#include diff --git a/stdio-common/tst-scanf-format-ss-long.c b/stdio-common/tst-scanf-format-ss-long.c index 003cfac552..a1d302c345 100644 --- a/stdio-common/tst-scanf-format-ss-long.c +++ b/stdio-common/tst-scanf-format-ss-long.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-ss.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-long.c" +#include diff --git a/stdio-common/tst-scanf-format-ss-short.c b/stdio-common/tst-scanf-format-ss-short.c index ba1a58289c..87aac399bd 100644 --- a/stdio-common/tst-scanf-format-ss-short.c +++ b/stdio-common/tst-scanf-format-ss-short.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-ss.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-short.c" +#include diff --git a/stdio-common/tst-scanf-format-ss-uchar.c b/stdio-common/tst-scanf-format-ss-uchar.c index 1db14241dc..fb70215fc9 100644 --- a/stdio-common/tst-scanf-format-ss-uchar.c +++ b/stdio-common/tst-scanf-format-ss-uchar.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-ss.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-uchar.c" +#include diff --git a/stdio-common/tst-scanf-format-ss-uint.c b/stdio-common/tst-scanf-format-ss-uint.c index a296fb48c9..ef8f274bcd 100644 --- a/stdio-common/tst-scanf-format-ss-uint.c +++ b/stdio-common/tst-scanf-format-ss-uint.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-ss.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-uint.c" +#include diff --git a/stdio-common/tst-scanf-format-ss-ullong.c b/stdio-common/tst-scanf-format-ss-ullong.c index 885d5709be..c74d757665 100644 --- a/stdio-common/tst-scanf-format-ss-ullong.c +++ b/stdio-common/tst-scanf-format-ss-ullong.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-ss.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-ullong.c" +#include diff --git a/stdio-common/tst-scanf-format-ss-ulong.c b/stdio-common/tst-scanf-format-ss-ulong.c index 8a2f24dc5c..ac8644ee10 100644 --- a/stdio-common/tst-scanf-format-ss-ulong.c +++ b/stdio-common/tst-scanf-format-ss-ulong.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-ss.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-ulong.c" +#include diff --git a/stdio-common/tst-scanf-format-ss-ushort.c b/stdio-common/tst-scanf-format-ss-ushort.c index 40618889ac..51ec0c3072 100644 --- a/stdio-common/tst-scanf-format-ss-ushort.c +++ b/stdio-common/tst-scanf-format-ss-ushort.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-ss.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-ushort.c" +#include diff --git a/stdio-common/tst-scanf-format-v-c.c b/stdio-common/tst-scanf-format-v-c.c index 0e2c000ce0..15e4a41b8c 100644 --- a/stdio-common/tst-scanf-format-v-c.c +++ b/stdio-common/tst-scanf-format-v-c.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-v.h" #include "tst-scanf-format-character.h" -#include "tst-scanf-format-skeleton-c.c" +#include diff --git a/stdio-common/tst-scanf-format-v-char.c b/stdio-common/tst-scanf-format-v-char.c index be3a56c663..ed27c3c8a2 100644 --- a/stdio-common/tst-scanf-format-v-char.c +++ b/stdio-common/tst-scanf-format-v-char.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-v.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-char.c" +#include diff --git a/stdio-common/tst-scanf-format-v-double.c b/stdio-common/tst-scanf-format-v-double.c index 91886318e8..6803d3a74e 100644 --- a/stdio-common/tst-scanf-format-v-double.c +++ b/stdio-common/tst-scanf-format-v-double.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-v.h" #include "tst-scanf-format-real.h" -#include "tst-scanf-format-skeleton-double.c" +#include diff --git a/stdio-common/tst-scanf-format-v-float.c b/stdio-common/tst-scanf-format-v-float.c index 5d289d3e8b..ecd094973e 100644 --- a/stdio-common/tst-scanf-format-v-float.c +++ b/stdio-common/tst-scanf-format-v-float.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-v.h" #include "tst-scanf-format-real.h" -#include "tst-scanf-format-skeleton-float.c" +#include diff --git a/stdio-common/tst-scanf-format-v-int.c b/stdio-common/tst-scanf-format-v-int.c index 770a686bb1..0574fc0bf5 100644 --- a/stdio-common/tst-scanf-format-v-int.c +++ b/stdio-common/tst-scanf-format-v-int.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-v.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-int.c" +#include diff --git a/stdio-common/tst-scanf-format-v-ldouble.c b/stdio-common/tst-scanf-format-v-ldouble.c index 8215ea7ecb..9adbb81e5b 100644 --- a/stdio-common/tst-scanf-format-v-ldouble.c +++ b/stdio-common/tst-scanf-format-v-ldouble.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-v.h" #include "tst-scanf-format-real.h" -#include "tst-scanf-format-skeleton-ldouble.c" +#include diff --git a/stdio-common/tst-scanf-format-v-llong.c b/stdio-common/tst-scanf-format-v-llong.c index 2a1ef02844..427be60e75 100644 --- a/stdio-common/tst-scanf-format-v-llong.c +++ b/stdio-common/tst-scanf-format-v-llong.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-v.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-llong.c" +#include diff --git a/stdio-common/tst-scanf-format-v-long.c b/stdio-common/tst-scanf-format-v-long.c index 8376032bd4..9b10ff63de 100644 --- a/stdio-common/tst-scanf-format-v-long.c +++ b/stdio-common/tst-scanf-format-v-long.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-v.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-long.c" +#include diff --git a/stdio-common/tst-scanf-format-v-short.c b/stdio-common/tst-scanf-format-v-short.c index 23b9c56887..597e7ea646 100644 --- a/stdio-common/tst-scanf-format-v-short.c +++ b/stdio-common/tst-scanf-format-v-short.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-v.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-short.c" +#include diff --git a/stdio-common/tst-scanf-format-v-uchar.c b/stdio-common/tst-scanf-format-v-uchar.c index 861db22fba..9cb0d22b5c 100644 --- a/stdio-common/tst-scanf-format-v-uchar.c +++ b/stdio-common/tst-scanf-format-v-uchar.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-v.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-uchar.c" +#include diff --git a/stdio-common/tst-scanf-format-v-uint.c b/stdio-common/tst-scanf-format-v-uint.c index 30e58c5917..af8eab2d1c 100644 --- a/stdio-common/tst-scanf-format-v-uint.c +++ b/stdio-common/tst-scanf-format-v-uint.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-v.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-uint.c" +#include diff --git a/stdio-common/tst-scanf-format-v-ullong.c b/stdio-common/tst-scanf-format-v-ullong.c index ee2914d3e9..bf7ff85264 100644 --- a/stdio-common/tst-scanf-format-v-ullong.c +++ b/stdio-common/tst-scanf-format-v-ullong.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-v.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-ullong.c" +#include diff --git a/stdio-common/tst-scanf-format-v-ulong.c b/stdio-common/tst-scanf-format-v-ulong.c index f7864dd576..0d3d8b76a3 100644 --- a/stdio-common/tst-scanf-format-v-ulong.c +++ b/stdio-common/tst-scanf-format-v-ulong.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-v.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-ulong.c" +#include diff --git a/stdio-common/tst-scanf-format-v-ushort.c b/stdio-common/tst-scanf-format-v-ushort.c index 79ca16b4e8..27bde536bf 100644 --- a/stdio-common/tst-scanf-format-v-ushort.c +++ b/stdio-common/tst-scanf-format-v-ushort.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-v.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-ushort.c" +#include diff --git a/stdio-common/tst-scanf-format-vf-c.c b/stdio-common/tst-scanf-format-vf-c.c index 307bfe82c3..f6e6bcdcf1 100644 --- a/stdio-common/tst-scanf-format-vf-c.c +++ b/stdio-common/tst-scanf-format-vf-c.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vf.h" #include "tst-scanf-format-character.h" -#include "tst-scanf-format-skeleton-c.c" +#include diff --git a/stdio-common/tst-scanf-format-vf-char.c b/stdio-common/tst-scanf-format-vf-char.c index 602899b2bc..0d9a28cccf 100644 --- a/stdio-common/tst-scanf-format-vf-char.c +++ b/stdio-common/tst-scanf-format-vf-char.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vf.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-char.c" +#include diff --git a/stdio-common/tst-scanf-format-vf-double.c b/stdio-common/tst-scanf-format-vf-double.c index 8b58bbe10b..bc0e315c3f 100644 --- a/stdio-common/tst-scanf-format-vf-double.c +++ b/stdio-common/tst-scanf-format-vf-double.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vf.h" #include "tst-scanf-format-real.h" -#include "tst-scanf-format-skeleton-double.c" +#include diff --git a/stdio-common/tst-scanf-format-vf-float.c b/stdio-common/tst-scanf-format-vf-float.c index 81dad06ebe..7b8a2a1b0b 100644 --- a/stdio-common/tst-scanf-format-vf-float.c +++ b/stdio-common/tst-scanf-format-vf-float.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vf.h" #include "tst-scanf-format-real.h" -#include "tst-scanf-format-skeleton-float.c" +#include diff --git a/stdio-common/tst-scanf-format-vf-int.c b/stdio-common/tst-scanf-format-vf-int.c index 8038791f14..e055b62585 100644 --- a/stdio-common/tst-scanf-format-vf-int.c +++ b/stdio-common/tst-scanf-format-vf-int.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vf.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-int.c" +#include diff --git a/stdio-common/tst-scanf-format-vf-ldouble.c b/stdio-common/tst-scanf-format-vf-ldouble.c index ec9a7c4632..8c5557519c 100644 --- a/stdio-common/tst-scanf-format-vf-ldouble.c +++ b/stdio-common/tst-scanf-format-vf-ldouble.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vf.h" #include "tst-scanf-format-real.h" -#include "tst-scanf-format-skeleton-ldouble.c" +#include diff --git a/stdio-common/tst-scanf-format-vf-llong.c b/stdio-common/tst-scanf-format-vf-llong.c index adc4b125de..3ef4a77c83 100644 --- a/stdio-common/tst-scanf-format-vf-llong.c +++ b/stdio-common/tst-scanf-format-vf-llong.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vf.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-llong.c" +#include diff --git a/stdio-common/tst-scanf-format-vf-long.c b/stdio-common/tst-scanf-format-vf-long.c index 5f26d6c9ce..c5eb1e5e35 100644 --- a/stdio-common/tst-scanf-format-vf-long.c +++ b/stdio-common/tst-scanf-format-vf-long.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vf.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-long.c" +#include diff --git a/stdio-common/tst-scanf-format-vf-short.c b/stdio-common/tst-scanf-format-vf-short.c index 0e081ead78..9c6e2c476f 100644 --- a/stdio-common/tst-scanf-format-vf-short.c +++ b/stdio-common/tst-scanf-format-vf-short.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vf.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-short.c" +#include diff --git a/stdio-common/tst-scanf-format-vf-uchar.c b/stdio-common/tst-scanf-format-vf-uchar.c index 2e879f52ce..b24fb60136 100644 --- a/stdio-common/tst-scanf-format-vf-uchar.c +++ b/stdio-common/tst-scanf-format-vf-uchar.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vf.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-uchar.c" +#include diff --git a/stdio-common/tst-scanf-format-vf-uint.c b/stdio-common/tst-scanf-format-vf-uint.c index 4874f86ef2..0434b4119a 100644 --- a/stdio-common/tst-scanf-format-vf-uint.c +++ b/stdio-common/tst-scanf-format-vf-uint.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vf.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-uint.c" +#include diff --git a/stdio-common/tst-scanf-format-vf-ullong.c b/stdio-common/tst-scanf-format-vf-ullong.c index dde09018c4..020d0d5a83 100644 --- a/stdio-common/tst-scanf-format-vf-ullong.c +++ b/stdio-common/tst-scanf-format-vf-ullong.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vf.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-ullong.c" +#include diff --git a/stdio-common/tst-scanf-format-vf-ulong.c b/stdio-common/tst-scanf-format-vf-ulong.c index 81023061ef..28e5efd5b7 100644 --- a/stdio-common/tst-scanf-format-vf-ulong.c +++ b/stdio-common/tst-scanf-format-vf-ulong.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vf.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-ulong.c" +#include diff --git a/stdio-common/tst-scanf-format-vf-ushort.c b/stdio-common/tst-scanf-format-vf-ushort.c index cb8eb4bdcf..eca5fd21ad 100644 --- a/stdio-common/tst-scanf-format-vf-ushort.c +++ b/stdio-common/tst-scanf-format-vf-ushort.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vf.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-ushort.c" +#include diff --git a/stdio-common/tst-scanf-format-vs-c.c b/stdio-common/tst-scanf-format-vs-c.c index 2df5aa7acb..19875e0edc 100644 --- a/stdio-common/tst-scanf-format-vs-c.c +++ b/stdio-common/tst-scanf-format-vs-c.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vs.h" #include "tst-scanf-format-character.h" -#include "tst-scanf-format-skeleton-c.c" +#include diff --git a/stdio-common/tst-scanf-format-vs-char.c b/stdio-common/tst-scanf-format-vs-char.c index ae4d8e0d0a..3f06ff77a6 100644 --- a/stdio-common/tst-scanf-format-vs-char.c +++ b/stdio-common/tst-scanf-format-vs-char.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vs.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-char.c" +#include diff --git a/stdio-common/tst-scanf-format-vs-double.c b/stdio-common/tst-scanf-format-vs-double.c index cd459a8506..910d9f879c 100644 --- a/stdio-common/tst-scanf-format-vs-double.c +++ b/stdio-common/tst-scanf-format-vs-double.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vs.h" #include "tst-scanf-format-real.h" -#include "tst-scanf-format-skeleton-double.c" +#include diff --git a/stdio-common/tst-scanf-format-vs-float.c b/stdio-common/tst-scanf-format-vs-float.c index 7872afef5a..71566ee698 100644 --- a/stdio-common/tst-scanf-format-vs-float.c +++ b/stdio-common/tst-scanf-format-vs-float.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vs.h" #include "tst-scanf-format-real.h" -#include "tst-scanf-format-skeleton-float.c" +#include diff --git a/stdio-common/tst-scanf-format-vs-int.c b/stdio-common/tst-scanf-format-vs-int.c index e67b4be6c1..bee243020c 100644 --- a/stdio-common/tst-scanf-format-vs-int.c +++ b/stdio-common/tst-scanf-format-vs-int.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vs.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-int.c" +#include diff --git a/stdio-common/tst-scanf-format-vs-ldouble.c b/stdio-common/tst-scanf-format-vs-ldouble.c index 4d299c29ee..a744d9661b 100644 --- a/stdio-common/tst-scanf-format-vs-ldouble.c +++ b/stdio-common/tst-scanf-format-vs-ldouble.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vs.h" #include "tst-scanf-format-real.h" -#include "tst-scanf-format-skeleton-ldouble.c" +#include diff --git a/stdio-common/tst-scanf-format-vs-llong.c b/stdio-common/tst-scanf-format-vs-llong.c index 06c8cc921f..d0368ede49 100644 --- a/stdio-common/tst-scanf-format-vs-llong.c +++ b/stdio-common/tst-scanf-format-vs-llong.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vs.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-llong.c" +#include diff --git a/stdio-common/tst-scanf-format-vs-long.c b/stdio-common/tst-scanf-format-vs-long.c index 575a6cb36a..4949f18e44 100644 --- a/stdio-common/tst-scanf-format-vs-long.c +++ b/stdio-common/tst-scanf-format-vs-long.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vs.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-long.c" +#include diff --git a/stdio-common/tst-scanf-format-vs-short.c b/stdio-common/tst-scanf-format-vs-short.c index 5473471996..47ee05e07a 100644 --- a/stdio-common/tst-scanf-format-vs-short.c +++ b/stdio-common/tst-scanf-format-vs-short.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vs.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-short.c" +#include diff --git a/stdio-common/tst-scanf-format-vs-uchar.c b/stdio-common/tst-scanf-format-vs-uchar.c index 5a29b9b944..794803506c 100644 --- a/stdio-common/tst-scanf-format-vs-uchar.c +++ b/stdio-common/tst-scanf-format-vs-uchar.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vs.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-uchar.c" +#include diff --git a/stdio-common/tst-scanf-format-vs-uint.c b/stdio-common/tst-scanf-format-vs-uint.c index b9486b1488..7832e80bd1 100644 --- a/stdio-common/tst-scanf-format-vs-uint.c +++ b/stdio-common/tst-scanf-format-vs-uint.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vs.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-uint.c" +#include diff --git a/stdio-common/tst-scanf-format-vs-ullong.c b/stdio-common/tst-scanf-format-vs-ullong.c index 5396a7812f..63ac934f55 100644 --- a/stdio-common/tst-scanf-format-vs-ullong.c +++ b/stdio-common/tst-scanf-format-vs-ullong.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vs.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-ullong.c" +#include diff --git a/stdio-common/tst-scanf-format-vs-ulong.c b/stdio-common/tst-scanf-format-vs-ulong.c index 3dbc14206d..3debd44470 100644 --- a/stdio-common/tst-scanf-format-vs-ulong.c +++ b/stdio-common/tst-scanf-format-vs-ulong.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vs.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-ulong.c" +#include diff --git a/stdio-common/tst-scanf-format-vs-ushort.c b/stdio-common/tst-scanf-format-vs-ushort.c index 0f28b36dee..92f19a97f0 100644 --- a/stdio-common/tst-scanf-format-vs-ushort.c +++ b/stdio-common/tst-scanf-format-vs-ushort.c @@ -19,4 +19,4 @@ #include "tst-scanf-format-skeleton.h" #include "tst-scanf-format-vs.h" #include "tst-scanf-format-integer.h" -#include "tst-scanf-format-skeleton-ushort.c" +#include