X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Fvfprintf.c;h=0468fa1d1bf5ba0694d2694bf6720a905e8d046a;hb=d6f1494a4f38a212b29a13ee713885058dcf0fe7;hp=9a9a9503ce099eb5a5ac6f4ef000c4d7effc54b6;hpb=f603f88b4456cf9b7ab1328bf657ede22a0c9940;p=pdclib

diff --git a/functions/stdio/vfprintf.c b/functions/stdio/vfprintf.c
index 9a9a950..0468fa1 100644
--- a/functions/stdio/vfprintf.c
+++ b/functions/stdio/vfprintf.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* vfprintf( FILE *, const char *, va_list )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -15,8 +13,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;
@@ -32,14 +40,17 @@ 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 <_PDCLIB_test.h>
+#define _PDCLIB_FILEID "stdio/vfprintf.c"
+#define _PDCLIB_FILEIO
+
+#include "_PDCLIB_test.h"
 
 static int testprintf( FILE * stream, const char * format, ... )
 {
@@ -53,11 +64,10 @@ static int testprintf( FILE * stream, const char * format, ... )
 
 int main( void )
 {
-    FILE * fh;
-    TESTCASE( ( fh = fopen( "testfile", "w" ) ) != NULL );
-    TESTCASE( testprintf( fh, "Hallo\n" ) == 6 );
-    TESTCASE( fclose( fh ) == 0 );
-    /* FIXME: Testfile doesn't exist... */
+    FILE * target;
+    TESTCASE( ( target = tmpfile() ) != NULL );
+#include "printf_testcases.h"
+    TESTCASE( fclose( target ) == 0 );
     return TEST_RESULTS;
 }