More improved unified tests (now life).

[pdclib] / functions / stdio / vfscanf.c

diff --git a/functions/stdio/vfscanf.c b/functions/stdio/vfscanf.c
index 16ea59283ef520755a1fecf6b31e18b4ef48febe..99a752ff2db0258fc8ccc67d47faae2162f3e5ac 100644 (file)
--- a/functions/stdio/vfscanf.c
+++ b/functions/stdio/vfscanf.c
@@ -14,9 +14,19 @@
 
 int vfscanf( FILE * _PDCLIB_restrict stream, const char * _PDCLIB_restrict format, va_list arg )
 {
-    /* base, flags, n, i, current, s, width, prec, stream, arg */
-    struct _PDCLIB_status_t status = { 0, 0, 0, 0, 0, NULL, 0, 0, stream, NULL };
+    /* TODO: This function should interpret format as multibyte characters.  */
+    struct _PDCLIB_status_t status;
+    status.base = 0;
+    status.flags = 0;
+    status.n = 0;
+    status.i = 0;
+    status.current = 0;
+    status.s = NULL;
+    status.width = 0;
+    status.prec = 0;
+    status.stream = stream;
     va_copy( status.arg, arg );
+
     while ( *format != '\0' )
     {
         const char * rc;
@@ -73,11 +83,23 @@ int vfscanf( FILE * _PDCLIB_restrict stream, const char * _PDCLIB_restrict forma
 #ifdef TEST
 #include <_PDCLIB_test.h>
 
+#include "scan_test.h"
+
+static int SCANFUNC( FILE * stream, char const * format, ... )
+{
+    va_list ap;
+    va_start( ap, format );
+    int result = vfscanf( stream, format, ap );
+    va_end( ap );
+    return result;
+}
+
 int main( void )
 {
-    /* TODO: Check whitespace / EOF / ungetc handling */
-    TESTCASE( NO_TESTDRIVER );
+#include "fscan_sources.incl"
+#include "scanf_testcases.incl"
     return TEST_RESULTS;
 }
 
 #endif
+