Reworked scanf() testing. General cleanups.

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

diff --git a/functions/stdio/sscanf.c b/functions/stdio/sscanf.c
index f379dcaf1cc40d77af71bd10daaae3518c50ce6e..dc343b863170646edaaa74ad7870cc7bd160f6f4 100644 (file)
--- a/functions/stdio/sscanf.c
+++ b/functions/stdio/sscanf.c
@@ -1,7 +1,5 @@
 /* $Id$ */
 
-/* Release $Name$ */
-
 /* sscanf( const char *, const char *, ... )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -15,20 +13,30 @@
 
 int sscanf( const char * _PDCLIB_restrict s, const char * _PDCLIB_restrict format, ... )
 {
+    int rc;
     va_list ap;
     va_start( ap, format );
-    return vsscanf( s, format, ap );
+    rc = vsscanf( s, format, ap );
+    va_end( ap );
+    return rc;
 }
 
 #endif
 
 #ifdef TEST
+#define _PDCLIB_FILEID "stdio/sscanf.c"
+#define _PDCLIB_STRINGIO
+
 #include <_PDCLIB_test.h>
 
-int main( void )
+#define testscanf( s, format, ... ) sscanf( s, format, __VA_ARGS__ )
+
+int main()
 {
-    TESTCASE( NO_TESTDRIVER );
+    char source[100];
+#include "scanf_testcases.h"
     return TEST_RESULTS;
 }
 
 #endif
+