Reworked scanf() testing. General cleanups.

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

diff --git a/functions/stdio/vfprintf.c b/functions/stdio/vfprintf.c
index b5dacb465144555f63330eef9c6b83ea9af8b7ee..cc6e7a6e40388f9c65a187c3df3bea8e7e3dff8c 100644 (file)
--- a/functions/stdio/vfprintf.c
+++ b/functions/stdio/vfprintf.c
@@ -50,10 +50,8 @@ int vfprintf( struct _PDCLIB_file_t * _PDCLIB_restrict stream, const char * _PDC
 
 #ifdef TEST
 #define _PDCLIB_FILEID "stdio/vfprintf.c"
-#define FPRINTF_FUNCTION
-#include <stdlib.h>
-#include <limits.h>
-#include <string.h>
+#define _PDCLIB_FILEIO
+
 #include <_PDCLIB_test.h>
 
 static int testprintf( FILE * stream, const char * format, ... )
@@ -69,11 +67,9 @@ static int testprintf( FILE * stream, const char * format, ... )
 int main( void )
 {
     FILE * target;
-    TESTCASE( ( target = fopen( testfile, "wb+" ) ) != NULL );
-#include "printf_testcases.incl"
+    TESTCASE( ( target = tmpfile() ) != NULL );
+#include "printf_testcases.h"
     TESTCASE( fclose( target ) == 0 );
-#include "fprintf_reftest.incl"
-    TESTCASE( remove( testfile ) == 0 );
     return TEST_RESULTS;
 }