-/* $Id$ */
-
/* vfprintf( FILE *, const char *, va_list )
This file is part of the Public Domain C Library (PDCLib).
#ifndef REGTEST
#include <_PDCLIB_io.h>
-int vfprintf_unlocked( FILE * _PDCLIB_restrict stream,
- const char * _PDCLIB_restrict format,
- va_list arg )
+static size_t filecb(void *p, const char *buf, size_t size)
{
- /* TODO: This function should interpret format as multibyte characters. */
- struct _PDCLIB_status_t status;
- status.base = 0;
- status.flags = 0;
- status.n = UINT_MAX;
- status.i = 0;
- status.current = 0;
- status.s = NULL;
- status.width = 0;
- status.prec = 0;
- status.stream = stream;
- va_copy( status.arg, arg );
+ return _PDCLIB_fwrite_unlocked( buf, 1, size, (FILE*) p );
+}
- while ( *format != '\0' )
- {
- const char * rc;
- if ( ( *format != '%' ) || ( ( rc = _PDCLIB_print( format, &status ) ) == format ) )
- {
- /* No conversion specifier, print verbatim */
- putc( *(format++), stream );
- status.i++;
- }
- else
- {
- /* Continue parsing after conversion specifier */
- format = rc;
- }
- }
- va_end( status.arg );
- return status.i;
+int _PDCLIB_vfprintf_unlocked( FILE * _PDCLIB_restrict stream,
+ const char * _PDCLIB_restrict format,
+ va_list arg )
+{
+ return _vcbprintf(stream, filecb, format, arg);
}
-int vfprintf( FILE * _PDCLIB_restrict stream,
- const char * _PDCLIB_restrict format,
+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;
}
#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, ... )