summary refs log tree commit diff
path: root/stdio-common/vfscanf.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1995-11-30 04:49:04 +0000
committerRoland McGrath <roland@gnu.org>1995-11-30 04:49:04 +0000
commitb2518f55c0bce9b3f32551c2a0e4addcaeac7b0f (patch)
treec0d530cc474670cb87d95f404c577ca4e6a2a25a /stdio-common/vfscanf.c
parentb7843ea9ff56cd1e941abf9fab7c9c8c4e7dde69 (diff)
downloadglibc-b2518f55c0bce9b3f32551c2a0e4addcaeac7b0f.tar.gz
glibc-b2518f55c0bce9b3f32551c2a0e4addcaeac7b0f.tar.xz
glibc-b2518f55c0bce9b3f32551c2a0e4addcaeac7b0f.zip
Wed Nov 29 12:30:50 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu> cvs/libc-951130
	* 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.
Diffstat (limited to 'stdio-common/vfscanf.c')
-rw-r--r--stdio-common/vfscanf.c10
1 files changed, 8 insertions, 2 deletions
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)