X-Git-Url: https://pd.if.org/git/?p=pdclib;a=blobdiff_plain;f=functions%2Fstdio%2Ffprintf.c;h=13eaf6b7583d954e8e0c1b3c9336fcdcb10cd0dd;hp=db6a6a19607c9313eaed6d014207ae8aa353aa08;hb=da0f3f353d417fed71f358a48d5d5394145e460d;hpb=e72505f84aa8d8730e46d955a2722af361112e4f

diff --git a/functions/stdio/fprintf.c b/functions/stdio/fprintf.c
index db6a6a1..13eaf6b 100644
--- a/functions/stdio/fprintf.c
+++ b/functions/stdio/fprintf.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* fprintf( FILE *, const char *, ... )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -10,13 +8,28 @@
 #include <stdarg.h>
 
 #ifndef REGTEST
+#include "_PDCLIB_io.h"
+
+int _PDCLIB_fprintf_unlocked( FILE * _PDCLIB_restrict stream, 
+                      const char * _PDCLIB_restrict format, ... )
+{
+    int rc;
+    va_list ap;
+    va_start( ap, format );
+    rc = _PDCLIB_vfprintf_unlocked( stream, format, ap );
+    va_end( ap );
+    return rc;
+}
 
-int fprintf( struct _PDCLIB_file_t * _PDCLIB_restrict stream, const char * _PDCLIB_restrict format, ... )
+int fprintf( FILE * _PDCLIB_restrict stream,
+             const char * _PDCLIB_restrict format, ... )
 {
     int rc;
     va_list ap;
     va_start( ap, format );
-    rc = vfprintf( stream, format, ap );
+    _PDCLIB_flockfile( stream );
+    rc = _PDCLIB_vfprintf_unlocked( stream, format, ap );
+    _PDCLIB_funlockfile( stream );
     va_end( ap );
     return rc;
 }
@@ -24,23 +37,23 @@ int fprintf( struct _PDCLIB_file_t * _PDCLIB_restrict stream, const char * _PDCL
 #endif
 
 #ifdef TEST
-#include <limits.h>
-#include <string.h>
-#include <_PDCLIB_test.h>
+#include <stdint.h>
+#include <stddef.h>
+#define _PDCLIB_FILEID "stdio/fprintf.c"
+#define _PDCLIB_FILEIO
 
-#define testprintf( stream, format, ... ) fprintf( stream, format, __VA_ARGS__ )
+#include "_PDCLIB_test.h"
 
-#define TESTCASE_SPRINTF( x )
+#define testprintf( stream, ... ) fprintf( stream, __VA_ARGS__ )
 
 int main( void )
 {
     FILE * target;
-    TESTCASE( ( target = fopen( "testing/testfile", "wb" ) ) != NULL );
-#include "printf_testcases.incl"
+    TESTCASE( ( target = tmpfile() ) != NULL );
+#include "printf_testcases.h"
     TESTCASE( fclose( target ) == 0 );
-#include "fprintf_reftest.incl"
-    TESTCASE( remove( "testing/testfile" ) == 0 );
     return TEST_RESULTS;
 }
 
 #endif
+