Reworked scanf() testing. General cleanups.

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

diff --git a/functions/stdio/snprintf.c b/functions/stdio/snprintf.c
index 3a6e706f8ebeb1e1b8e59009f243347acd82c357..6dd39671fdf33647fb4b5d97f9022c3dad547372 100644 (file)
--- a/functions/stdio/snprintf.c
+++ b/functions/stdio/snprintf.c
@@ -13,19 +13,28 @@
 
 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
 
 #ifdef TEST
+#define _PDCLIB_FILEID "stdio/snprintf.c"
+#define _PDCLIB_STRINGIO
+
 #include <_PDCLIB_test.h>
 
+#define testprintf( s, format, ... ) snprintf( s, 100, format, __VA_ARGS__ )
+
 int main( void )
 {
-    TESTCASE( NO_TESTDRIVER );
+    char target[100];
+#include "printf_testcases.h"
     return TEST_RESULTS;
 }