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

diff --git a/functions/stdio/fprintf.c b/functions/stdio/fprintf.c
index 31e3f57..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;
 }
@@ -24,20 +39,21 @@ int fprintf( struct _PDCLIB_file_t * _PDCLIB_restrict stream, const char * _PDCL
 #endif
 
 #ifdef TEST
-#include <limits.h>
-#include <string.h>
+#define _PDCLIB_FILEID "stdio/fprintf.c"
+#define _PDCLIB_FILEIO
+
 #include <_PDCLIB_test.h>
 
-#define testprintf( stream, n, format, ... ) fprintf( stream, format, __VA_ARGS__ )
+#define testprintf( stream, ... ) fprintf( stream, __VA_ARGS__ )
 
 int main( void )
 {
-    FILE * buffer;
-    TESTCASE( ( buffer = fopen( "testfile", "wb" ) ) != NULL );
-#include "printf_testcases.incl"
-    TESTCASE( fclose( buffer ) == 0 );
-#include "fprintf_reftest.incl"
+    FILE * target;
+    TESTCASE( ( target = tmpfile() ) != NULL );
+#include "printf_testcases.h"
+    TESTCASE( fclose( target ) == 0 );
     return TEST_RESULTS;
 }
 
 #endif
+