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 <adhemerval.zanella@linaro.org>

diff --git a/stdio-common/tst-scanf-format-f-c.c b/stdio-common/tst-scanf-format-f-c.c
index 144221a6d95a3f3d67db015b020449dae221d638..143f94a7007eea3a5de86584d5185028a07a40c5 100644 (file)
--- 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 <tst-scanf-format-skeleton-c.c>

diff --git a/stdio-common/tst-scanf-format-f-char.c b/stdio-common/tst-scanf-format-f-char.c
index efa7c1a4b28f96f4faa2176eb4a05a9c06b95b96..ba70d6ebe376504808ea3ae2d700245ac1e0266a 100644 (file)
--- 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 <tst-scanf-format-skeleton-char.c>

diff --git a/stdio-common/tst-scanf-format-f-double.c b/stdio-common/tst-scanf-format-f-double.c
index 668a975c1ea064dce81d801b65013775948682fe..45e6fee71cd8fad709c10512af337e85a774e0d6 100644 (file)
--- 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 <tst-scanf-format-skeleton-double.c>

diff --git a/stdio-common/tst-scanf-format-f-float.c b/stdio-common/tst-scanf-format-f-float.c
index 07d65efd8154611fe4d89e82bf03bccb081571d1..fcf61324274c0c6343a475e3cecd5518eccd7234 100644 (file)
--- 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 <tst-scanf-format-skeleton-float.c>

diff --git a/stdio-common/tst-scanf-format-f-int.c b/stdio-common/tst-scanf-format-f-int.c
index 4b1a5f0f7209bba69d599b78a9552dbb259bc4c2..cec4352c516d21f067bd1e2aed94f93ddda5bc2e 100644 (file)
--- 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 <tst-scanf-format-skeleton-int.c>

diff --git a/stdio-common/tst-scanf-format-f-ldouble.c b/stdio-common/tst-scanf-format-f-ldouble.c
index 2aacd9de59b2e8118c12776d688aa4f4c86de6ce..01285976a118f67cadb3d9129209e1bd75c49439 100644 (file)
--- 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 <tst-scanf-format-skeleton-ldouble.c>

diff --git a/stdio-common/tst-scanf-format-f-llong.c b/stdio-common/tst-scanf-format-f-llong.c
index 45d0f8b1d33d17a6f5f4dbec7318332c75d238f8..63ff399843d59cd8db163fdf52f2986ff61eea74 100644 (file)
--- 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 <tst-scanf-format-skeleton-llong.c>

diff --git a/stdio-common/tst-scanf-format-f-long.c b/stdio-common/tst-scanf-format-f-long.c
index bcb2e23ec57ae793afd764071926d7b2fea3756e..fa08ef220cd7cbce9e03aa2ee6a6425021934786 100644 (file)
--- 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 <tst-scanf-format-skeleton-long.c>

diff --git a/stdio-common/tst-scanf-format-f-short.c b/stdio-common/tst-scanf-format-f-short.c
index e384f3d1d1076ad864bb5e885764bbef477d0af0..c901fbc82422112801fa5183be631d25b7139697 100644 (file)
--- 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 <tst-scanf-format-skeleton-short.c>

diff --git a/stdio-common/tst-scanf-format-f-uchar.c b/stdio-common/tst-scanf-format-f-uchar.c
index 0037aeafc597a3802ebd1e91f3e6e8265ad4fb69..6d0ab1a7bb94b25f5a34ad118226b6d54bc436b6 100644 (file)
--- 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 <tst-scanf-format-skeleton-uchar.c>

diff --git a/stdio-common/tst-scanf-format-f-uint.c b/stdio-common/tst-scanf-format-f-uint.c
index 6e7a85a80a8cd38b4525d6ddea9d4c7ddee07b03..b7971f893ffbc0af7dcd59ab010d64407db5f369 100644 (file)
--- 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 <tst-scanf-format-skeleton-uint.c>

