Reworked scanf() testing. General cleanups.

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

diff --git a/functions/stdio/fscanf.c b/functions/stdio/fscanf.c
index 39962573100444c39e1d3efeb1875043ddf46dcd..6c0c70b10e7ee2c1f7789666ac835c90a45ed24c 100644 (file)
--- a/functions/stdio/fscanf.c
+++ b/functions/stdio/fscanf.c
@@ -1,7 +1,5 @@
 /* $Id$ */
 
-/* Release $Name$ */
-
 /* fscanf( FILE *, const char *, ... )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -15,19 +13,30 @@
 
 int fscanf( FILE * _PDCLIB_restrict stream, const char * _PDCLIB_restrict format, ... )
 {
+    int rc;
     va_list ap;
     va_start( ap, format );
-    return vfscanf( stream, format, ap );
+    rc = vfscanf( stream, format, ap );
+    va_end( ap );
+    return rc;
 }
 
 #endif
 
 #ifdef TEST
+#define _PDCLIB_FILEID "stdio/fscanf.c"
+#define _PDCLIB_FILEIO
+
 #include <_PDCLIB_test.h>
 
+#define testscanf( stream, format, ... ) fscanf( stream, format, __VA_ARGS__ )
+
 int main( void )
 {
-    TESTCASE( NO_TESTDRIVER );
+    FILE * source;
+    TESTCASE( ( source = tmpfile() ) != NULL );
+#include "scanf_testcases.h"
+    TESTCASE( fclose( source ) == 0 );
     return TEST_RESULTS;
 }