X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Ffprintf.c;h=66566a4d5a6fb953e57a3a15df3defacec8b2daa;hb=b5b6c4a890795ea76f9b92b817b0a83c6bb4862c;hp=62bff89cc12c451ef9520db8f86d5c595cfb8892;hpb=33515db12d3cc5e53a8bdea58d2cde299cba2267;p=pdclib.old diff --git a/functions/stdio/fprintf.c b/functions/stdio/fprintf.c index 62bff89..66566a4 100644 --- a/functions/stdio/fprintf.c +++ b/functions/stdio/fprintf.c @@ -10,13 +10,28 @@ #include #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; } @@ -29,7 +44,7 @@ int fprintf( struct _PDCLIB_file_t * _PDCLIB_restrict stream, const char * _PDCL #include <_PDCLIB_test.h> -#define testprintf( stream, format, ... ) fprintf( stream, format, __VA_ARGS__ ) +#define testprintf( stream, ... ) fprintf( stream, __VA_ARGS__ ) int main( void ) {