From patchwork Fri Nov 22 20:20:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Simon Marchi (Code Review)" X-Patchwork-Id: 36135 Received: (qmail 99273 invoked by alias); 22 Nov 2019 20:20:18 -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 99264 invoked by uid 89); 22 Nov 2019 20:20:18 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3 autolearn=ham version=3.3.1 spammy= X-HELO: mx1.osci.io X-Gerrit-PatchSet: 3 Date: Fri, 22 Nov 2019 15:20:11 -0500 From: "Sourceware to Gerrit sync (Code Review)" To: "Gabriel F. T. Gomes" , libc-alpha@sourceware.org Cc: Florian Weimer Auto-Submitted: auto-generated X-Gerrit-MessageType: merged Subject: [pushed] Use DEPRECATED_SCANF macro for remaining C99-compliant scanf functions X-Gerrit-Change-Id: I706b344a3fb50be017cdab9251d9da18a3ba8c60 X-Gerrit-Change-Number: 698 X-Gerrit-ChangeURL: X-Gerrit-Commit: 93486ba583ecef1ba17357cfeb658ce3bea583bd In-Reply-To: References: Reply-To: noreply@gnutoolchain-gerrit.osci.io, gabriel@inconstante.net.br, fweimer@redhat.com, libc-alpha@sourceware.org MIME-Version: 1.0 Content-Disposition: inline User-Agent: Gerrit/3.0.3-79-g83ff7f88f1 Message-Id: <20191122202011.3F8DD2816F@gnutoolchain-gerrit.osci.io> Sourceware to Gerrit sync has submitted this change. Change URL: https://gnutoolchain-gerrit.osci.io/r/c/glibc/+/698 ...................................................................... Use DEPRECATED_SCANF macro for remaining C99-compliant scanf functions When the commit commit 03992356e6fedc5a5e9d32df96c1a2c79ea28a8f Author: Zack Weinberg Date: Sat Feb 10 11:58:35 2018 -0500 Use C99-compliant scanf under _GNU_SOURCE with modern compilers. added the DEPRECATED_SCANF macro to select when redirections of *scanf functions to their ISO C99 compliant versions should happen, it accidentally missed doing it for vfwscanf, vwscanf, and vswscanf. Tested for powerpc64le and with build-many-glibcs (i686-linux-gnu and nios2-linux-gnu are failing with current master, and with this patch, but I didn't see a regression). Change-Id: I706b344a3fb50be017cdab9251d9da18a3ba8c60 --- M include/wchar.h M libio/iovswscanf.c M wcsmbs/wchar.h 3 files changed, 2 insertions(+), 9 deletions(-) Approvals: Florian Weimer: Looks good to me, approved diff --git a/include/wchar.h b/include/wchar.h index 2cb4495..c792b38 100644 --- a/include/wchar.h +++ b/include/wchar.h @@ -114,8 +114,6 @@ libc_hidden_proto (putwc_unlocked) libc_hidden_proto (putwc) -libc_hidden_proto (vswscanf) - libc_hidden_proto (mbrtowc) libc_hidden_proto (wcrtomb) extern int __wcscmp (const wchar_t *__s1, const wchar_t *__s2) @@ -237,11 +235,7 @@ extern int __isoc99_vswscanf (const wchar_t *__restrict __s, const wchar_t *__restrict __format, __gnuc_va_list __arg) __THROW; -extern int __vswscanf (const wchar_t *__restrict __s, - const wchar_t *__restrict __format, - __gnuc_va_list __arg) __THROW; libc_hidden_proto (__isoc99_vswscanf) -libc_hidden_proto (__vswscanf) libc_hidden_proto (__isoc99_vfwscanf) /* Internal functions. */ diff --git a/libio/iovswscanf.c b/libio/iovswscanf.c index b0759ec..3876ce7 100644 --- a/libio/iovswscanf.c +++ b/libio/iovswscanf.c @@ -40,6 +40,4 @@ FILE *f = _IO_strfile_readw (&sf, &wd, string); return __vfwscanf_internal (f, format, args, 0); } -libc_hidden_def (__vswscanf) -ldbl_hidden_def (__vswscanf, vswscanf) ldbl_weak_alias (__vswscanf, vswscanf) diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h index 4b731eb..fc62fa3 100644 --- a/wcsmbs/wchar.h +++ b/wcsmbs/wchar.h @@ -685,7 +685,8 @@ __gnuc_va_list __arg) __THROW /* __attribute__ ((__format__ (__wscanf__, 2, 0))) */; -# if !defined __USE_GNU \ +/* Same redirection as above for the v*wscanf family. */ +# if !__GLIBC_USE (DEPRECATED_SCANF) \ && (!defined __LDBL_COMPAT || !defined __REDIRECT) \ && (defined __STRICT_ANSI__ || defined __USE_XOPEN2K) # ifdef __REDIRECT