X-Git-Url: https://pd.if.org/git/?p=pdclib;a=blobdiff_plain;f=functions%2Fstdio%2Fprintf.c;h=8e31dcdcfd3d04c6f9df36290a341f831a725abb;hp=ef99d2cb76937fa0feda747589ace2904f06d836;hb=da0f3f353d417fed71f358a48d5d5394145e460d;hpb=92177644f19b596c593293cb20c4f6677186f3b6

diff --git a/functions/stdio/printf.c b/functions/stdio/printf.c
index ef99d2c..8e31dcd 100644
--- a/functions/stdio/printf.c
+++ b/functions/stdio/printf.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* printf( const char *, ... )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -10,6 +8,7 @@
 #include <stdarg.h>
 
 #ifndef REGTEST
+#include "_PDCLIB_io.h"
 
 int printf( const char * _PDCLIB_restrict format, ... )
 {
@@ -21,24 +20,34 @@ int printf( const char * _PDCLIB_restrict format, ... )
     return rc;
 }
 
+int _PDCLIB_printf_unlocked( const char * _PDCLIB_restrict format, ... )
+{
+    int rc;
+    va_list ap;
+    va_start( ap, format );
+    rc = _PDCLIB_vfprintf_unlocked( stdout, format, ap );
+    va_end( ap );
+    return rc;
+}
+
 #endif
 
 #ifdef TEST
-#include <limits.h>
-#include <string.h>
-#include <_PDCLIB_test.h>
+#define _PDCLIB_FILEID "stdio/printf.c"
+#define _PDCLIB_FILEIO
+#include <stdint.h>
+#include <stddef.h>
 
-#define testprintf( stream, n, format, ... ) printf( format, __VA_ARGS__ )
+#include "_PDCLIB_test.h"
 
-#define TESTCASE_SPRINTF( x )
+#define testprintf( stream, ... ) printf( __VA_ARGS__ )
 
 int main( void )
 {
-    FILE * buffer;
-    TESTCASE( ( buffer = freopen( testfile, "wb", stdout ) ) != NULL );
-#include "printf_testcases.incl"
-    TESTCASE( fclose( buffer ) == 0 );
-#include "fprintf_reftest.incl"
+    FILE * target;
+    TESTCASE( ( target = freopen( testfile, "wb+", stdout ) ) != NULL );
+#include "printf_testcases.h"
+    TESTCASE( fclose( target ) == 0 );
     TESTCASE( remove( testfile ) == 0 );
     return TEST_RESULTS;
 }