diff --git a/stdio-common/tst-scanf-format-f-ullong.c b/stdio-common/tst-scanf-format-f-ullong.c
index 71124ea4d7b780072751cfad4485a3ff02dd9385..5faa5d67f779b13fc52b7ca498840c04d5de57be 100644 (file)
--- 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 <tst-scanf-format-skeleton-ullong.c>

diff --git a/stdio-common/tst-scanf-format-f-ulong.c b/stdio-common/tst-scanf-format-f-ulong.c
index c0226c601e100d0f9273d3e6bf8662110bb8ed1f..ba664986b3ca53ecc96974148323d5e388031e67 100644 (file)
--- 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 <tst-scanf-format-skeleton-ulong.c>

diff --git a/stdio-common/tst-scanf-format-f-ushort.c b/stdio-common/tst-scanf-format-f-ushort.c
index b4aeb33914b561508ad2ec3a461e5b7aaee99ebd..35264ee8a750233efd0ba1edc8eb3953ce456e11 100644 (file)
--- 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 <tst-scanf-format-skeleton-ushort.c>

diff --git a/stdio-common/tst-scanf-format-s-c.c b/stdio-common/tst-scanf-format-s-c.c
index bbfc0000ff5828018c4359cf6e9d5b3e618ca2ab..6778cd18b0ce216003ae93212580b87f69ba3cb3 100644 (file)
--- 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 <tst-scanf-format-skeleton-c.c>

diff --git a/stdio-common/tst-scanf-format-s-char.c b/stdio-common/tst-scanf-format-s-char.c
index c13527deb87fe7c9e1d657ecebb92f8af95e8e7e..b06756a62cfccf4f08d5a68340276f0e8fb0c91a 100644 (file)
--- 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 <tst-scanf-format-skeleton-char.c>

diff --git a/stdio-common/tst-scanf-format-s-double.c b/stdio-common/tst-scanf-format-s-double.c
index 4baad01d51cb376f271bda29e97b5326835762e8..8af7b91e8efdd266511811d5f5240cda3438c1a7 100644 (file)
--- 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 <tst-scanf-format-skeleton-double.c>

diff --git a/stdio-common/tst-scanf-format-s-float.c b/stdio-common/tst-scanf-format-s-float.c
index 301b2621e9112e26d880f4052a81946b527f4d3f..b14f4c4dda741ce3164e2ff6c0ea273401b33c2b 100644 (file)
--- 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 <tst-scanf-format-skeleton-float.c>

diff --git a/stdio-common/tst-scanf-format-s-int.c b/stdio-common/tst-scanf-format-s-int.c
index e176fe9df4b0464f9bd5ce0aaee96c769bb8f165..368aafccdb1e82a88ed9ad3bbe1f0d2a16556704 100644 (file)
--- 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 <tst-scanf-format-skeleton-int.c>

diff --git a/stdio-common/tst-scanf-format-s-ldouble.c b/stdio-common/tst-scanf-format-s-ldouble.c
index dbb007ce93559ccf788f208e186178f441e93626..67718c22ba10d8b59f7624e1e3e19e48084cba52 100644 (file)
--- 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 <tst-scanf-format-skeleton-ldouble.c>

diff --git a/stdio-common/tst-scanf-format-s-llong.c b/stdio-common/tst-scanf-format-s-llong.c
index fe3d11a982c319c7dc416e5eab79f39ad6823900..51a98e75a8617e733b124435a8f5e2561494a363 100644 (file)
--- 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 <tst-scanf-format-skeleton-llong.c>

diff --git a/stdio-common/tst-scanf-format-s-long.c b/stdio-common/tst-scanf-format-s-long.c
index 415e5fae2cdf6d587c43a711b1f403e3b41c13b9..2061d9c01d4b65a51d7b037ddd8b57f304a0a1c3 100644 (file)
--- 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 <tst-scanf-format-skeleton-long.c>

diff --git a/stdio-common/tst-scanf-format-s-short.c b/stdio-common/tst-scanf-format-s-short.c
index d545ee26d7e8367e53c6452155da1bf921aaa85f..11a7bc1904864b4ab81a192ee2ee49a3478ea9c7 100644 (file)
--- 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 <tst-scanf-format-skeleton-short.c>

