mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-09 23:00:07 +00:00
45dcd79f6e
swscanf (added in C90 Amendment 1, present in UNIX98) calls vswscanf (added in C99, not in C90 Amendment 1 or UNIX98). This patch fixes this by using __vswscanf instead and making vswscanf into a weak alias. (I intend to add conform/ test support for C90 Amendment 1 - and various other standard versions supported by glibc but not yet by conform/ tests - at some point, once the results for currently tested standards are cleaner.) Tested for x86_64 and x86 (testsuite, and that installed stripped shared libraries are unchanged by the patch). [BZ #18542] * libio/iovswscanf.c (__vswscanf): Use libc_hidden_def. (vswscanf): Use ldbl_weak_alias instead of ldbl_strong_alias * include/wchar.h (__vswscanf): Declare. Use libc_hidden_proto. * libio/swscanf.c (__swscanf): Call __vswscanf instead of vswscanf. * conform/Makefile (test-xfail-UNIX98/wchar.h/linknamespace): Remove variable.
37 lines
1.1 KiB
C
37 lines
1.1 KiB
C
/* Copyright (C) 1991-2015 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 <stdarg.h>
|
|
#include <wchar.h>
|
|
|
|
/* Read formatted input from S, according to the format string FORMAT. */
|
|
/* VARARGS2 */
|
|
int
|
|
__swscanf (const wchar_t *s, const wchar_t *format, ...)
|
|
{
|
|
va_list arg;
|
|
int done;
|
|
|
|
va_start (arg, format);
|
|
done = __vswscanf (s, format, arg);
|
|
va_end (arg);
|
|
|
|
return done;
|
|
}
|
|
ldbl_strong_alias (__swscanf, swscanf)
|