[PATCH 2/9] Add __vfscanf_internal and __vfwscanf_internal with flags arguments.

Florian Weimer fweimer@redhat.com
Fri Jun 29 14:29:00 GMT 2018


On 03/07/2018 08:31 PM, Zack Weinberg wrote:
> diff --git a/stdio-common/iovfscanf.c b/stdio-common/iovfscanf.c
> new file mode 100644
> index 0000000000..fb347d60cb
> --- /dev/null
> +++ b/stdio-common/iovfscanf.c
> @@ -0,0 +1,34 @@
> +/* Copyright (C) 1991-2018 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
> +<http://www.gnu.org/licenses/>.  */
> +
> +#include <libioP.h>
> +#include <shlib-compat.h>
> +
> +#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_28)
> +
> +int
> +attribute_compat_text_section
> +__IO_vfscanf (FILE *fp, const char *format, va_list ap, int *errp)
> +{
> +  int rv = __vfscanf_internal (fp, format, ap, 0);
> +  if (__glibc_unlikely (errp != 0))
> +    *errp = (rv == -1);
> +  return rv;
> +}
> +ldbl_compat_symbol (libc, __IO_vfscanf, _IO_vfscanf, GLIBC_2_0);
> +
> +#endif

Now that _IO_vfscanf is a compat symbol, its wrapper should be removed 
from the libnldbl_nonshared.a library.  That is, the file 
sysdeps/ieee754/ldbl-opt/nldbl-iovfscanf.c should be deleted by this 
patch (and the makefile adjusted).

Thanks,
Florian



More information about the Libc-alpha mailing list