X-Git-Url: https://pd.if.org/git/?p=pdclib;a=blobdiff_plain;f=functions%2Fstdio%2Fvprintf.c;h=151c75e43ae2ff60ab36172ae4c808a25454d85b;hp=4af2f385ebb52d7890aed185893df372b2298cf0;hb=da0f3f353d417fed71f358a48d5d5394145e460d;hpb=a0746ea9f2660205d2c885e34c515184442ddab1

diff --git a/functions/stdio/vprintf.c b/functions/stdio/vprintf.c
index 4af2f38..151c75e 100644
--- a/functions/stdio/vprintf.c
+++ b/functions/stdio/vprintf.c
@@ -1,6 +1,4 @@
-/* $Id$ */
-
-/* vprintf( const char *, va_list arg )
+/* vprintf( 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.
@@ -10,6 +8,13 @@
 #include <stdarg.h>
 
 #ifndef REGTEST
+#include "_PDCLIB_io.h"
+
+int _PDCLIB_vprintf_unlocked( const char * _PDCLIB_restrict format, 
+                              _PDCLIB_va_list arg )
+{
+    return _PDCLIB_vfprintf_unlocked( stdout, format, arg );
+}
 
 int vprintf( const char * _PDCLIB_restrict format, _PDCLIB_va_list arg )
 {
@@ -19,11 +24,13 @@ int vprintf( const char * _PDCLIB_restrict format, _PDCLIB_va_list arg )
 #endif
 
 #ifdef TEST
-#include <limits.h>
-#include <string.h>
-#include <_PDCLIB_test.h>
+#define _PDCLIB_FILEID "stdio/vprintf.c"
+#define _PDCLIB_FILEIO
+#include <stdint.h>
+#include <stddef.h>
+#include "_PDCLIB_test.h"
 
-static int testprintf( FILE * stream, size_t n, const char * format, ... )
+static int testprintf( FILE * stream, const char * format, ... )
 {
     int i;
     va_list arg;
@@ -35,16 +42,11 @@ static int testprintf( FILE * stream, size_t n, const char * format, ... )
 
 int main( void )
 {
-    FILE * buffer;
-    TESTCASE( ( buffer = freopen( "testfile", "wb", stdout ) ) != NULL );
-#include "printf_testcases.incl"
-    TESTCASE( fclose( buffer ) == 0 );
-    char readbuffer[1000];
-    TESTCASE( ( buffer = fopen( "testfile", "rb" ) ) != NULL );
-    TESTCASE( fread( readbuffer, 1, 1000, buffer ) == 985 );
-    TESTCASE( fclose( buffer ) == 0 );
-    TESTCASE( remove( "testfile" ) == 0 );
-    TESTCASE( memcmp( readbuffer, "-1281270-32768327670-214748364821474836470-214748364821474836470-922337203685477580892233720368547758070255255655356553542949672954294967295429496729542949672951844674407370955161518446744073709551615FFFFFFFF0XFFFFFFFFffffffff0xffffffff37777777777037777777777%.0#o-2147483648+2147483647+042949672954294967295-2147483648 2147483647 042949672954294967295-21474836482147483647-21474836482147483647-2147483648 2147483647 -2147483648  2147483647-21474836482147483647-21474836482147483647-21474836482147483647 -2147483648 2147483647  -21474836482147483647-21474836482147483647-214748364802147483647-02147483648002147483647-21474836482147483647-21474836482147483647-21474836482147483647 -2147483648 2147483647            00000000002147483647ffffffff0xffffffff0xffffffff-2147483648-2147483648-21474836480xffffffff0xffffffff0xffffffff214748364721474836472147483647+2147483647+2147483647+2147483647+2147483647+2147483647+2147483647- 2147483647- 2147483647 % -2147483648xabcdef0xdeadbeef123456789", 985 ) == 0 );
+    FILE * target;
+    TESTCASE( ( target = freopen( testfile, "wb+", stdout ) ) != NULL );
+#include "printf_testcases.h"
+    TESTCASE( fclose( target ) == 0 );
+    TESTCASE( remove( testfile ) == 0 );
     return TEST_RESULTS;
 }