Reworked scanf() testing. General cleanups.

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

diff --git a/functions/stdio/snprintf.c b/functions/stdio/snprintf.c
index cf30e40ef12d7c4630be5d148f83fbbade245c89..6dd39671fdf33647fb4b5d97f9022c3dad547372 100644 (file)
--- a/functions/stdio/snprintf.c
+++ b/functions/stdio/snprintf.c
@@ -24,20 +24,17 @@ int snprintf( char * _PDCLIB_restrict s, size_t n, const char * _PDCLIB_restrict
 #endif
 
 #ifdef TEST
-#include <_PDCLIB_test.h>
-
-#include <string.h>
-#include <limits.h>
+#define _PDCLIB_FILEID "stdio/snprintf.c"
+#define _PDCLIB_STRINGIO
 
-#define testprintf( s, n, format, ... ) snprintf( s, n, format, __VA_ARGS__ )
+#include <_PDCLIB_test.h>
 
-#define TESTCASE_SPRINTF( x ) if ( strcmp( buffer, x ) == 0 ) {} \
-                              else { TEST_RESULTS += 1; printf( "FAILED: " __FILE__ ", line %d - \"%s\" != %s\n", __LINE__, buffer, #x ); }
+#define testprintf( s, format, ... ) snprintf( s, 100, format, __VA_ARGS__ )
 
 int main( void )
 {
-    char buffer[100];
-#include "printf_testcases.incl"
+    char target[100];
+#include "printf_testcases.h"
     return TEST_RESULTS;
 }