Improved reporting by printf tests.

[pdclib] / functions / stdio / snprintf.c

diff --git a/functions/stdio/snprintf.c b/functions/stdio/snprintf.c
index efe1ba95a7c7f97e0219c362bec18e440fe81694..cf30e40ef12d7c4630be5d148f83fbbade245c89 100644 (file)
--- a/functions/stdio/snprintf.c
+++ b/functions/stdio/snprintf.c
@@ -1,7 +1,5 @@
 /* $Id$ */
 
-/* Release $Name$ */
-
 /* snprintf( char *, size_t, const char *, ... )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -15,9 +13,12 @@
 
 int snprintf( char * _PDCLIB_restrict s, size_t n, const char * _PDCLIB_restrict format, ...)
 {
+    int rc;
     va_list ap;
     va_start( ap, format );
-    return vsnprintf( s, n, format, ap );
+    rc = vsnprintf( s, n, format, ap );
+    va_end( ap );
+    return rc;
 }
 
 #endif
@@ -25,9 +26,18 @@ int snprintf( char * _PDCLIB_restrict s, size_t n, const char * _PDCLIB_restrict
 #ifdef TEST
 #include <_PDCLIB_test.h>
 
+#include <string.h>
+#include <limits.h>
+
+#define testprintf( s, n, format, ... ) snprintf( s, n, 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;
 }