diff --git a/reactos/ChangeLog b/reactos/ChangeLog index f1d0b51bc5b..7b2ae3aed9c 100644 --- a/reactos/ChangeLog +++ b/reactos/ChangeLog @@ -4,6 +4,7 @@ * new private support functions _lasttoken and _wlasttoken to support strtok and wcstok respectively. * fixed lib/msvcrt/stdio/vfscanf.c to remove unnecessary globals. + * changed crtdll to use msvcrt's stdio/scanf.c 2003-07-16 Royce Mitchell III diff --git a/reactos/lib/crtdll/makefile b/reactos/lib/crtdll/makefile index beef49687ee..1c17a233326 100644 --- a/reactos/lib/crtdll/makefile +++ b/reactos/lib/crtdll/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.58 2003/07/16 21:54:22 royce Exp $ +# $Id: makefile,v 1.59 2003/07/16 22:09:07 royce Exp $ PATH_TO_TOP = ../.. @@ -339,7 +339,7 @@ STDIO_OBJECTS = \ $(PATH_TO_MSVCRT)/stdio/rename.o \ $(PATH_TO_MSVCRT)/stdio/rewind.o \ $(PATH_TO_MSVCRT)/stdio/rmtmp.o \ - stdio/scanf.o \ + $(PATH_TO_MSVCRT)/stdio/scanf.o \ $(PATH_TO_MSVCRT)/stdio/setbuf.o \ stdio/setbuffe.o \ stdio/setlineb.o \ diff --git a/reactos/lib/crtdll/stdio/scanf.c b/reactos/lib/crtdll/stdio/scanf.c deleted file mode 100644 index d7fb9a0cf43..00000000000 --- a/reactos/lib/crtdll/stdio/scanf.c +++ /dev/null @@ -1,75 +0,0 @@ -/* Copyright (C) 1991, 1995, 1996 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 -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -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 -#include -#include -#include - - -/* The function `vscanf' is not defined in ISO C. Therefore we must - use the protected form here. In stdio it is called `__vscanf' and - in libio `_IO_vscanf'. */ -#ifdef USE_IN_LIBIO -# include -# define VSCANF _IO_vscanf -#else -# define VSCANF __vscanf -#endif - -int __vscanf (const char *format, va_list arg); - -/* Read formatted input from stdin according to the format string FORMAT. */ -/* VARARGS1 */ -/* - * @implemented - */ -int scanf (const char *format, ...) -{ - va_list arg; - int done; - - va_start (arg, format); - done = VSCANF (format, arg); - va_end (arg); - - return done; -} - -/* - * @implemented - */ -int -wscanf(const wchar_t *fmt, ...) -{ - va_list arg; - int done; - char *f; - int i, len = wcslen(fmt); - - f = malloc(len+1); - for(i=0;i