X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Fvsprintf.c;h=410e485c86b3b6f88146db74055089e782530069;hb=e1c526e9bad3f6e69391e94059096145390508d3;hp=d3920fa5884e754ebbf49fb5721ad70e42d4fb12;hpb=07810dbd8f3e21618208b923e293715774c80ade;p=pdclib

diff --git a/functions/stdio/vsprintf.c b/functions/stdio/vsprintf.c
index d3920fa..410e485 100644
--- a/functions/stdio/vsprintf.c
+++ b/functions/stdio/vsprintf.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* vsprintf( char *, const char *, va_list ap )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -12,7 +10,9 @@
 
 #ifndef REGTEST
 
-int vsprintf( char * _PDCLIB_restrict s, const char * _PDCLIB_restrict format, va_list arg )
+int vsprintf( char * _PDCLIB_restrict s, 
+              const char * _PDCLIB_restrict format, 
+              va_list arg )
 {
     return vsnprintf( s, SIZE_MAX, format, arg ); /* TODO: Replace with a non-checking call */
 }
@@ -20,13 +20,13 @@ int vsprintf( char * _PDCLIB_restrict s, const char * _PDCLIB_restrict format, v
 #endif
 
 #ifdef TEST
-#include <_PDCLIB_test.h>
-
-#include <limits.h>
+#define _PDCLIB_FILEID "stdio/vsprintf.c"
+#define _PDCLIB_STRINGIO
 #include <stdint.h>
-#include <string.h>
+#include <stddef.h>
+#include <_PDCLIB_test.h>
 
-static int testprintf( char * s, size_t n, const char * format, ... )
+static int testprintf( char * s, const char * format, ... )
 {
     int i;
     va_list arg;
@@ -36,13 +36,10 @@ static int testprintf( char * s, size_t n, const char * format, ... )
     return i;
 }
 
-#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 )
 {
-    char buffer[100];
-#include "printf_testcases.incl"
+    char target[100];
+#include "printf_testcases.h"
     return TEST_RESULTS;
 }