Reworked scanf() testing. General cleanups.

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

diff --git a/functions/stdio/fprintf.c b/functions/stdio/fprintf.c
index 5dfec4d10a069d03d12234ff2ac7567e570d873b..62bff89cc12c451ef9520db8f86d5c595cfb8892 100644 (file)
--- a/functions/stdio/fprintf.c
+++ b/functions/stdio/fprintf.c
@@ -1,7 +1,5 @@
 /* $Id$ */
 
-/* Release $Name$ */
-
 /* fprintf( FILE *, const char *, ... )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -13,22 +11,34 @@
 
 #ifndef REGTEST
 
-int fprintf( FILE * _PDCLIB_restrict stream, const char * _PDCLIB_restrict format, ... )
+int fprintf( struct _PDCLIB_file_t * _PDCLIB_restrict stream, const char * _PDCLIB_restrict format, ... )
 {
+    int rc;
     va_list ap;
     va_start( ap, format );
-    return vfprintf( stream, format, ap );
+    rc = vfprintf( stream, format, ap );
+    va_end( ap );
+    return rc;
 }
 
 #endif
 
 #ifdef TEST
+#define _PDCLIB_FILEID "stdio/fprintf.c"
+#define _PDCLIB_FILEIO
+
 #include <_PDCLIB_test.h>
 
+#define testprintf( stream, format, ... ) fprintf( stream, format, __VA_ARGS__ )
+
 int main( void )
 {
-    TESTCASE( NO_TESTDRIVER );
+    FILE * target;
+    TESTCASE( ( target = tmpfile() ) != NULL );
+#include "printf_testcases.h"
+    TESTCASE( fclose( target ) == 0 );
     return TEST_RESULTS;
 }
 
 #endif
+