From 73f1b06797637163b8529f4c7fa4b02b90c0154c Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 26 Feb 2002 18:08:08 +0000 Subject: Update. 2002-02-26 Ulrich Drepper * 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 . --- stdio-common/vfscanf.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'stdio-common') diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c index 0b4d030dfb..9586ab6890 100644 --- a/stdio-common/vfscanf.c +++ b/stdio-common/vfscanf.c @@ -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; } -- cgit v1.2.3