diff --git a/stdio-common/tst-scanf-format-s-uchar.c b/stdio-common/tst-scanf-format-s-uchar.c
index a1a7f73f84efa64261086b9e85e65e2d5d7d19b3..abde4228090eff199468422e320ba84f2122d0b5 100644 (file)
--- 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 <tst-scanf-format-skeleton-uchar.c>

diff --git a/stdio-common/tst-scanf-format-s-uint.c b/stdio-common/tst-scanf-format-s-uint.c
index 27b0f4af5a26ec30e6871af380aadc6c9c9979a1..b51f11ec6c55622d3cee1a975b03873de31c69b2 100644 (file)
--- 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 <tst-scanf-format-skeleton-uint.c>

diff --git a/stdio-common/tst-scanf-format-s-ullong.c b/stdio-common/tst-scanf-format-s-ullong.c
index 9cc45b4257120ddb4778df0a31afae1813f04aea..0ecf36323932691876785c2d12fcf20e0b26c1d7 100644 (file)
--- 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 <tst-scanf-format-skeleton-ullong.c>

diff --git a/stdio-common/tst-scanf-format-s-ulong.c b/stdio-common/tst-scanf-format-s-ulong.c
index 9c5543e5edffb1acf366df0ca7a19d8b1f0347bc..9531e7c540f33821cecf7452802792a7140d7fd3 100644 (file)
--- 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 <tst-scanf-format-skeleton-ulong.c>

diff --git a/stdio-common/tst-scanf-format-s-ushort.c b/stdio-common/tst-scanf-format-s-ushort.c
index 052a1caa7b35b49524c079749e097a4783b2aca7..49ff05bdcbf62864f3d80e86ad4117a061323eff 100644 (file)
--- 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 <tst-scanf-format-skeleton-ushort.c>

diff --git a/stdio-common/tst-scanf-format-skeleton-c.c b/stdio-common/tst-scanf-format-skeleton-c.c
index 181077fb38959d2dbe1e1a7c4406ec107557f78b..a25fda00cd737090b8df048e51621f7c86efd37f 100644 (file)
--- 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 a694de4892396e11ce6c1f56c9973aac47de28ca..b419d94ad3ceeb91bc9d8e0c9da81f35efbe3dbb 100644 (file)
--- 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 502f2ad3f7d1aef229ff803aa196e2c968b0adba..c3aeef7f33b2c7514dc047bee49795ae2e843789 100644 (file)
--- 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 2104c0f6c913f502251c4b05ed4aec24c6569aad..5b34ee82041e48d3586f431af96b19c8233046fa 100644 (file)
--- 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 eb4e9de2db796311f5a2a6ebf3ceebd8f1ed32f3..483d4a995b02cb75c0e8c8c0b34a1ed1602c2dfc 100644 (file)
--- 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 3649110ed36c4ef5445b64ccf6ed2e7a07b7fe8a..83a3de716a15d5236e213439aa59eb9cef7fa75d 100644 (file)
--- 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 8b8324e99fb95121a8f976a164e38c7f542b7c77..e669f41d2f496e4424424c0afdb3388d1f1fdf61 100644 (file)
--- 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 91aa0913fdfe77a934c128a2e351926620ef337a..cdf3cc358a8013978dab13051772839af52bf92f 100644 (file)
--- 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 ca51a2533c7e198e70ef81c6cadb5353e68bba55..329722cdd5701d792475291e183652d4c2086f42 100644 (file)
--- 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 6be8917e3bb9edeef64a73cb35d9d11b5e92ba85..fb52e1e3a7271a4f2dfd87efdf2ed8b3038b6040 100644 (file)
--- 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 1508dc39198c5464052aa462baded4eab477d3da..5b5a64326b1f723dc9cf4ffbcf6635fd5b9c0663 100644 (file)
--- 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 b0b8050e2d33e195dc7922562a853eb7608e40db..99dc8a7be8d17b1deb9f6d7a1337c4d6b4327d3f 100644 (file)
--- 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 319882511e7c7a64a394e58dbd45292b6bc0ff79..e0989b336d1e05dd372a2782fa55ff82d3f22810 100644 (file)
--- 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 2b710c5eca6d75d066dfa74a36b668b3541f4544..fe006d23d870516b47f2d3b481675276d20bd880 100644 (file)
--- 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 2dcb6a2b277ceaf55cda93e78eb9f29ffe868241..02e79eb3053334cb2d2b2be0b0e3e65f89b20dce 100644 (file)
--- 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 <tst-scanf-format-skeleton-c.c>

