Renamed status->this to status->current to allow for use with C++ compilers.

[pdclib] / functions / stdio / vsscanf.c

diff --git a/functions/stdio/vsscanf.c b/functions/stdio/vsscanf.c
index 34397ac36407834ff02f63b16de83190fc4db493..b494da1fdcb54ce9b580d1f43b399625e59f70a7 100644 (file)
--- a/functions/stdio/vsscanf.c
+++ b/functions/stdio/vsscanf.c
@@ -19,7 +19,7 @@ int vsscanf( const char * _PDCLIB_restrict s, const char * _PDCLIB_restrict form
     status.flags = 0;
     status.n = 0; 
     status.i = 0;
-    status.this = 0;
+    status.current = 0;
     status.s = (char *)s;
     status.width = 0;
     status.prec = 0;
@@ -59,6 +59,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;
         }