From b2518f55c0bce9b3f32551c2a0e4addcaeac7b0f Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 30 Nov 1995 04:49:04 +0000 Subject: Wed Nov 29 12:30:50 1995 Roland McGrath * libio/vsnprintf.c (__vsnprintf): Define as alias. * libio/iovsscanf.c (__vsscanf): Define as alias. * asprintf.c: Remove libio adaptation code added by drepper. * dprintf.c: Likewise. * printf.c: Likewise. * scanf.c: Likewise. * snprintf.c: Likewise. * sprintf.c: Likewise. * sscanf.c: Likewise. * vprintf.c: Likewise. * stdio-common/vfscanf.c [USE_IN_LIBIO] (__vfscanf): New wrapper function. (vfscanf): Define unconditionally. * sysdeps/i386/dl-machine.h (elf_machine_rel): If SYM is null, use zero for value. * misc/getpass.c: Write a newline after reading the unechoed password. --- stdio-common/vfscanf.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'stdio-common/vfscanf.c') diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c index a0bb63281c..b0e48df4f8 100644 --- a/stdio-common/vfscanf.c +++ b/stdio-common/vfscanf.c @@ -724,6 +724,12 @@ __vfscanf (FILE *s, const char *format, va_list argptr) return ((c == EOF || ungetc (c, s)), done); } -#ifndef USE_IN_LIBIO -weak_alias (__vfscanf, vfscanf) +#ifdef USE_IN_LIBIO +int +__vfscanf (FILE *s, const char *format, va_list argptr) +{ + return _IO_vfscanf (s, format, argptr, NULL); +} #endif + +weak_alias (__vfscanf, vfscanf) -- cgit 1.4.1