PDCLIB-20 #resolve Add support for "unusual" cases. Ammend test suite to verify support.

[pdclib] / functions / stdio / vfprintf.c

diff --git a/functions/stdio/vfprintf.c b/functions/stdio/vfprintf.c
index f9562d2e137d04e37ca3fe384334f1d87674f369..7dd7f2dfe1e6b4855c99b2217e063fce91ebf1da 100644 (file)
--- a/functions/stdio/vfprintf.c
+++ b/functions/stdio/vfprintf.c
@@ -14,7 +14,7 @@
 #ifndef REGTEST
 #include <_PDCLIB_io.h>
 
-int vfprintf_unlocked( FILE * _PDCLIB_restrict stream, 
+int _PDCLIB_vfprintf_unlocked( FILE * _PDCLIB_restrict stream, 
                        const char * _PDCLIB_restrict format, 
                        va_list arg )
 {
@@ -37,7 +37,7 @@ int vfprintf_unlocked( FILE * _PDCLIB_restrict stream,
         if ( ( *format != '%' ) || ( ( rc = _PDCLIB_print( format, &status ) ) == format ) )
         {
             /* No conversion specifier, print verbatim */
-            putc( *(format++), stream );
+            _PDCLIB_putc_unlocked( *(format++), stream );
             status.i++;
         }
         else
@@ -54,9 +54,9 @@ int vfprintf( FILE * _PDCLIB_restrict stream,
               const char * _PDCLIB_restrict format, 
               va_list arg )
 {
-    flockfile( stream );
-    int r = vfprintf_unlocked( stream, format, arg );
-    funlockfile( stream );
+    _PDCLIB_flockfile( stream );
+    int r = _PDCLIB_vfprintf_unlocked( stream, format, arg );
+    _PDCLIB_funlockfile( stream );
     return r;
 }
 
@@ -65,7 +65,7 @@ int vfprintf( FILE * _PDCLIB_restrict stream,
 #ifdef TEST
 #define _PDCLIB_FILEID "stdio/vfprintf.c"
 #define _PDCLIB_FILEIO
-
+#include <stddef.h>
 #include <_PDCLIB_test.h>
 
 static int testprintf( FILE * stream, const char * format, ... )