X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Fvsscanf.c;h=20893c97a7b6251f9c30beb49b0e766b181eddc6;hb=a381f50d5325748b70096ac5f5d3f63ae4f6e18a;hp=34397ac36407834ff02f63b16de83190fc4db493;hpb=5bcc00c1b85feff1996e3f34a1a9ebf3b624161e;p=pdclib

diff --git a/functions/stdio/vsscanf.c b/functions/stdio/vsscanf.c
index 34397ac..20893c9 100644
--- a/functions/stdio/vsscanf.c
+++ b/functions/stdio/vsscanf.c
@@ -14,17 +14,10 @@
 
 int vsscanf( const char * _PDCLIB_restrict s, const char * _PDCLIB_restrict format, va_list arg )
 {
-    struct _PDCLIB_status_t status;
-    status.base = 0;
-    status.flags = 0;
-    status.n = 0; 
-    status.i = 0;
-    status.this = 0;
-    status.s = (char *)s;
-    status.width = 0;
-    status.prec = 0;
-    status.stream = NULL;
+    /* base, flag, n, i, current, s, width, prec, stream, arg */
+    struct _PDCLIB_status_t status = { 0, 0, 0, 0, 0, (char *)s, 0, 0, NULL, NULL };
     va_copy( status.arg, arg );
+
     while ( *format != '\0' )
     {
         const char * rc;
@@ -59,6 +52,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;
         }