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

[pdclib] / functions / stdio / vfscanf.c

diff --git a/functions/stdio/vfscanf.c b/functions/stdio/vfscanf.c
index eda4226988d9c2b6222f624a613563331790accd..8b3a8f74c62426b7a0d029113738f79300c294e9 100644 (file)
--- a/functions/stdio/vfscanf.c
+++ b/functions/stdio/vfscanf.c
@@ -19,12 +19,13 @@ int vfscanf( FILE * _PDCLIB_restrict stream, const char * _PDCLIB_restrict forma
     status.flags = 0;
     status.n = 0; 
     status.i = 0;
-    status.this = 0;
+    status.current = 0;
     status.s = NULL;
     status.width = 0;
     status.prec = 0;
     status.stream = stream;
     va_copy( status.arg, arg );
+    // FIXME: This whole shebang should operate on STREAM, not S...
     while ( *format != '\0' )
     {
         const char * rc;
@@ -59,6 +60,11 @@ int vfscanf( FILE * _PDCLIB_restrict stream, const char * _PDCLIB_restrict forma
         }
         else
         {
+            /* NULL return code indicates matching error */
+            if ( rc == NULL )
+            {
+                break;
+            }
             /* Continue parsing after conversion specifier */
             format = rc;
         }