X-Git-Url: https://pd.if.org/git/?p=pdclib;a=blobdiff_plain;f=functions%2Fstdio%2Fvsnprintf.c;h=c2be5f9bbe9077d2ba9a461be0892b6e8cb03853;hp=96a151bb2ae3a53e48f5bbc963a8308e635f05f7;hb=3c60673fd7479218b6f8069b848a1f5c2bd10114;hpb=014988e9a303f1617be511468d70a235a2826362 diff --git a/functions/stdio/vsnprintf.c b/functions/stdio/vsnprintf.c index 96a151b..c2be5f9 100644 --- a/functions/stdio/vsnprintf.c +++ b/functions/stdio/vsnprintf.c @@ -11,11 +11,21 @@ #ifndef REGTEST -int vsnprintf( char * s, size_t n, const char * format, _PDCLIB_va_list arg ) +int vsnprintf( char * _PDCLIB_restrict s, size_t n, const char * _PDCLIB_restrict format, _PDCLIB_va_list arg ) { /* TODO: This function should interpret format as multibyte characters. */ - /* Members: base, flags, n, i, this, s, width, prec, stream, arg */ - struct _PDCLIB_status_t status = { 0, 0, n, 0, 0, s, 0, 0, NULL, arg }; + struct _PDCLIB_status_t status; + status.base = 0; + status.flags = 0; + status.n = n; + status.i = 0; + status.current = 0; + status.s = s; + status.width = 0; + status.prec = 0; + status.stream = NULL; + va_copy( status.arg, arg ); + while ( *format != '\0' ) { const char * rc; @@ -31,6 +41,7 @@ int vsnprintf( char * s, size_t n, const char * format, _PDCLIB_va_list arg ) } } s[ status.i ] = '\0'; + va_end( status.arg ); return status.i; } @@ -313,3 +324,4 @@ int main( void ) } #endif +