Compacted initializing of status struct.

[pdclib] / functions / stdio / vsscanf.c

diff --git a/functions/stdio/vsscanf.c b/functions/stdio/vsscanf.c
index c4565aada0320a307c06a044991c4acd504ce450..20893c97a7b6251f9c30beb49b0e766b181eddc6 100644 (file)
--- a/functions/stdio/vsscanf.c
+++ b/functions/stdio/vsscanf.c
@@ -10,27 +10,14 @@
 #include <stdarg.h>
 
 #ifndef REGTEST
+#include <ctype.h>
 
 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;
-    /* In _PDCLIB_print, status.n holds the maximum number of characters to be
-       written. As we don't need that for the scanf() functions, we (ab)use
-       this field to hold the number of matching conversion specifiers.
-    */
-    status.n = 0; 
-    status.i = 0;
-    status.this = 0;
-    /* In _PDCLIB_print, status.s is the string *printed to*. In the scanf()
-       functions, we (ab)use this field to hold the string *scanned from*.
-    */
-    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;
@@ -65,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;
         }