X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Fvsscanf.c;h=8a2379026af56d13040fff21589cc8247bc365ff;hb=f56f5d756f412e9c7058e2af4e36bc1de21dd642;hp=fd35889ab4d200ead2782f2a1e732c9b76fc97a7;hpb=5522316811fdce2216c4d1320af68dd54909aed5;p=pdclib

diff --git a/functions/stdio/vsscanf.c b/functions/stdio/vsscanf.c
index fd35889..8a23790 100644
--- a/functions/stdio/vsscanf.c
+++ b/functions/stdio/vsscanf.c
@@ -14,17 +14,19 @@
 
 int vsscanf( const char * _PDCLIB_restrict s, const char * _PDCLIB_restrict format, va_list arg )
 {
+    /* TODO: This function should interpret format as multibyte characters.  */
     struct _PDCLIB_status_t status;
     status.base = 0;
     status.flags = 0;
-    status.n = 0; 
+    status.n = 0;
     status.i = 0;
-    status.this = 0;
-    status.s = (char *)s;
+    status.current = 0;
+    status.s = (char *) s;
     status.width = 0;
     status.prec = 0;
     status.stream = NULL;
     va_copy( status.arg, arg );
+
     while ( *format != '\0' )
     {
         const char * rc;
@@ -62,11 +64,6 @@ int vsscanf( const char * _PDCLIB_restrict s, const char * _PDCLIB_restrict form
             /* NULL return code indicates input error */
             if ( rc == NULL )
             {
-                if ( status.n == 0 )
-                {
-                    /* input error before any conversion returns EOF */
-                    status.n = EOF;
-                }
                 break;
             }
             /* Continue parsing after conversion specifier */
@@ -82,20 +79,21 @@ int vsscanf( const char * _PDCLIB_restrict s, const char * _PDCLIB_restrict form
 #ifdef TEST
 #include <_PDCLIB_test.h>
 
+#include "scan_test.h"
+
+static int SCANFUNC( char const * stream, char const * format, ... )
+{
+    va_list ap;
+    va_start( ap, format );
+    int result = vsscanf( stream, format, ap );
+    va_end( ap );
+    return result;
+}
+
 int main( void )
 {
-    char const * teststring1 = "abc  def";
-    char const * teststring2 = "abcdef";
-    char const * teststring3 = "abc%def";
-    int x;
-    TESTCASE( sscanf( teststring2, "abcdef%n", &x ) == 0 );
-    TESTCASE( x == 6 );
-    TESTCASE( sscanf( teststring1, "abc def%n", &x ) == 0 );
-    TESTCASE( x == 8 );
-    TESTCASE( sscanf( teststring2, "abc def%n", &x ) == 0 );
-    TESTCASE( x == 6 );
-    TESTCASE( sscanf( teststring3, "abc%%def%n", &x ) == 0 );
-    TESTCASE( x == 7 );
+#include "sscan_sources.incl"
+#include "scanf_testcases.incl"
     return TEST_RESULTS;
 }