Reworked scanf() testing. General cleanups.

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

diff --git a/functions/stdio/vscanf.c b/functions/stdio/vscanf.c
index d81d523536bcb321d187be2add9089f2dbd9f3fa..0b9189d69c9ab21f60e89ab3224e4c059304f01f 100644 (file)
--- a/functions/stdio/vscanf.c
+++ b/functions/stdio/vscanf.c
@@ -19,11 +19,28 @@ int vscanf( const char * _PDCLIB_restrict format, _PDCLIB_va_list arg )
 #endif
 
 #ifdef TEST
+#define _PDCLIB_FILEID "stdio/vscanf.c"
+#define _PDCLIB_FILEIO
+
 #include <_PDCLIB_test.h>
 
+static int testscanf( FILE * stream, const char * format, ... )
+{
+    int i;
+    va_list arg;
+    va_start( arg, format );
+    i = vscanf( format, arg );
+    va_end( arg );
+    return i;
+}
+
 int main( void )
 {
-    /* Simple wrapper to vfscanf(), no seperate testing. */
+    FILE * source;
+    TESTCASE( ( source = freopen( testfile, "wb+", stdin ) ) != NULL );
+#include "scanf_testcases.h"
+    TESTCASE( fclose( source ) == 0 );
+    TESTCASE( remove( testfile ) == 0 );
     return TEST_RESULTS;
 }