Thu Jun 27 14:22:31 1996 Andreas Schwab <>
authorroland <roland>
Mon, 1 Jul 1996 23:04:04 +0000 (23:04 +0000)
committerroland <roland>
Mon, 1 Jul 1996 23:04:04 +0000 (23:04 +0000)
* stdio/Makefile (routines): Add vscanf.
* stdio-common/Makefile (routines): Remove vscanf.
* stdio-common/vscanf.c: Move to ...
* stdio/vscanf.c: here.

stdio-common/vscanf.c [deleted file]
stdio/vscanf.c [new file with mode: 0644]

index 00e34c5..7fe1987 100644 (file)
@@ -27,7 +27,7 @@ routines      :=                                                            \
        ctermid cuserid                                                       \
        vfprintf vprintf printf_fp reg-printf printf-prs _itoa                \
        fprintf printf snprintf sprintf asprintf dprintf                      \
-       vfscanf vscanf                                                        \
+       vfscanf                                                               \
        fscanf scanf sscanf                                                   \
        perror psignal                                                        \
        tmpfile tmpnam tempnam tempname                                       \
diff --git a/stdio-common/vscanf.c b/stdio-common/vscanf.c
deleted file mode 100644 (file)
index 0d82944..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright (C) 1991, 1992 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 Library General Public License as
-published by the Free Software Foundation; either version 2 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
-Library General Public License for more details.
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
-#include <ansidecl.h>
-#include <stdarg.h>
-#include <stdio.h>
-#undef vscanf
-/* Read formatted input from stdin according to the format
-   string in FORMAT, using the argument list in ARG.  */
-DEFUN(vscanf, (format, arg), CONST char *format AND va_list arg)
-  return vfscanf (stdin, format, arg);
index 718c492..9c69e52 100644 (file)
@@ -35,7 +35,7 @@ routines      :=                                                            \
        fgets gets fputs puts                                                 \
        getdelim                                                              \
        fclose fflush                                                         \
-       vdprintf vsnprintf vsprintf vasprintf vsscanf                         \
+       vdprintf vsnprintf vsprintf vasprintf vsscanf vscanf                  \
        memstream obstream linewrap                                           \
        internals sysd-stdio pipestream stdio_init libc_fatal
 aux    := defs glue
diff --git a/stdio/vscanf.c b/stdio/vscanf.c
new file mode 100644 (file)
index 0000000..0d82944
--- /dev/null
@@ -0,0 +1,32 @@
+/* Copyright (C) 1991, 1992 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 Library General Public License as
+published by the Free Software Foundation; either version 2 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
+Library General Public License for more details.
+You should have received a copy of the GNU Library General Public
+License along with the GNU C Library; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 675 Mass Ave,
+Cambridge, MA 02139, USA.  */
+#include <ansidecl.h>
+#include <stdarg.h>
+#include <stdio.h>
+#undef vscanf
+/* Read formatted input from stdin according to the format
+   string in FORMAT, using the argument list in ARG.  */
+DEFUN(vscanf, (format, arg), CONST char *format AND va_list arg)
+  return vfscanf (stdin, format, arg);