Reworked scanf() testing. General cleanups.

[pdclib] / functions / stdio / vprintf.c

diff --git a/functions/stdio/vprintf.c b/functions/stdio/vprintf.c
index 904f791e45e23aae0f0e38c9bb59a6e2d52da7c5..48ad5576e08f150705d40c12ab8e156ee2f0f2f1 100644 (file)
--- a/functions/stdio/vprintf.c
+++ b/functions/stdio/vprintf.c
@@ -19,8 +19,9 @@ int vprintf( const char * _PDCLIB_restrict format, _PDCLIB_va_list arg )
 #endif
 
 #ifdef TEST
-#include <limits.h>
-#include <string.h>
+#define _PDCLIB_FILEID "stdio/vprintf.c"
+#define _PDCLIB_FILEIO
+
 #include <_PDCLIB_test.h>
 
 static int testprintf( FILE * stream, const char * format, ... )
@@ -33,15 +34,12 @@ static int testprintf( FILE * stream, const char * format, ... )
     return i;
 }
 
-#define TESTCASE_SPRINTF( x )
-
 int main( void )
 {
     FILE * target;
-    TESTCASE( ( target = freopen( testfile, "wb", stdout ) ) != NULL );
-#include "printf_testcases.incl"
+    TESTCASE( ( target = freopen( testfile, "wb+", stdout ) ) != NULL );
+#include "printf_testcases.h"
     TESTCASE( fclose( target ) == 0 );
-#include "fprintf_reftest.incl"
     TESTCASE( remove( testfile ) == 0 );
     return TEST_RESULTS;
 }