X-Git-Url: https://pd.if.org/git/?p=pdclib;a=blobdiff_plain;f=functions%2Fstdio%2Fvsprintf.c;h=21aa2da1e5867f5e5a62e693f4eca604fec78e66;hp=803485e48032528cb390dcf899469d202de17185;hb=da0f3f353d417fed71f358a48d5d5394145e460d;hpb=e72505f84aa8d8730e46d955a2722af361112e4f

diff --git a/functions/stdio/vsprintf.c b/functions/stdio/vsprintf.c
index 803485e..21aa2da 100644
--- a/functions/stdio/vsprintf.c
+++ b/functions/stdio/vsprintf.c
@@ -1,6 +1,4 @@
-/* $Id$ */
-
-/* vsprintf( char *, const char *, va_list ap )
+/* vsprintf( char *, const char *, va_list )
 
    This file is part of the Public Domain C Library (PDCLib).
    Permission is granted to use, modify, and / or redistribute at will.
@@ -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,11 +20,11 @@ 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, const char * format, ... )
 {
@@ -36,13 +36,10 @@ static int testprintf( char * s, const char * format, ... )
     return i;
 }
 
-#define TESTCASE_SPRINTF( x ) if ( strcmp( target, x ) == 0 ) {} \
-                              else { TEST_RESULTS += 1; printf( "FAILED: " __FILE__ ", line %d - \"%s\" != %s\n", __LINE__, target, #x ); }
-
 int main( void )
 {
     char target[100];
-#include "printf_testcases.incl"
+#include "printf_testcases.h"
     return TEST_RESULTS;
 }