diff --git a/stdio-common/tst-scanf-format-ss-char.c b/stdio-common/tst-scanf-format-ss-char.c
index 8e8fbf4a3cd82e637ceb25580ee885d0147e4aac..268914a66ead3742fb524228251e3ce46ff2ef79 100644 (file)
--- 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 <tst-scanf-format-skeleton-char.c>

diff --git a/stdio-common/tst-scanf-format-ss-double.c b/stdio-common/tst-scanf-format-ss-double.c
index a272ef7226b003005dee35bb9d1d05c869d8e57f..da29cfbd558d10ab66b6675b504bbf22cd688dbc 100644 (file)
--- 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 <tst-scanf-format-skeleton-double.c>

diff --git a/stdio-common/tst-scanf-format-ss-float.c b/stdio-common/tst-scanf-format-ss-float.c
index 23818b6e34ab9f3f0e3001b4eb3441cf5248df19..01ccea41847268cb397e7ed19e3afdec3effd83f 100644 (file)
--- 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 <tst-scanf-format-skeleton-float.c>

diff --git a/stdio-common/tst-scanf-format-ss-int.c b/stdio-common/tst-scanf-format-ss-int.c
index 99f8e9d8342ba35c8b0115db458030d377a3b82e..836799502759abbe92de3515e6c2c2196ed0b0af 100644 (file)
--- 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 <tst-scanf-format-skeleton-int.c>

diff --git a/stdio-common/tst-scanf-format-ss-ldouble.c b/stdio-common/tst-scanf-format-ss-ldouble.c
index ddfe50fbd3495f201400f20833429faffd1aa734..842d75896d70ddda2517408b1d922ee264d0d822 100644 (file)
--- 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 <tst-scanf-format-skeleton-ldouble.c>

diff --git a/stdio-common/tst-scanf-format-ss-llong.c b/stdio-common/tst-scanf-format-ss-llong.c
index 642cbe929c91e5da3de4b57bb1f808f54255902b..04d802d8c8c53821ed4bb0fb1a404d8bcc47b82d 100644 (file)
--- 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 <tst-scanf-format-skeleton-llong.c>

diff --git a/stdio-common/tst-scanf-format-ss-long.c b/stdio-common/tst-scanf-format-ss-long.c
index a1d302c34521cd91676da3e3f23344bbd6702986..4850e02b57e900333e15ec0601bf245264eca2f4 100644 (file)
--- 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 <tst-scanf-format-skeleton-long.c>

diff --git a/stdio-common/tst-scanf-format-ss-short.c b/stdio-common/tst-scanf-format-ss-short.c
index 87aac399bd07450e64c90768f43692965432493b..f1d6a838ed2a52da2673f0d662989269a3ca15c7 100644 (file)
--- 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 <tst-scanf-format-skeleton-short.c>

diff --git a/stdio-common/tst-scanf-format-ss-uchar.c b/stdio-common/tst-scanf-format-ss-uchar.c
index fb70215fc9e6bd6325264b94586ee52eae9bba9b..ee8eedeef33b20ae583fd549c88cad8e30abdff4 100644 (file)
--- 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 <tst-scanf-format-skeleton-uchar.c>

diff --git a/stdio-common/tst-scanf-format-ss-uint.c b/stdio-common/tst-scanf-format-ss-uint.c
index ef8f274bcdaf44b1b41fd7bf63d443e9dfc50e7e..9ba39dc5b63ca47971e01df8922a9e0f9ac01496 100644 (file)
--- 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 <tst-scanf-format-skeleton-uint.c>

