X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Ffprintf.c;h=66566a4d5a6fb953e57a3a15df3defacec8b2daa;hb=b5b6c4a890795ea76f9b92b817b0a83c6bb4862c;hp=b7bd43a19ec7e8c748b9dc9b4f11ab4439ceb99b;hpb=1e97a50165e6addbf816932e58117cb31f54e1fb;p=pdclib.old

diff --git a/functions/stdio/fprintf.c b/functions/stdio/fprintf.c
index b7bd43a..66566a4 100644
--- a/functions/stdio/fprintf.c
+++ b/functions/stdio/fprintf.c
@@ -10,13 +10,28 @@
 #include <stdarg.h>
 
 #ifndef REGTEST
+#include <_PDCLIB_io.h>
 
-int fprintf( struct _PDCLIB_file_t * _PDCLIB_restrict stream, const char * _PDCLIB_restrict format, ... )
+int _PDCLIB_fprintf_unlocked( FILE * _PDCLIB_restrict stream, 
+                      const char * _PDCLIB_restrict format, ... )
 {
     int rc;
     va_list ap;
     va_start( ap, format );
-    rc = vfprintf( stream, format, ap );
+    rc = _PDCLIB_vfprintf_unlocked( stream, format, ap );
+    va_end( ap );
+    return rc;
+}
+
+int fprintf( FILE * _PDCLIB_restrict stream,
+             const char * _PDCLIB_restrict format, ... )
+{
+    int rc;
+    va_list ap;
+    va_start( ap, format );
+    _PDCLIB_flockfile( stream );
+    rc = _PDCLIB_vfprintf_unlocked( stream, format, ap );
+    _PDCLIB_funlockfile( stream );
     va_end( ap );
     return rc;
 }
@@ -25,23 +40,20 @@ int fprintf( struct _PDCLIB_file_t * _PDCLIB_restrict stream, const char * _PDCL
 
 #ifdef TEST
 #define _PDCLIB_FILEID "stdio/fprintf.c"
-#define FPRINTF_FUNCTION 1
+#define _PDCLIB_FILEIO
 
-#include <limits.h>
-#include <string.h>
 #include <_PDCLIB_test.h>
 
-#define testprintf( stream, format, ... ) fprintf( stream, format, __VA_ARGS__ )
+#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
+