Further streamlined testing.

[fw/pdclib] / functions / stdio / vfprintf.c

diff --git a/functions/stdio/vfprintf.c b/functions/stdio/vfprintf.c
index 0288f6d74b90b9c17fa38ee43a6a68acc01e634a..2b216db9ff71b19dec53384c3ab92d2f5b762bbd 100644 (file)
--- a/functions/stdio/vfprintf.c
+++ b/functions/stdio/vfprintf.c
@@ -15,8 +15,18 @@
 int vfprintf( struct _PDCLIB_file_t * _PDCLIB_restrict stream, const char * _PDCLIB_restrict format, va_list arg )
 {
     /* TODO: This function should interpret format as multibyte characters.  */
-    /* Members: base, flags, n, i, this, s, width, prec, stream, arg         */
-    struct _PDCLIB_status_t status = { 0, 0, SIZE_MAX, 0, 0, NULL, 0, 0, stream, arg };
+    struct _PDCLIB_status_t status;
+    status.base = 0;
+    status.flags = 0;
+    status.n = SIZE_MAX;
+    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;
@@ -24,6 +34,7 @@ int vfprintf( struct _PDCLIB_file_t * _PDCLIB_restrict stream, const char * _PDC
         {
             /* No conversion specifier, print verbatim */
             putc( *(format++), stream );
+            status.i++;
         }
         else
         {
@@ -31,15 +42,19 @@ int vfprintf( struct _PDCLIB_file_t * _PDCLIB_restrict stream, const char * _PDC
             format = rc;
         }
     }
+    va_end( status.arg );
     return status.i;
 }
 
 #endif
 
 #ifdef TEST
+#include <stdlib.h>
+#include <limits.h>
+#include <string.h>
 #include <_PDCLIB_test.h>
 
-static int testprintf( FILE * stream, const char * format, ... )
+static int testprintf( FILE * stream, size_t n, const char * format, ... )
 {
     int i;
     va_list arg;
@@ -49,16 +64,16 @@ static int testprintf( FILE * stream, const char * format, ... )
     return i;
 }
 
+#define TESTCASE_SPRINTF( x )
+
 int main( void )
 {
-    FILE * fh;
-    TESTCASE( testprintf( stdout, "Hallo\n" ) == 6 );
-#if 0
-    TESTCASE( ( fh = fopen( "testfile", "w" ) ) != NULL );
-    TESTCASE( testprintf( fh, "Hallo\n" ) );
-    TESTCASE( fclose( fh ) == 0 );
-    TESTCASE( remove( "testfile" ) == 0 );
-#endif
+    FILE * buffer;
+    TESTCASE( ( buffer = fopen( testfile, "wb" ) ) != NULL );
+#include "printf_testcases.incl"
+    TESTCASE( fclose( buffer ) == 0 );
+#include "fprintf_reftest.incl"
+    TESTCASE( remove( testfile ) == 0 );
     return TEST_RESULTS;
 }