diff --git a/stdio-common/tst-scanf-format-ss-ullong.c b/stdio-common/tst-scanf-format-ss-ullong.c
index c74d757665d2816c7a7406aee6f08ea986e8b86d..4b71d8ce69c30a2410b421a59f29ef382b8e0cd1 100644 (file)
--- 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 <tst-scanf-format-skeleton-ullong.c>

diff --git a/stdio-common/tst-scanf-format-ss-ulong.c b/stdio-common/tst-scanf-format-ss-ulong.c
index ac8644ee102d0f39852cc4cf3219fc0affa16dcd..613ccafc1f0f678c7b99fdd951f8291a7942c906 100644 (file)
--- 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 <tst-scanf-format-skeleton-ulong.c>

diff --git a/stdio-common/tst-scanf-format-ss-ushort.c b/stdio-common/tst-scanf-format-ss-ushort.c
index 51ec0c30729dd147b361640e637cdced5b3172f6..91459693f97b875ad75e482957c3106d29e710a9 100644 (file)
--- 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 <tst-scanf-format-skeleton-ushort.c>

diff --git a/stdio-common/tst-scanf-format-v-c.c b/stdio-common/tst-scanf-format-v-c.c
index 15e4a41b8cbdcd828e19c0a694434f81ba59812e..6ff87822ab42279e73ab1ad1bee61d2bc9773c6c 100644 (file)
--- 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 <tst-scanf-format-skeleton-c.c>

diff --git a/stdio-common/tst-scanf-format-v-char.c b/stdio-common/tst-scanf-format-v-char.c
index ed27c3c8a243a056a8d06d7164f76eb7564990a3..7e1ccf7a6ac3538fec33793d9d87a65b02758928 100644 (file)
--- 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 <tst-scanf-format-skeleton-char.c>

diff --git a/stdio-common/tst-scanf-format-v-double.c b/stdio-common/tst-scanf-format-v-double.c
index 6803d3a74e2715dded34725a365ce7943d36e0e1..5dfa11082be6fe3791ddbf19784639d89aa74faa 100644 (file)
--- 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 <tst-scanf-format-skeleton-double.c>

diff --git a/stdio-common/tst-scanf-format-v-float.c b/stdio-common/tst-scanf-format-v-float.c
index ecd094973ebea1400f895a4e1677861657bbf4b4..2243dd63239eb0c45b7ef849597d720b753dac5e 100644 (file)
--- 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 <tst-scanf-format-skeleton-float.c>

diff --git a/stdio-common/tst-scanf-format-v-int.c b/stdio-common/tst-scanf-format-v-int.c
index 0574fc0bf500b769212c6d9afdaf485875b20451..5d59e395af68bf3e33d6876524812280e4aa1f76 100644 (file)
--- 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 <tst-scanf-format-skeleton-int.c>

diff --git a/stdio-common/tst-scanf-format-v-ldouble.c b/stdio-common/tst-scanf-format-v-ldouble.c
index 9adbb81e5b57f69ec278f45bc34718b9e47e555d..0527f0d0aca2db746dcd3cbbb40d829d6c4ee4fe 100644 (file)
--- 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 <tst-scanf-format-skeleton-ldouble.c>

diff --git a/stdio-common/tst-scanf-format-v-llong.c b/stdio-common/tst-scanf-format-v-llong.c
index 427be60e754da40182b020ee2e8723d637093e88..3f635d97bf8431ea6080d8548d5236e811731a48 100644 (file)
--- 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 <tst-scanf-format-skeleton-llong.c>

diff --git a/stdio-common/tst-scanf-format-v-long.c b/stdio-common/tst-scanf-format-v-long.c
index 9b10ff63dea272b0596b4aba744346896f86ab13..3473093a12092696fd38372174a1c9f15c6cecf1 100644 (file)
--- 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 <tst-scanf-format-skeleton-long.c>

