Reworked scanf() testing. General cleanups.

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

diff --git a/functions/stdio/sprintf.c b/functions/stdio/sprintf.c
index d85b205cad73513dc42f657f47b8d636e77ee7dd..887c6fcfa610f86c4f749fc51c63b131503fc83a 100644 (file)
--- a/functions/stdio/sprintf.c
+++ b/functions/stdio/sprintf.c
@@ -1,7 +1,5 @@
 /* $Id$ */
 
-/* Release $Name$ */
-
 /* sprintf( char *, const char *, ... )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -16,19 +14,28 @@
 
 int sprintf( char * _PDCLIB_restrict s, const char * _PDCLIB_restrict format, ...)
 {
+    int rc;
     va_list ap;
     va_start( ap, format );
-    return vsnprintf( s, SIZE_MAX, format, ap );
+    rc = vsnprintf( s, SIZE_MAX, format, ap ); /* TODO: replace with non-checking call */
+    va_end( ap );
+    return rc;
 }
 
 #endif
 
 #ifdef TEST
+#define _PDCLIB_FILEID "stdio/sprintf.c"
+#define _PDCLIB_STRINGIO
+
 #include <_PDCLIB_test.h>
 
+#define testprintf( s, format, ... ) sprintf( s, format, __VA_ARGS__ )
+
 int main( void )
 {
-    TESTCASE( NO_TESTDRIVER );
+    char target[100];
+#include "printf_testcases.h"
     return TEST_RESULTS;
 }