Reworked scanf() testing. General cleanups.

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

diff --git a/functions/stdio/vsscanf.c b/functions/stdio/vsscanf.c
index be9bf61ae16ba5c699e718fc2d5285fa708c17b8..4300a3eb4d9b10720cd5c702f95fed28e8702911 100644 (file)
--- a/functions/stdio/vsscanf.c
+++ b/functions/stdio/vsscanf.c
@@ -86,11 +86,12 @@ int vsscanf( const char * _PDCLIB_restrict s, const char * _PDCLIB_restrict form
 #endif
 
 #ifdef TEST
-#include <_PDCLIB_test.h>
+#define _PDCLIB_FILEID "stdio/vsscanf.c"
+#define _PDCLIB_STRINGIO
 
-#include "scan_test.h"
+#include <_PDCLIB_test.h>
 
-static int SCANFUNC( char const * stream, char const * format, ... )
+static int testscanf( char const * stream, char const * format, ... )
 {
     va_list ap;
     va_start( ap, format );
@@ -101,8 +102,8 @@ static int SCANFUNC( char const * stream, char const * format, ... )
 
 int main( void )
 {
-#include "sscan_sources.incl"
-#include "scanf_testcases.incl"
+    char source[100];
+#include "scanf_testcases.h"
     return TEST_RESULTS;
 }