diff --git a/stdio-common/tst-scanf-format-v-short.c b/stdio-common/tst-scanf-format-v-short.c
index 597e7ea6462e8f8395660373879a40374861c062..61a66ba0a615450c77f913cb48f01ee53a55ae43 100644 (file)
--- 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 <tst-scanf-format-skeleton-short.c>

diff --git a/stdio-common/tst-scanf-format-v-uchar.c b/stdio-common/tst-scanf-format-v-uchar.c
index 9cb0d22b5c40a5510bd2ff334076199ca8b97a4c..7e98b613545458858fd178cb4773026d555be75a 100644 (file)
--- 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 <tst-scanf-format-skeleton-uchar.c>

diff --git a/stdio-common/tst-scanf-format-v-uint.c b/stdio-common/tst-scanf-format-v-uint.c
index af8eab2d1c5c627c5eb9a22e06839d41c49eade5..82ae619681e11197d76a0eb238a7d9eda9f958b6 100644 (file)
--- 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 <tst-scanf-format-skeleton-uint.c>

diff --git a/stdio-common/tst-scanf-format-v-ullong.c b/stdio-common/tst-scanf-format-v-ullong.c
index bf7ff85264c6d45b50d06aa5af12435489c5e7c3..a76790658efd96a9a7db03f694b0135496d3f34e 100644 (file)
--- 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 <tst-scanf-format-skeleton-ullong.c>

diff --git a/stdio-common/tst-scanf-format-v-ulong.c b/stdio-common/tst-scanf-format-v-ulong.c
index 0d3d8b76a3361b6d82f505a6097cd6f05ba0a74f..1b50b79a3a02633d01cfc7936f55e19766893c0d 100644 (file)
--- 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 <tst-scanf-format-skeleton-ulong.c>

diff --git a/stdio-common/tst-scanf-format-v-ushort.c b/stdio-common/tst-scanf-format-v-ushort.c
index 27bde536bf546701d43c376716c75392aad6f636..e268273ad3436a2a17719acc1fa1f97c547cceed 100644 (file)
--- 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 <tst-scanf-format-skeleton-ushort.c>

diff --git a/stdio-common/tst-scanf-format-vf-c.c b/stdio-common/tst-scanf-format-vf-c.c
index f6e6bcdcf1d2c86f896739eea7567b9608700d58..d69b816c1345a146cf463ec03538ea235156130d 100644 (file)
--- 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 <tst-scanf-format-skeleton-c.c>

diff --git a/stdio-common/tst-scanf-format-vf-char.c b/stdio-common/tst-scanf-format-vf-char.c
index 0d9a28cccfe8329d050b3fcf12218a3047f7a71e..7ce3b1c7a67f652ea2e0879b9bca39ea3d9e01d7 100644 (file)
--- 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 <tst-scanf-format-skeleton-char.c>

diff --git a/stdio-common/tst-scanf-format-vf-double.c b/stdio-common/tst-scanf-format-vf-double.c
index bc0e315c3f2558759c38a735e7fe637e6cffaa9b..596514415ea7fcbbddb5a4d51a2e90451813f642 100644 (file)
--- 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 <tst-scanf-format-skeleton-double.c>

diff --git a/stdio-common/tst-scanf-format-vf-float.c b/stdio-common/tst-scanf-format-vf-float.c
index 7b8a2a1b0b3e678576398b71ddee9ac92cf505f7..34b069dfd89e008292477879d8f6e2c1785edd64 100644 (file)
--- 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 <tst-scanf-format-skeleton-float.c>

diff --git a/stdio-common/tst-scanf-format-vf-int.c b/stdio-common/tst-scanf-format-vf-int.c
index e055b625850370929718e5b7f1ae8721a00d64c0..289595b4cf288175786107858d60d88c9dd3087a 100644 (file)
--- 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 <tst-scanf-format-skeleton-int.c>

diff --git a/stdio-common/tst-scanf-format-vf-ldouble.c b/stdio-common/tst-scanf-format-vf-ldouble.c
index 8c5557519cd5b7252dbbdb06d69c85aa9d80a35b..33937038ee55dbbc9394345975ef413ea33e0edf 100644 (file)
--- 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 <tst-scanf-format-skeleton-ldouble.c>

