Reworked scanf() testing. General cleanups.

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

diff --git a/functions/stdio/vprintf.c b/functions/stdio/vprintf.c
index 2be15c2ad402150b0cfae0fd54bc02b0436c3220..48ad5576e08f150705d40c12ab8e156ee2f0f2f1 100644 (file)
--- a/functions/stdio/vprintf.c
+++ b/functions/stdio/vprintf.c
@@ -19,11 +19,12 @@ 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, size_t n, const char * format, ... )
+static int testprintf( FILE * stream, const char * format, ... )
 {
     int i;
     va_list arg;
@@ -35,11 +36,10 @@ static int testprintf( FILE * stream, size_t n, const char * format, ... )
 
 int main( void )
 {
-    FILE * buffer;
-    TESTCASE( ( buffer = freopen( testfile, "wb", stdout ) ) != NULL );
-#include "printf_testcases.incl"
-    TESTCASE( fclose( buffer ) == 0 );
-#include "fprintf_reftest.incl"
+    FILE * target;
+    TESTCASE( ( target = freopen( testfile, "wb+", stdout ) ) != NULL );
+#include "printf_testcases.h"
+    TESTCASE( fclose( target ) == 0 );
     TESTCASE( remove( testfile ) == 0 );
     return TEST_RESULTS;
 }