From patchwork Wed Mar 7 19:32:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zack Weinberg X-Patchwork-Id: 26230 Received: (qmail 58295 invoked by alias); 7 Mar 2018 19:32:12 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 58228 invoked by uid 89); 7 Mar 2018 19:32:11 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.8 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=3457 X-HELO: l2mail1.panix.com From: Zack Weinberg To: libc-alpha@sourceware.org Subject: [PATCH 4/9] Use SCANF_LDBL_IS_DBL instead of __ldbl_is_dbl. Date: Wed, 7 Mar 2018 14:32:00 -0500 Message-Id: <20180307193205.4751-5-zackw@panix.com> In-Reply-To: <20180307193205.4751-1-zackw@panix.com> References: <20180307193205.4751-1-zackw@panix.com> MIME-Version: 1.0 Change the callers of __vfscanf_internal and __vfwscanf_internal that want to treat 'long double' as another name for 'double' (all of which happen to be in sysdeps/ieee754/ldbl-opt/nldbl-compat.c) to communicate this via the new flags argument, instead of the per-thread variable __no_long_double and its __ldbl_is_dbl wrapper macro. * stdio-common/vfscanf-internal.c: Don't look at __ldbl_is_dbl. * sysdeps/ieee754/ldbl-opt/ndlbl-compat.c: Include libio/strfile.h instead of libioP.h. (__nldbl_IO_vfscanf, __ndlbl___vfscanf, __nldbl_sscanf) (__nldbl___vsscanf, __nldbl_vscanf, __nldbl_fscanf) (__nldbl_scanf, __nldbl_vfwscanf, __nldbl_swscanf) (__nldbl_vswscanf, __nldbl_vwscanf, __nldbl_fwscanf) (__nldbl_wscanf): Call __vfscanf_internal / __vfwscanf_internal directly, passing SCANF_LDBL_IS_DBL. Set up a strfile if necessary. Do not set __no_long_double. Normalize variable names. (__nldbl___isoc99_vfscanf, __nldbl___isoc99_sscanf) (__nldbl___isoc99_vsscanf, __nldbl___isoc99_vscanf) (__nldbl___isoc99_fscanf, __nldbl___isoc99_scanf) (__nldbl___isoc99_vfwscanf, __nldbl___isoc99_swscanf) (__nldbl___isoc99_vswscanf, __nldbl___isoc99_vwscanf) (__nldbl___isoc99_fwscanf, __nldbl___isoc99_wscanf): Call __vfscanf_internal / __vfwscanf_internal directly, passing SCANF_LDBL_IS_DBL | SCANF_ISOC99_A. Set up a strfile if necessary. Do not set __no_long_double. Normalize variable names. --- stdio-common/vfscanf-internal.c | 3 - sysdeps/ieee754/ldbl-opt/nldbl-compat.c | 245 +++++++++++++++----------------- 2 files changed, 116 insertions(+), 132 deletions(-) diff --git a/stdio-common/vfscanf-internal.c b/stdio-common/vfscanf-internal.c index 9f99d237d2..87b14edfdb 100644 --- a/stdio-common/vfscanf-internal.c +++ b/stdio-common/vfscanf-internal.c @@ -333,9 +333,6 @@ __vfscanf_internal (FILE *s, const char *format, va_list argptr, #define LDBL_DISTINCT (__glibc_likely ((mode_flags & SCANF_LDBL_IS_DBL) == 0)) #define USE_ISOC99_A (__glibc_likely (mode_flags & SCANF_ISOC99_A)) - /* Temporarily honor the environmental mode bits. */ - if (__ldbl_is_dbl) - mode_flags |= SCANF_LDBL_IS_DBL; #ifdef __va_copy __va_copy (arg, argptr); diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-compat.c b/sysdeps/ieee754/ldbl-opt/nldbl-compat.c index 9ac88deb74..15f212ffce 100644 --- a/sysdeps/ieee754/ldbl-opt/nldbl-compat.c +++ b/sysdeps/ieee754/ldbl-opt/nldbl-compat.c @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include @@ -334,13 +334,10 @@ int attribute_compat_text_section __nldbl__IO_vfscanf (FILE *s, const char *fmt, va_list ap, int *errp) { - int res; - set_no_long_double (); - res = __vfscanf_internal (s, fmt, ap, 0); - clear_no_long_double (); + int ret = __vfscanf_internal (s, fmt, ap, SCANF_LDBL_IS_DBL); if (__glibc_unlikely (errp != 0)) - *errp = (res == -1); - return res; + *errp = (ret == -1); + return ret; } #endif @@ -348,11 +345,7 @@ int attribute_compat_text_section __nldbl___vfscanf (FILE *s, const char *fmt, va_list ap) { - int res; - set_no_long_double (); - res = __vfscanf_internal (s, fmt, ap, 0); - clear_no_long_double (); - return res; + return __vfscanf_internal (s, fmt, ap, SCANF_LDBL_IS_DBL); } weak_alias (__nldbl___vfscanf, __nldbl_vfscanf) libc_hidden_def (__nldbl_vfscanf) @@ -361,26 +354,26 @@ int attribute_compat_text_section __nldbl_sscanf (const char *s, const char *fmt, ...) { - va_list arg; - int done; + _IO_strfile sf; + FILE *f = _IO_strfile_read (&sf, s); + va_list ap; + int ret; - va_start (arg, fmt); - done = __nldbl_vsscanf (s, fmt, arg); - va_end (arg); + va_start (ap, fmt); + ret = __vfscanf_internal (f, fmt, ap, SCANF_LDBL_IS_DBL); + va_end (ap); - return done; + return ret; } strong_alias (__nldbl_sscanf, __nldbl__IO_sscanf) int attribute_compat_text_section -__nldbl___vsscanf (const char *string, const char *fmt, va_list ap) +__nldbl___vsscanf (const char *s, const char *fmt, va_list ap) { - int res; - __no_long_double = 1; - res = _IO_vsscanf (string, fmt, ap); - __no_long_double = 0; - return res; + _IO_strfile sf; + FILE *f = _IO_strfile_read (&sf, s); + return __vfscanf_internal (f, fmt, ap, SCANF_LDBL_IS_DBL); } weak_alias (__nldbl___vsscanf, __nldbl_vsscanf) libc_hidden_def (__nldbl_vsscanf) @@ -389,46 +382,42 @@ int attribute_compat_text_section weak_function __nldbl_vscanf (const char *fmt, va_list ap) { - return __nldbl_vfscanf (stdin, fmt, ap); + return __vfscanf_internal (stdin, fmt, ap, SCANF_LDBL_IS_DBL); } int attribute_compat_text_section __nldbl_fscanf (FILE *stream, const char *fmt, ...) { - va_list arg; - int done; + va_list ap; + int ret; - va_start (arg, fmt); - done = __nldbl_vfscanf (stream, fmt, arg); - va_end (arg); + va_start (ap, fmt); + ret = __vfscanf_internal (stream, fmt, ap, SCANF_LDBL_IS_DBL); + va_end (ap); - return done; + return ret; } int attribute_compat_text_section __nldbl_scanf (const char *fmt, ...) { - va_list arg; - int done; + va_list ap; + int ret; - va_start (arg, fmt); - done = __nldbl_vfscanf (stdin, fmt, arg); - va_end (arg); + va_start (ap, fmt); + ret = __vfscanf_internal (stdin, fmt, ap, SCANF_LDBL_IS_DBL); + va_end (ap); - return done; + return ret; } int attribute_compat_text_section __nldbl_vfwscanf (FILE *s, const wchar_t *fmt, va_list ap) { - int res; - set_no_long_double (); - res = __vfwscanf_internal (s, fmt, ap, 0); - clear_no_long_double (); - return res; + return __vfwscanf_internal (s, fmt, ap, SCANF_LDBL_IS_DBL); } libc_hidden_def (__nldbl_vfwscanf) @@ -436,25 +425,28 @@ int attribute_compat_text_section __nldbl_swscanf (const wchar_t *s, const wchar_t *fmt, ...) { - va_list arg; - int done; + _IO_strfile sf; + struct _IO_wide_data wd; + FILE *f = _IO_strfile_readw (&sf, &wd, s); + va_list ap; + int ret; - va_start (arg, fmt); - done = __nldbl_vswscanf (s, fmt, arg); - va_end (arg); + va_start (ap, fmt); + ret = __vfwscanf_internal (f, fmt, ap, SCANF_LDBL_IS_DBL); + va_end (ap); - return done; + return ret; } int attribute_compat_text_section -__nldbl_vswscanf (const wchar_t *string, const wchar_t *fmt, va_list ap) +__nldbl_vswscanf (const wchar_t *s, const wchar_t *fmt, va_list ap) { - int res; - __no_long_double = 1; - res = vswscanf (string, fmt, ap); - __no_long_double = 0; - return res; + _IO_strfile sf; + struct _IO_wide_data wd; + FILE *f = _IO_strfile_readw (&sf, &wd, s); + + return __vfwscanf_internal (f, fmt, ap, SCANF_LDBL_IS_DBL); } libc_hidden_def (__nldbl_vswscanf) @@ -462,35 +454,35 @@ int attribute_compat_text_section weak_function __nldbl_vwscanf (const wchar_t *fmt, va_list ap) { - return __nldbl_vfwscanf (stdin, fmt, ap); + return __vfwscanf_internal (stdin, fmt, ap, SCANF_LDBL_IS_DBL); } int attribute_compat_text_section __nldbl_fwscanf (FILE *stream, const wchar_t *fmt, ...) { - va_list arg; - int done; + va_list ap; + int ret; - va_start (arg, fmt); - done = __nldbl_vfwscanf (stream, fmt, arg); - va_end (arg); + va_start (ap, fmt); + ret = __vfwscanf_internal (stream, fmt, ap, SCANF_LDBL_IS_DBL); + va_end (ap); - return done; + return ret; } int attribute_compat_text_section __nldbl_wscanf (const wchar_t *fmt, ...) { - va_list arg; - int done; + va_list ap; + int ret; - va_start (arg, fmt); - done = __nldbl_vfwscanf (stdin, fmt, arg); - va_end (arg); + va_start (ap, fmt); + ret = __vfwscanf_internal (stdin, fmt, ap, SCANF_LDBL_IS_DBL); + va_end (ap); - return done; + return ret; } int @@ -865,11 +857,7 @@ int attribute_compat_text_section __nldbl___isoc99_vfscanf (FILE *s, const char *fmt, va_list ap) { - int res; - set_no_long_double (); - res = __isoc99_vfscanf (s, fmt, ap); - clear_no_long_double (); - return res; + return __vfscanf_internal (s, fmt, ap, SCANF_LDBL_IS_DBL | SCANF_ISOC99_A); } libc_hidden_def (__nldbl___isoc99_vfscanf) @@ -877,25 +865,26 @@ int attribute_compat_text_section __nldbl___isoc99_sscanf (const char *s, const char *fmt, ...) { - va_list arg; - int done; + _IO_strfile sf; + FILE *f = _IO_strfile_read (&sf, s); + va_list ap; + int ret; - va_start (arg, fmt); - done = __nldbl___isoc99_vsscanf (s, fmt, arg); - va_end (arg); + va_start (ap, fmt); + ret = __vfscanf_internal (f, fmt, ap, SCANF_LDBL_IS_DBL | SCANF_ISOC99_A); + va_end (ap); - return done; + return ret; } int attribute_compat_text_section -__nldbl___isoc99_vsscanf (const char *string, const char *fmt, va_list ap) +__nldbl___isoc99_vsscanf (const char *s, const char *fmt, va_list ap) { - int res; - __no_long_double = 1; - res = __isoc99_vsscanf (string, fmt, ap); - __no_long_double = 0; - return res; + _IO_strfile sf; + FILE *f = _IO_strfile_read (&sf, s); + + return __vfscanf_internal (f, fmt, ap, SCANF_LDBL_IS_DBL | SCANF_ISOC99_A); } libc_hidden_def (__nldbl___isoc99_vsscanf) @@ -903,46 +892,42 @@ int attribute_compat_text_section __nldbl___isoc99_vscanf (const char *fmt, va_list ap) { - return __nldbl___isoc99_vfscanf (stdin, fmt, ap); + return __vfscanf_internal (stdin, fmt, ap, SCANF_LDBL_IS_DBL | SCANF_ISOC99_A); } int attribute_compat_text_section -__nldbl___isoc99_fscanf (FILE *stream, const char *fmt, ...) +__nldbl___isoc99_fscanf (FILE *s, const char *fmt, ...) { - va_list arg; - int done; + va_list ap; + int ret; - va_start (arg, fmt); - done = __nldbl___isoc99_vfscanf (stream, fmt, arg); - va_end (arg); + va_start (ap, fmt); + ret = __vfscanf_internal (s, fmt, ap, SCANF_LDBL_IS_DBL | SCANF_ISOC99_A); + va_end (ap); - return done; + return ret; } int attribute_compat_text_section __nldbl___isoc99_scanf (const char *fmt, ...) { - va_list arg; - int done; + va_list ap; + int rv; - va_start (arg, fmt); - done = __nldbl___isoc99_vfscanf (stdin, fmt, arg); - va_end (arg); + va_start (ap, fmt); + rv = __vfscanf_internal (stdin, fmt, ap, SCANF_LDBL_IS_DBL | SCANF_ISOC99_A); + va_end (ap); - return done; + return rv; } int attribute_compat_text_section __nldbl___isoc99_vfwscanf (FILE *s, const wchar_t *fmt, va_list ap) { - int res; - set_no_long_double (); - res = __isoc99_vfwscanf (s, fmt, ap); - clear_no_long_double (); - return res; + return __vfwscanf_internal (s, fmt, ap, SCANF_LDBL_IS_DBL | SCANF_ISOC99_A); } libc_hidden_def (__nldbl___isoc99_vfwscanf) @@ -950,26 +935,28 @@ int attribute_compat_text_section __nldbl___isoc99_swscanf (const wchar_t *s, const wchar_t *fmt, ...) { - va_list arg; - int done; + _IO_strfile sf; + struct _IO_wide_data wd; + FILE *f = _IO_strfile_readw (&sf, &wd, s); + va_list ap; + int ret; - va_start (arg, fmt); - done = __nldbl___isoc99_vswscanf (s, fmt, arg); - va_end (arg); + va_start (ap, fmt); + ret = __vfwscanf_internal (f, fmt, ap, SCANF_LDBL_IS_DBL | SCANF_ISOC99_A); + va_end (ap); - return done; + return ret; } int attribute_compat_text_section -__nldbl___isoc99_vswscanf (const wchar_t *string, const wchar_t *fmt, - va_list ap) +__nldbl___isoc99_vswscanf (const wchar_t *s, const wchar_t *fmt, va_list ap) { - int res; - __no_long_double = 1; - res = __isoc99_vswscanf (string, fmt, ap); - __no_long_double = 0; - return res; + _IO_strfile sf; + struct _IO_wide_data wd; + FILE *f = _IO_strfile_readw (&sf, &wd, s); + + return __vfwscanf_internal (f, fmt, ap, SCANF_LDBL_IS_DBL | SCANF_ISOC99_A); } libc_hidden_def (__nldbl___isoc99_vswscanf) @@ -982,30 +969,30 @@ __nldbl___isoc99_vwscanf (const wchar_t *fmt, va_list ap) int attribute_compat_text_section -__nldbl___isoc99_fwscanf (FILE *stream, const wchar_t *fmt, ...) +__nldbl___isoc99_fwscanf (FILE *s, const wchar_t *fmt, ...) { - va_list arg; - int done; + va_list ap; + int ret; - va_start (arg, fmt); - done = __nldbl___isoc99_vfwscanf (stream, fmt, arg); - va_end (arg); + va_start (ap, fmt); + ret = __vfwscanf_internal (s, fmt, ap, SCANF_LDBL_IS_DBL | SCANF_ISOC99_A); + va_end (ap); - return done; + return ret; } int attribute_compat_text_section __nldbl___isoc99_wscanf (const wchar_t *fmt, ...) { - va_list arg; - int done; + va_list ap; + int ret; - va_start (arg, fmt); - done = __nldbl___isoc99_vfwscanf (stdin, fmt, arg); - va_end (arg); + va_start (ap, fmt); + ret = __vfwscanf_internal (stdin, fmt, ap, SCANF_LDBL_IS_DBL | SCANF_ISOC99_A); + va_end (ap); - return done; + return ret; } #if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)