[Haiku-commits] r31305 - haiku/branches/features/32bit-wchar_t/src/system/libroot/posix/glibc/stdio-common

[zooey at BerliOS]

Author: zooey
Date: 2009-06-28 23:53:53 +0200 (Sun, 28 Jun 2009)
New Revision: 31305
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=31305&view=rev

Modified:
   haiku/branches/features/32bit-wchar_t/src/system/libroot/posix/glibc/stdio-common/vfscanf.c
Log:
* fix problem in wchar-versions of scanf() that would pretend to have
  successfully converted an item, although no matching character was found
  for a character class - we have to use the local ungetc() macro instead
  of the standard ungetwc()
This makes tst-swscanf work.


Modified: haiku/branches/features/32bit-wchar_t/src/system/libroot/posix/glibc/stdio-common/vfscanf.c
===================================================================
--- haiku/branches/features/32bit-wchar_t/src/system/libroot/posix/glibc/stdio-common/vfscanf.c	2009-06-28 21:50:26 UTC (rev 31304)
+++ haiku/branches/features/32bit-wchar_t/src/system/libroot/posix/glibc/stdio-common/vfscanf.c	2009-06-28 21:53:53 UTC (rev 31305)
@@ -1996,7 +1996,7 @@
 			    {
 			      /* The current character is not in the
                                  scanset.  */
-			      ungetwc (c, s);
+			      ungetc (c, s);
 			      goto out;
 			    }
 
@@ -2008,7 +2008,7 @@
 			    break;
 			  if (*runp == c && not_in)
 			    {
-			      ungetwc (c, s);
+				  ungetc (c, s);
 			      goto out;
 			    }
 
@@ -2018,7 +2018,7 @@
 
 		  if (runp == wp && !not_in)
 		    {
-		      ungetwc (c, s);
+		      ungetc (c, s);
 		      goto out;
 		    }
 
@@ -2213,7 +2213,7 @@
 			    {
 			      /* The current character is not in the
                                  scanset.  */
-			      ungetwc (c, s);
+			      ungetc (c, s);
 			      goto out2;
 			    }
 
@@ -2225,7 +2225,7 @@
 			    break;
 			  if (*runp == c && not_in)
 			    {
-			      ungetwc (c, s);
+			      ungetc (c, s);
 			      goto out2;
 			    }
 
@@ -2235,7 +2235,7 @@
 
 		  if (runp == wp && !not_in)
 		    {
-		      ungetwc (c, s);
+		      ungetc (c, s);
 		      goto out2;
 		    }