Reworked scanf() testing. General cleanups.

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

diff --git a/functions/stdio/vsprintf.c b/functions/stdio/vsprintf.c
index fc06a20410b17a897318712d9524906f8a8221e3..3dfe3c208505fefd5a99bfe8031d10bc92870efe 100644 (file)
--- a/functions/stdio/vsprintf.c
+++ b/functions/stdio/vsprintf.c
@@ -1,7 +1,5 @@
 /* $Id$ */
 
-/* Release $Name$ */
-
 /* vsprintf( char *, const char *, va_list ap )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -14,19 +12,33 @@
 
 #ifndef REGTEST
 
-int vsprintf( char * str, const char * format, _PDCLIB_va_list arg )
+int vsprintf( char * _PDCLIB_restrict s, const char * _PDCLIB_restrict format, va_list arg )
 {
-    return vsnprintf( str, SIZE_MAX, format, arg );
+    return vsnprintf( s, SIZE_MAX, format, arg ); /* TODO: Replace with a non-checking call */
 }
 
 #endif
 
 #ifdef TEST
+#define _PDCLIB_FILEID "stdio/vsprintf.c"
+#define _PDCLIB_STRINGIO
+
 #include <_PDCLIB_test.h>
 
+static int testprintf( char * s, const char * format, ... )
+{
+    int i;
+    va_list arg;
+    va_start( arg, format );
+    i = vsprintf( s, format, arg );
+    va_end( arg );
+    return i;
+}
+
 int main( void )
 {
-    TESTCASE( NO_TESTDRIVER );
+    char target[100];
+#include "printf_testcases.h"
     return TEST_RESULTS;
 }