diff --git a/stdio-common/tst-scanf-format-vf-llong.c b/stdio-common/tst-scanf-format-vf-llong.c
index 3ef4a77c8390c742a384e0c23ba2fe9b52f72b2a..ccc09128ea56bc0a0d2ec59f06691b3de44da5e6 100644 (file)
--- 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 <tst-scanf-format-skeleton-llong.c>

diff --git a/stdio-common/tst-scanf-format-vf-long.c b/stdio-common/tst-scanf-format-vf-long.c
index c5eb1e5e3519c5bb34e3a3819e3170beb2206877..d5499afc41513faa484dce870a6100744e6c0db8 100644 (file)
--- 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 <tst-scanf-format-skeleton-long.c>

diff --git a/stdio-common/tst-scanf-format-vf-short.c b/stdio-common/tst-scanf-format-vf-short.c
index 9c6e2c476fa045892a3fc815cf4eff437e7c4e4a..715967da7c3b6f84f940e6a4549a3add90b86549 100644 (file)
--- 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 <tst-scanf-format-skeleton-short.c>

diff --git a/stdio-common/tst-scanf-format-vf-uchar.c b/stdio-common/tst-scanf-format-vf-uchar.c
index b24fb601361b43bfcd4b23273625f91103e730e0..61635457f66544be5b6b4f107fa164711f3716c6 100644 (file)
--- 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 <tst-scanf-format-skeleton-uchar.c>

diff --git a/stdio-common/tst-scanf-format-vf-uint.c b/stdio-common/tst-scanf-format-vf-uint.c
index 0434b4119a0788f3bede5735691df71c893cda3f..af240c5e0c2fa2ff829c9d5865bfba53e312d2a9 100644 (file)
--- 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 <tst-scanf-format-skeleton-uint.c>

diff --git a/stdio-common/tst-scanf-format-vf-ullong.c b/stdio-common/tst-scanf-format-vf-ullong.c
index 020d0d5a832dbb73745121c79675fa62644df10e..4863b48cfbdaf93b0e6eeff0f8212a455f29bd1f 100644 (file)
--- 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 <tst-scanf-format-skeleton-ullong.c>

diff --git a/stdio-common/tst-scanf-format-vf-ulong.c b/stdio-common/tst-scanf-format-vf-ulong.c
index 28e5efd5b71011df9fc3c46e3d80cb826a6a4479..886c771fbab722421dfad3077926f1f6de36670b 100644 (file)
--- 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 <tst-scanf-format-skeleton-ulong.c>

diff --git a/stdio-common/tst-scanf-format-vf-ushort.c b/stdio-common/tst-scanf-format-vf-ushort.c
index eca5fd21ad18dade6a55357d759baa2f6ea8aa6a..b356598ed7c5b0c83b0fe4dc15f6f69b15e5128c 100644 (file)
--- 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 <tst-scanf-format-skeleton-ushort.c>

diff --git a/stdio-common/tst-scanf-format-vs-c.c b/stdio-common/tst-scanf-format-vs-c.c
index 19875e0edc330954082c1dd805ad52399f62c25d..fb3f380d2b7948fe642830912ac5a4c3c95b5ff6 100644 (file)
--- 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 <tst-scanf-format-skeleton-c.c>

diff --git a/stdio-common/tst-scanf-format-vs-char.c b/stdio-common/tst-scanf-format-vs-char.c
index 3f06ff77a66a2a967eae9657007b9e58878db309..5161d7202b963b30c8d29254ddcc355671b980c7 100644 (file)
--- 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 <tst-scanf-format-skeleton-char.c>

diff --git a/stdio-common/tst-scanf-format-vs-double.c b/stdio-common/tst-scanf-format-vs-double.c
index 910d9f879cdfff2ebf0af06f9e33761dc9d470c5..042d3d9094fbb25ecd765df875d73884f8327597 100644 (file)
--- 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 <tst-scanf-format-skeleton-double.c>

