[PATCH v2 13/14] stdio-common: Adjust header inclusion in scanf input specifier tests
Adhemerval Zanella Netto
adhemerval.zanella@linaro.org
Fri Aug 15 14:37:23 GMT 2025
On 05/06/25 14:59, Maciej W. Rozycki wrote:
> From: Maciej W. Rozycki <macro@redhat.com>
>
> 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.
> ---
> No change from v1 (formerly 14/15).
LGTM, thanks.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
> ---
> stdio-common/tst-scanf-format-f-c.c | 1 -
> stdio-common/tst-scanf-format-f-char.c | 1 -
> stdio-common/tst-scanf-format-f-double.c | 1 -
> stdio-common/tst-scanf-format-f-float.c | 1 -
> stdio-common/tst-scanf-format-f-int.c | 1 -
> stdio-common/tst-scanf-format-f-ldouble.c | 1 -
> stdio-common/tst-scanf-format-f-llong.c | 1 -
> stdio-common/tst-scanf-format-f-long.c | 1 -
> stdio-common/tst-scanf-format-f-short.c | 1 -
> stdio-common/tst-scanf-format-f-uchar.c | 1 -
> stdio-common/tst-scanf-format-f-uint.c | 1 -
> stdio-common/tst-scanf-format-f-ullong.c | 1 -
> stdio-common/tst-scanf-format-f-ulong.c | 1 -
> stdio-common/tst-scanf-format-f-ushort.c | 1 -
> stdio-common/tst-scanf-format-s-c.c | 1 -
> stdio-common/tst-scanf-format-s-char.c | 1 -
> stdio-common/tst-scanf-format-s-double.c | 1 -
> stdio-common/tst-scanf-format-s-float.c | 1 -
> stdio-common/tst-scanf-format-s-int.c | 1 -
> stdio-common/tst-scanf-format-s-ldouble.c | 1 -
> stdio-common/tst-scanf-format-s-llong.c | 1 -
> stdio-common/tst-scanf-format-s-long.c | 1 -
> stdio-common/tst-scanf-format-s-short.c | 1 -
> stdio-common/tst-scanf-format-s-uchar.c | 1 -
> stdio-common/tst-scanf-format-s-uint.c | 1 -
> stdio-common/tst-scanf-format-s-ullong.c | 1 -
> stdio-common/tst-scanf-format-s-ulong.c | 1 -
> stdio-common/tst-scanf-format-s-ushort.c | 1 -
> stdio-common/tst-scanf-format-skeleton-c.c | 1 +
> stdio-common/tst-scanf-format-skeleton-char.c | 1 +
> stdio-common/tst-scanf-format-skeleton-double.c | 1 +
> stdio-common/tst-scanf-format-skeleton-float.c | 1 +
> stdio-common/tst-scanf-format-skeleton-int.c | 1 +
> stdio-common/tst-scanf-format-skeleton-ldouble.c | 1 +
> stdio-common/tst-scanf-format-skeleton-llong.c | 1 +
> stdio-common/tst-scanf-format-skeleton-long.c | 1 +
> stdio-common/tst-scanf-format-skeleton-short.c | 1 +
> stdio-common/tst-scanf-format-skeleton-uchar.c | 1 +
> stdio-common/tst-scanf-format-skeleton-uint.c | 1 +
> stdio-common/tst-scanf-format-skeleton-ullong.c | 1 +
> stdio-common/tst-scanf-format-skeleton-ulong.c | 1 +
> stdio-common/tst-scanf-format-skeleton-ushort.c | 1 +
> stdio-common/tst-scanf-format-ss-c.c | 1 -
> stdio-common/tst-scanf-format-ss-char.c | 1 -
> stdio-common/tst-scanf-format-ss-double.c | 1 -
> stdio-common/tst-scanf-format-ss-float.c | 1 -
> stdio-common/tst-scanf-format-ss-int.c | 1 -
> stdio-common/tst-scanf-format-ss-ldouble.c | 1 -
> stdio-common/tst-scanf-format-ss-llong.c | 1 -
> stdio-common/tst-scanf-format-ss-long.c | 1 -
> stdio-common/tst-scanf-format-ss-short.c | 1 -
> stdio-common/tst-scanf-format-ss-uchar.c | 1 -
> stdio-common/tst-scanf-format-ss-uint.c | 1 -
> stdio-common/tst-scanf-format-ss-ullong.c | 1 -
> stdio-common/tst-scanf-format-ss-ulong.c | 1 -
> stdio-common/tst-scanf-format-ss-ushort.c | 1 -
> stdio-common/tst-scanf-format-v-c.c | 1 -
> stdio-common/tst-scanf-format-v-char.c | 1 -
> stdio-common/tst-scanf-format-v-double.c | 1 -
> stdio-common/tst-scanf-format-v-float.c | 1 -
> stdio-common/tst-scanf-format-v-int.c | 1 -
> stdio-common/tst-scanf-format-v-ldouble.c | 1 -
> stdio-common/tst-scanf-format-v-llong.c | 1 -
> stdio-common/tst-scanf-format-v-long.c | 1 -
> stdio-common/tst-scanf-format-v-short.c | 1 -
> stdio-common/tst-scanf-format-v-uchar.c | 1 -
> stdio-common/tst-scanf-format-v-uint.c | 1 -
> stdio-common/tst-scanf-format-v-ullong.c | 1 -
> stdio-common/tst-scanf-format-v-ulong.c | 1 -
> stdio-common/tst-scanf-format-v-ushort.c | 1 -
> stdio-common/tst-scanf-format-vf-c.c | 1 -
> stdio-common/tst-scanf-format-vf-char.c | 1 -
> stdio-common/tst-scanf-format-vf-double.c | 1 -
> stdio-common/tst-scanf-format-vf-float.c | 1 -
> stdio-common/tst-scanf-format-vf-int.c | 1 -
> stdio-common/tst-scanf-format-vf-ldouble.c | 1 -
> stdio-common/tst-scanf-format-vf-llong.c | 1 -
> stdio-common/tst-scanf-format-vf-long.c | 1 -
> stdio-common/tst-scanf-format-vf-short.c | 1 -
> stdio-common/tst-scanf-format-vf-uchar.c | 1 -
> stdio-common/tst-scanf-format-vf-uint.c | 1 -
> stdio-common/tst-scanf-format-vf-ullong.c | 1 -
> stdio-common/tst-scanf-format-vf-ulong.c | 1 -
> stdio-common/tst-scanf-format-vf-ushort.c | 1 -
> stdio-common/tst-scanf-format-vs-c.c | 1 -
> stdio-common/tst-scanf-format-vs-char.c | 1 -
> stdio-common/tst-scanf-format-vs-double.c | 1 -
> stdio-common/tst-scanf-format-vs-float.c | 1 -
> stdio-common/tst-scanf-format-vs-int.c | 1 -
> stdio-common/tst-scanf-format-vs-ldouble.c | 1 -
> stdio-common/tst-scanf-format-vs-llong.c | 1 -
> stdio-common/tst-scanf-format-vs-long.c | 1 -
> stdio-common/tst-scanf-format-vs-short.c | 1 -
> stdio-common/tst-scanf-format-vs-uchar.c | 1 -
> stdio-common/tst-scanf-format-vs-uint.c | 1 -
> stdio-common/tst-scanf-format-vs-ullong.c | 1 -
> stdio-common/tst-scanf-format-vs-ulong.c | 1 -
> stdio-common/tst-scanf-format-vs-ushort.c | 1 -
> sysdeps/ieee754/ldbl-96/tst-scanf-format-skeleton-ldouble.c | 6 ++++--
> 99 files changed, 18 insertions(+), 86 deletions(-)
>
> glibc-tst-scanf-format-all-skeleton-include.diff
> Index: glibc/stdio-common/tst-scanf-format-f-c.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-f-c.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-f-char.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-f-char.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-f-double.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-f-double.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-f-float.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-f-float.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-f-int.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-f-int.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-f-ldouble.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-f-ldouble.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-f-llong.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-f-llong.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-f-long.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-f-long.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-f-short.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-f-short.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-f-uchar.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-f-uchar.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-f-uint.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-f-uint.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-f-ullong.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-f-ullong.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-f-ulong.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-f-ulong.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-f-ushort.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-f-ushort.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-s-c.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-s-c.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-s-char.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-s-char.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-s-double.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-s-double.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-s-float.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-s-float.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-s-int.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-s-int.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-s-ldouble.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-s-ldouble.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-s-llong.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-s-llong.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-s-long.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-s-long.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-s-short.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-s-short.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-s-uchar.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-s-uchar.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-s-uint.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-s-uint.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-s-ullong.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-s-ullong.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-s-ulong.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-s-ulong.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-s-ushort.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-s-ushort.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-skeleton-c.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-skeleton-c.c
> +++ glibc/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"
> Index: glibc/stdio-common/tst-scanf-format-skeleton-char.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-skeleton-char.c
> +++ glibc/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"
> Index: glibc/stdio-common/tst-scanf-format-skeleton-double.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-skeleton-double.c
> +++ glibc/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"
> Index: glibc/stdio-common/tst-scanf-format-skeleton-float.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-skeleton-float.c
> +++ glibc/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"
> Index: glibc/stdio-common/tst-scanf-format-skeleton-int.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-skeleton-int.c
> +++ glibc/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"
> Index: glibc/stdio-common/tst-scanf-format-skeleton-ldouble.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-skeleton-ldouble.c
> +++ glibc/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"
> Index: glibc/stdio-common/tst-scanf-format-skeleton-llong.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-skeleton-llong.c
> +++ glibc/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"
> Index: glibc/stdio-common/tst-scanf-format-skeleton-long.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-skeleton-long.c
> +++ glibc/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"
> Index: glibc/stdio-common/tst-scanf-format-skeleton-short.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-skeleton-short.c
> +++ glibc/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"
> Index: glibc/stdio-common/tst-scanf-format-skeleton-uchar.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-skeleton-uchar.c
> +++ glibc/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"
> Index: glibc/stdio-common/tst-scanf-format-skeleton-uint.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-skeleton-uint.c
> +++ glibc/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"
> Index: glibc/stdio-common/tst-scanf-format-skeleton-ullong.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-skeleton-ullong.c
> +++ glibc/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"
> Index: glibc/stdio-common/tst-scanf-format-skeleton-ulong.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-skeleton-ulong.c
> +++ glibc/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"
> Index: glibc/stdio-common/tst-scanf-format-skeleton-ushort.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-skeleton-ushort.c
> +++ glibc/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"
> Index: glibc/stdio-common/tst-scanf-format-ss-c.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-ss-c.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-ss-char.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-ss-char.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-ss-double.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-ss-double.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-ss-float.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-ss-float.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-ss-int.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-ss-int.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-ss-ldouble.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-ss-ldouble.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-ss-llong.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-ss-llong.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-ss-long.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-ss-long.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-ss-short.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-ss-short.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-ss-uchar.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-ss-uchar.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-ss-uint.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-ss-uint.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-ss-ullong.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-ss-ullong.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-ss-ulong.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-ss-ulong.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-ss-ushort.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-ss-ushort.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-v-c.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-v-c.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-v-char.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-v-char.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-v-double.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-v-double.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-v-float.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-v-float.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-v-int.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-v-int.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-v-ldouble.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-v-ldouble.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-v-llong.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-v-llong.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-v-long.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-v-long.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-v-short.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-v-short.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-v-uchar.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-v-uchar.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-v-uint.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-v-uint.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-v-ullong.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-v-ullong.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-v-ulong.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-v-ulong.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-v-ushort.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-v-ushort.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-vf-c.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-vf-c.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-vf-char.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-vf-char.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-vf-double.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-vf-double.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-vf-float.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-vf-float.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-vf-int.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-vf-int.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-vf-ldouble.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-vf-ldouble.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-vf-llong.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-vf-llong.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-vf-long.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-vf-long.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-vf-short.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-vf-short.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-vf-uchar.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-vf-uchar.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-vf-uint.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-vf-uint.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-vf-ullong.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-vf-ullong.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-vf-ulong.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-vf-ulong.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-vf-ushort.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-vf-ushort.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-vs-c.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-vs-c.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-vs-char.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-vs-char.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-vs-double.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-vs-double.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-vs-float.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-vs-float.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-vs-int.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-vs-int.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-vs-ldouble.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-vs-ldouble.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-vs-llong.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-vs-llong.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-vs-long.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-vs-long.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-vs-short.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-vs-short.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-vs-uchar.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-vs-uchar.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-vs-uint.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-vs-uint.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-vs-ullong.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-vs-ullong.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-vs-ulong.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-vs-ulong.c
> +++ glibc/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>
> Index: glibc/stdio-common/tst-scanf-format-vs-ushort.c
> ===================================================================
> --- glibc.orig/stdio-common/tst-scanf-format-vs-ushort.c
> +++ glibc/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>
> Index: glibc/sysdeps/ieee754/ldbl-96/tst-scanf-format-skeleton-ldouble.c
> ===================================================================
> --- glibc.orig/sysdeps/ieee754/ldbl-96/tst-scanf-format-skeleton-ldouble.c
> +++ glibc/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"
More information about the Libc-alpha
mailing list