1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00

Fix swscanf vswscanf namespace (bug 18542).

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.
This commit is contained in:
Joseph Myers
2015-06-17 20:15:22 +00:00
parent eb1fae6a45
commit 45dcd79f6e
6 changed files with 17 additions and 4 deletions

View File

@ -28,7 +28,7 @@ __swscanf (const wchar_t *s, const wchar_t *format, ...)
int done;
va_start (arg, format);
done = vswscanf (s, format, arg);
done = __vswscanf (s, format, arg);
va_end (arg);
return done;