summary refs log tree commit diff
path: root/stdio-common
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-02-26 18:08:08 +0000
committerUlrich Drepper <drepper@redhat.com>2002-02-26 18:08:08 +0000
commit73f1b06797637163b8529f4c7fa4b02b90c0154c (patch)
treecbef003f233bfb415cb75316d3b276dbbe55e5e7 /stdio-common
parentb39d571990557cc5ab855794ff0d4d7876f4596b (diff)
downloadglibc-73f1b06797637163b8529f4c7fa4b02b90c0154c.tar.gz
glibc-73f1b06797637163b8529f4c7fa4b02b90c0154c.tar.xz
glibc-73f1b06797637163b8529f4c7fa4b02b90c0154c.zip
Update.
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>.
Diffstat (limited to 'stdio-common')
-rw-r--r--stdio-common/vfscanf.c12
1 files changed, 6 insertions, 6 deletions
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;
 		    }