1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-28 00:21:52 +03:00
2002-02-26  Ulrich Drepper  <drepper@redhat.com>

	* stdio-common/vfscanf.c (_IO_vfwscanf): Always use ungetc, never
	ungetwc.  It's a macro.
	* libio/tst-swscanf.c (do_test): Adjust for now fixed wscanf
	implementation.
	Reported by Jason Merrill <jason@redhat.com>.
This commit is contained in:
Ulrich Drepper
2002-02-26 18:08:08 +00:00
parent b39d571990
commit 73f1b06797
3 changed files with 26 additions and 17 deletions

View File

@ -1996,7 +1996,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
{
/* The current character is not in the
scanset. */
ungetwc (c, s);
ungetc (c, s);
goto out;
}
@ -2008,7 +2008,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
break;
if (*runp == c && not_in)
{
ungetwc (c, s);
ungetc (c, s);
goto out;
}
@ -2018,7 +2018,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
if (runp == wp && !not_in)
{
ungetwc (c, s);
ungetc (c, s);
goto out;
}
@ -2213,7 +2213,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
{
/* The current character is not in the
scanset. */
ungetwc (c, s);
ungetc (c, s);
goto out2;
}
@ -2225,7 +2225,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
break;
if (*runp == c && not_in)
{
ungetwc (c, s);
ungetc (c, s);
goto out2;
}
@ -2235,7 +2235,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
if (runp == wp && !not_in)
{
ungetwc (c, s);
ungetc (c, s);
goto out2;
}