From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id 435833857403 for ; Mon, 31 May 2021 14:11:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 435833857403 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-412-Ht4mhdd4OGu_noLBz1UwCw-1; Mon, 31 May 2021 10:11:14 -0400 X-MC-Unique: Ht4mhdd4OGu_noLBz1UwCw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9AE28501E1 for ; Mon, 31 May 2021 14:11:13 +0000 (UTC) Received: from oldenburg.str.redhat.com (ovpn-113-228.ams2.redhat.com [10.36.113.228]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 06E0E60C0F for ; Mon, 31 May 2021 14:11:12 +0000 (UTC) From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH v2 01/16] stdio-common: Remove _IO_vfwscanf In-Reply-To: References: X-From-Line: 09aaf7bc489ed6504ed591f0453e21c49204e849 Mon Sep 17 00:00:00 2001 Message-Id: <09aaf7bc489ed6504ed591f0453e21c49204e849.1622469908.git.fweimer@redhat.com> Date: Mon, 31 May 2021 16:11:10 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 May 2021 14:11:18 -0000 The symbol has never been exported, so no compatibility symbol is needed. Removing this file prevents ld from creation an exported symbol in case GLIBC_2_0 expands to a symbol version which does not have a local: *; directive in the symbol version map file. --- libio/libio.h | 2 -- stdio-common/Makefile | 2 +- stdio-common/iovfwscanf.c | 38 --------------------- sysdeps/ieee754/ldbl-128ibm-compat/Makefile | 1 - 4 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 stdio-common/iovfwscanf.c diff --git a/libio/libio.h b/libio/libio.h index 511b39457f..98d526dec7 100644 --- a/libio/libio.h +++ b/libio/libio.h @@ -254,8 +254,6 @@ weak_extern (_IO_stdin_used); __result = _IO_fwide (__fp, __result); \ __result; }) -extern int _IO_vfwscanf (FILE * __restrict, const wchar_t * __restrict, - __gnuc_va_list, int *__restrict); extern __ssize_t _IO_wpadn (FILE *, wint_t, __ssize_t); extern void _IO_free_wbackup_area (FILE *) __THROW; diff --git a/stdio-common/Makefile b/stdio-common/Makefile index b2458ba4a6..f87796a8ce 100644 --- a/stdio-common/Makefile +++ b/stdio-common/Makefile @@ -40,7 +40,7 @@ routines := \ isoc99_scanf isoc99_vscanf isoc99_fscanf isoc99_vfscanf isoc99_sscanf \ isoc99_vsscanf \ psiginfo gentempfd \ - vfscanf-internal vfwscanf-internal iovfscanf iovfwscanf \ + vfscanf-internal vfwscanf-internal iovfscanf \ vfprintf-internal vfwprintf-internal aux := errlist siglist printf-parsemb printf-parsewc fxprintf diff --git a/stdio-common/iovfwscanf.c b/stdio-common/iovfwscanf.c deleted file mode 100644 index 56b6b3b0d5..0000000000 --- a/stdio-common/iovfwscanf.c +++ /dev/null @@ -1,38 +0,0 @@ -/* Implementation and symbols for _IO_vfwscanf. - Copyright (C) 1991-2021 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#include -#include - -/* This function is provided for ports older than GLIBC 2.29 because - external callers could theoretically exist. Newer ports do not need, - since it is not part of the API. */ -#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_29) - -int -attribute_compat_text_section -__IO_vfwscanf (FILE *fp, const wchar_t *format, va_list ap, int *errp) -{ - int rv = __vfwscanf_internal (fp, format, ap, 0); - if (__glibc_unlikely (errp != 0)) - *errp = (rv == -1); - return rv; -} -compat_symbol (libc, __IO_vfwscanf, _IO_vfwscanf, GLIBC_2_0); - -#endif diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/Makefile b/sysdeps/ieee754/ldbl-128ibm-compat/Makefile index 7b42746c34..67d476383a 100644 --- a/sysdeps/ieee754/ldbl-128ibm-compat/Makefile +++ b/sysdeps/ieee754/ldbl-128ibm-compat/Makefile @@ -325,7 +325,6 @@ ldbl-ibm128-files := $(objpfx)test-%-ibm128^ \ $(objpfx)iovsscanf^ \ $(objpfx)iovswscanf^ \ $(objpfx)iovfscanf^ \ - $(objpfx)iovfwscanf^ \ $(objpfx)mpn2ldbl^ \ $(objpfx)ldbl2mpn^ \ $(objpfx)strtold_nan^ \ -- 2.31.1