Reworked scanf() testing. General cleanups.

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

diff --git a/functions/stdio/vsprintf.c b/functions/stdio/vsprintf.c
index 733dcd452807f882d56b14af88dd7669a26ac1df..3dfe3c208505fefd5a99bfe8031d10bc92870efe 100644 (file)
--- a/functions/stdio/vsprintf.c
+++ b/functions/stdio/vsprintf.c
@@ -20,13 +20,12 @@ int vsprintf( char * _PDCLIB_restrict s, const char * _PDCLIB_restrict format, v
 #endif
 
 #ifdef TEST
-#include <_PDCLIB_test.h>
+#define _PDCLIB_FILEID "stdio/vsprintf.c"
+#define _PDCLIB_STRINGIO
 
-#include <limits.h>
-#include <stdint.h>
-#include <string.h>
+#include <_PDCLIB_test.h>
 
-static int testprintf( char * s, size_t n, const char * format, ... )
+static int testprintf( char * s, const char * format, ... )
 {
     int i;
     va_list arg;
@@ -36,12 +35,10 @@ static int testprintf( char * s, size_t n, const char * format, ... )
     return i;
 }
 
-#define TESTCASE_SPRINTF( x ) TESTCASE( x )
-
 int main( void )
 {
-    char buffer[100];
-#include "printf_testcases.incl"
+    char target[100];
+#include "printf_testcases.h"
     return TEST_RESULTS;
 }