Individual init to get around warnings on 64bit.

[pdclib] / functions / stdio / vsscanf.c

diff --git a/functions/stdio/vsscanf.c b/functions/stdio/vsscanf.c
index 34397ac36407834ff02f63b16de83190fc4db493..3fc09cf3cdb2c04b1eef171f704e7e4657b4c2e1 100644 (file)
--- 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;
@@ -59,6 +61,11 @@ int vsscanf( const char * _PDCLIB_restrict s, const char * _PDCLIB_restrict form
         }
         else
         {
+            /* NULL return code indicates input error */
+            if ( rc == NULL )
+            {
+                break;
+            }
             /* Continue parsing after conversion specifier */
             format = rc;
         }