public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc/fw/libdl] stdio-common: Remove _IO_vfwscanf
@ 2021-05-25 14:47 Florian Weimer
0 siblings, 0 replies; 3+ messages in thread
From: Florian Weimer @ 2021-05-25 14:47 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=5c988a9c0d6c1e1cf62fa0ce57c67f31b3505b79
commit 5c988a9c0d6c1e1cf62fa0ce57c67f31b3505b79
Author: Florian Weimer <fweimer@redhat.com>
Date: Tue May 25 14:25:50 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
^ permalink raw reply [flat|nested] 3+ messages in thread
* [glibc/fw/libdl] stdio-common: Remove _IO_vfwscanf
@ 2021-06-01 12:55 Florian Weimer
0 siblings, 0 replies; 3+ messages in thread
From: Florian Weimer @ 2021-06-01 12:55 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=87261a7a104f1db8555d4dff5c49c4d69c699a35
commit 87261a7a104f1db8555d4dff5c49c4d69c699a35
Author: Florian Weimer <fweimer@redhat.com>
Date: Mon May 31 16:08:32 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:
---
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(-)
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
- <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
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^ \
^ permalink raw reply [flat|nested] 3+ messages in thread
* [glibc/fw/libdl] stdio-common: Remove _IO_vfwscanf
@ 2021-05-22 17:08 Florian Weimer
0 siblings, 0 replies; 3+ messages in thread
From: Florian Weimer @ 2021-05-22 17:08 UTC (permalink / raw)
To: glibc-cvs
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-06-01 12:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-25 14:47 [glibc/fw/libdl] stdio-common: Remove _IO_vfwscanf Florian Weimer
-- strict thread matches above, loose matches on Subject: below --
2021-06-01 12:55 Florian Weimer
2021-05-22 17:08 Florian Weimer
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).