diff --git a/stdio-common/tst-scanf-format-vs-float.c b/stdio-common/tst-scanf-format-vs-float.c
index 71566ee698e1e7d2835a49ca93271bce8318c45c..2d25132d057c1648c49a91887302daad53ca03a7 100644 (file)
--- 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 <tst-scanf-format-skeleton-float.c>

diff --git a/stdio-common/tst-scanf-format-vs-int.c b/stdio-common/tst-scanf-format-vs-int.c
index bee243020ca56b2466255a74d94d04a78785f064..b3a40d6296629ee16688968d396a04b8e24ca247 100644 (file)
--- 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 <tst-scanf-format-skeleton-int.c>

diff --git a/stdio-common/tst-scanf-format-vs-ldouble.c b/stdio-common/tst-scanf-format-vs-ldouble.c
index a744d9661b0ad5440fc14176e8e5862e46b2f8ff..0ccc6b6412615e603939489994d4ff8326ce5b3a 100644 (file)
--- 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 <tst-scanf-format-skeleton-ldouble.c>

diff --git a/stdio-common/tst-scanf-format-vs-llong.c b/stdio-common/tst-scanf-format-vs-llong.c
index d0368ede491cb1306136173a65b7efecad570dd8..100587eb299aefb5f0e9b97a79ba6c9b70931906 100644 (file)
--- 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 <tst-scanf-format-skeleton-llong.c>

diff --git a/stdio-common/tst-scanf-format-vs-long.c b/stdio-common/tst-scanf-format-vs-long.c
index 4949f18e4446a8b0bce16acabde0a501a17609cf..6f609d13a346b0b0bdac27d9ae4508c342c1ae6f 100644 (file)
--- 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 <tst-scanf-format-skeleton-long.c>

diff --git a/stdio-common/tst-scanf-format-vs-short.c b/stdio-common/tst-scanf-format-vs-short.c
index 47ee05e07ae1fd8e5d0e67a4cacabc7a7e40e046..e97faee3474b9c9703c1e7c96e83a90898b56bc5 100644 (file)
--- 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 <tst-scanf-format-skeleton-short.c>

diff --git a/stdio-common/tst-scanf-format-vs-uchar.c b/stdio-common/tst-scanf-format-vs-uchar.c
index 794803506ca82eadc7b75b5c72da1f08bd502be0..2ec9c898aca8509a88cd2ca3211c521318c78562 100644 (file)
--- 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 <tst-scanf-format-skeleton-uchar.c>

diff --git a/stdio-common/tst-scanf-format-vs-uint.c b/stdio-common/tst-scanf-format-vs-uint.c
index 7832e80bd160dcf2dc0df784f7815ea316271476..40553cf6804e217a100bec5343aace6cc9e52b5b 100644 (file)
--- 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 <tst-scanf-format-skeleton-uint.c>

diff --git a/stdio-common/tst-scanf-format-vs-ullong.c b/stdio-common/tst-scanf-format-vs-ullong.c
index 63ac934f55fb00443d46d0a210a2b9d85c3b9e6c..a50e1730e9e73df652890c7fa86f48ca4f277d04 100644 (file)
--- 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 <tst-scanf-format-skeleton-ullong.c>

diff --git a/stdio-common/tst-scanf-format-vs-ulong.c b/stdio-common/tst-scanf-format-vs-ulong.c
index 3debd444707d023fb6ae035da32ab05e7aa8d6d7..e2076b6a6da29978ef4241139699cfe597d3d686 100644 (file)
--- 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 <tst-scanf-format-skeleton-ulong.c>

diff --git a/stdio-common/tst-scanf-format-vs-ushort.c b/stdio-common/tst-scanf-format-vs-ushort.c
index 92f19a97f0748ed9fead25a06d3168cf89af550d..af2a63f587063f5a8ba12cc550cca1ad3166313d 100644 (file)
--- 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 <tst-scanf-format-skeleton-ushort.c>

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 7e8c1d66a64e772e58352274d0b3614030e96857..79903ccb581986652ce8592dd3be8f77fe137517 100644 (file)
--- 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 <stdint.h>
 #include <string.h>
 
+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"