Reworked scanf() testing. General cleanups.

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

diff --git a/functions/stdio/fprintf.c b/functions/stdio/fprintf.c
index a7cef0bf4446df308ee039c6af9cd76b6b4debbe..62bff89cc12c451ef9520db8f86d5c595cfb8892 100644 (file)
--- a/functions/stdio/fprintf.c
+++ b/functions/stdio/fprintf.c
@@ -24,23 +24,21 @@ int fprintf( struct _PDCLIB_file_t * _PDCLIB_restrict stream, const char * _PDCL
 #endif
 
 #ifdef TEST
-#include <limits.h>
-#include <string.h>
-#include <_PDCLIB_test.h>
+#define _PDCLIB_FILEID "stdio/fprintf.c"
+#define _PDCLIB_FILEIO
 
-#define testprintf( stream, n, format, ... ) fprintf( stream, format, __VA_ARGS__ )
+#include <_PDCLIB_test.h>
 
-#define TESTCASE_SPRINTF( x )
+#define testprintf( stream, format, ... ) fprintf( stream, format, __VA_ARGS__ )
 
 int main( void )
 {
-    FILE * buffer;
-    TESTCASE( ( buffer = fopen( "testing/testfile", "wb" ) ) != NULL );
-#include "printf_testcases.incl"
-    TESTCASE( fclose( buffer ) == 0 );
-#include "fprintf_reftest.incl"
-    TESTCASE( remove( "testing/testfile" ) == 0 );
+    FILE * target;
+    TESTCASE( ( target = tmpfile() ) != NULL );
+#include "printf_testcases.h"
+    TESTCASE( fclose( target ) == 0 );
     return TEST_RESULTS;
 }
 
 #endif
+