X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Fvsnprintf.c;h=4dbd7c27cfb03679a366558346ddb8d942b6bf8c;hb=b27eb82f920d13f337d36b251ae758f4b128cd9f;hp=96a151bb2ae3a53e48f5bbc963a8308e635f05f7;hpb=74e6932efc15635447ec943fc8d83fece825907c;p=pdclib.old

diff --git a/functions/stdio/vsnprintf.c b/functions/stdio/vsnprintf.c
index 96a151b..4dbd7c2 100644
--- a/functions/stdio/vsnprintf.c
+++ b/functions/stdio/vsnprintf.c
@@ -11,11 +11,22 @@
 
 #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 };
+    /* Members: base, flags, n, i, current, s, width, prec, stream, 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 );
+    // = { 0, 0, n, 0, 0, s, 0, 0, NULL };
     while ( *format != '\0' )
     {
         const char * rc;
@@ -31,6 +42,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 +325,4 @@ int main( void )
 }
 
 #endif
+