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>.

3 files changed, 26 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index 4823a621a5..b132ab7926 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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>.
+
 2002-02-25  Jakub Jelinek  <jakub@redhat.com>
 
 	* libio/iofopen.c (__fopen_maybe_mmap): Set the initial
diff --git a/libio/tst-swscanf.c b/libio/tst-swscanf.c
index 86472de16e..05be4e6e71 100644
--- a/libio/tst-swscanf.c
+++ b/libio/tst-swscanf.c
@@ -26,18 +26,19 @@ static const struct
   const wchar_t *fmt;
   const wchar_t *wfmt;
   const wchar_t *arg;
+  int retval;
   const char *res;
   const wchar_t *wres;
   int only_C_locale;
 } tests[] =
   {
-    { L"%[abc]", L"%l[abc]", L"aabbccddaabb", "aabbcc", L"aabbcc", 0 },
-    { L"%[^def]", L"%l[^def]", L"aabbccddaabb", "aabbcc", L"aabbcc", 0 },
-    { L"%[^abc]", L"%l[^abc]", L"aabbccddaabb", "", L"", 0 },
-    { L"%[a-c]", L"%l[a-c]", L"aabbccddaabb", "aabbcc", L"aabbcc", 1 },
-    { L"%[^d-f]", L"%l[^d-f]", L"aabbccddaabb", "aabbcc", L"aabbcc", 1 },
-    { L"%[^a-c]", L"%l[^a-c]", L"aabbccddaabb", "", L"", 1 },
-    { L"%[^a-c]", L"%l[^a-c]", L"bbccddaabb", "", L"", 1 }
+    { L"%[abc]", L"%l[abc]", L"aabbccddaabb", 1 ,"aabbcc", L"aabbcc", 0 },
+    { L"%[^def]", L"%l[^def]", L"aabbccddaabb", 1, "aabbcc", L"aabbcc", 0 },
+    { L"%[^abc]", L"%l[^abc]", L"aabbccddaabb", 0, "", L"", 0 },
+    { L"%[a-c]", L"%l[a-c]", L"aabbccddaabb", 1, "aabbcc", L"aabbcc", 1 },
+    { L"%[^d-f]", L"%l[^d-f]", L"aabbccddaabb", 1, "aabbcc", L"aabbcc", 1 },
+    { L"%[^a-c]", L"%l[^a-c]", L"aabbccddaabb", 0, "", L"", 1 },
+    { L"%[^a-c]", L"%l[^a-c]", L"bbccddaabb", 0, "", L"", 1 }
   };
 
 
@@ -63,13 +64,13 @@ do_test (const char *loc)
       if (tests[n].only_C_locale && strcmp (loc, "C") != 0)
 	continue;
 
-      if (swscanf (tests[n].arg, tests[n].fmt, buf) != 1)
+      if (swscanf (tests[n].arg, tests[n].fmt, buf) != tests[n].retval)
 	{
 	  printf ("swscanf (\"%S\", \"%S\", ...) failed\n",
 		  tests[n].arg, tests[n].fmt);
 	  result = 1;
 	}
-      else if (strcmp (buf, tests[n].res) != 0)
+      else if (tests[n].retval != 0 && strcmp (buf, tests[n].res) != 0)
 	{
 	  printf ("swscanf (\"%S\", \"%S\", ...) return \"%s\", expected \"%s\"\n",
 		  tests[n].arg, tests[n].fmt, buf, tests[n].res);
@@ -79,13 +80,13 @@ do_test (const char *loc)
 	printf ("swscanf (\"%S\", \"%S\", ...) OK\n",
 		tests[n].arg, tests[n].fmt);
 
-      if (swscanf (tests[n].arg, tests[n].wfmt, wbuf) != 1)
+      if (swscanf (tests[n].arg, tests[n].wfmt, wbuf) != tests[n].retval)
 	{
 	  printf ("swscanf (\"%S\", \"%S\", ...) failed\n",
 		  tests[n].arg, tests[n].wfmt);
 	  result = 1;
 	}
-      else if (wcscmp (wbuf, tests[n].wres) != 0)
+      else if (tests[n].retval != 0 && wcscmp (wbuf, tests[n].wres) != 0)
 	{
 	  printf ("swscanf (\"%S\", \"%S\", ...) return \"%S\", expected \"%S\"\n",
 		  tests[n].arg, tests[n].wfmt, wbuf, tests[n].wres);
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;
 		    }