Improved reporting by printf tests.

[pdclib] / functions / stdio / sprintf.c

diff --git a/functions/stdio/sprintf.c b/functions/stdio/sprintf.c
index d85b205cad73513dc42f657f47b8d636e77ee7dd..9b0ac81e35a969a7c2ac0e64054b0fb4ba1abdb9 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,9 +14,12 @@
 
 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
@@ -26,9 +27,18 @@ int sprintf( char * _PDCLIB_restrict s, const char * _PDCLIB_restrict format, ..
 #ifdef TEST
 #include <_PDCLIB_test.h>
 
+#include <string.h>
+#include <limits.h>
+
+#define testprintf( s, n, format, ... ) sprintf( s, format, __VA_ARGS__ )
+
+#define TESTCASE_SPRINTF( x ) if ( strcmp( buffer, x ) == 0 ) {} \
+                              else { TEST_RESULTS += 1; printf( "FAILED: " __FILE__ ", line %d - \"%s\" != %s\n", __LINE__, buffer, #x ); }
+
 int main( void )
 {
-    TESTCASE( NO_TESTDRIVER );
+    char buffer[100];
+#include "printf_testcases.incl"
     return TEST_RESULTS;
 }