Reworked scanf() testing. General cleanups.

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

diff --git a/functions/stdio/printf.c b/functions/stdio/printf.c
index 4933422cd6548f09369bbfbc37ccdc56d55c6140..23536dd84e145761f7c29360dd1b13e4c9f2404b 100644 (file)
--- a/functions/stdio/printf.c
+++ b/functions/stdio/printf.c
@@ -1,7 +1,5 @@
 /* $Id$ */
 
-/* Release $Name$ */
-
 /* printf( const char *, ... )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -15,19 +13,31 @@
 
 int printf( const char * _PDCLIB_restrict format, ... )
 {
+    int rc;
     va_list ap;
     va_start( ap, format );
-    return vfprintf( stdout, format, ap );
+    rc = vfprintf( stdout, format, ap );
+    va_end( ap );
+    return rc;
 }
 
 #endif
 
 #ifdef TEST
+#define _PDCLIB_FILEID "stdio/printf.c"
+#define _PDCLIB_FILEIO
+
 #include <_PDCLIB_test.h>
 
+#define testprintf( stream, format, ... ) printf( format, __VA_ARGS__ )
+
 int main( void )
 {
-    TESTCASE( NO_TESTDRIVER );
+    FILE * target;
+    TESTCASE( ( target = freopen( testfile, "wb+", stdout ) ) != NULL );
+#include "printf_testcases.h"
+    TESTCASE( fclose( target ) == 0 );
+    TESTCASE( remove( testfile ) == 0 );
     return TEST_RESULTS;
 }