public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Florian Weimer <fw@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc/fw/libdl] stdio-common: Remove _IO_vfwscanf Date: Sat, 22 May 2021 17:08:26 +0000 (GMT) [thread overview] Message-ID: <20210522170826.0350B3860C37@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=be0358085cd37915dd64e37fc1ef309f82dee14d commit be0358085cd37915dd64e37fc1ef309f82dee14d Author: Florian Weimer <fweimer@redhat.com> Date: Wed May 19 14:47:41 2021 +0200 stdio-common: Remove _IO_vfwscanf 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. Diff: --- stdio-common/Makefile | 2 +- stdio-common/iovfwscanf.c | 38 -------------------------------------- 2 files changed, 1 insertion(+), 39 deletions(-) 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 - <https://www.gnu.org/licenses/>. */ - -#include <libioP.h> -#include <shlib-compat.h> - -/* 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
next reply other threads:[~2021-05-22 17:08 UTC|newest] Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-05-22 17:08 Florian Weimer [this message] 2021-05-25 14:47 Florian Weimer 2021-06-01 12:55 Florian Weimer
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210522170826.0350B3860C37@sourceware.org \ --to=fw@sourceware.org \ --cc=glibc-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).