X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Fvsnprintf.c;h=9768c0a02504d45b9cf74a45b3ce51a8771c8d98;hb=07810dbd8f3e21618208b923e293715774c80ade;hp=84ad51dc462d41a7e14c4b4a747a3ec076e1d2dc;hpb=46983693f019c28a1c2420e9e7dfc204916af411;p=pdclib

diff --git a/functions/stdio/vsnprintf.c b/functions/stdio/vsnprintf.c
index 84ad51d..9768c0a 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;
 }
 
@@ -39,10 +50,29 @@ int vsnprintf( char * s, size_t n, const char * format, _PDCLIB_va_list arg )
 #ifdef TEST
 #include <_PDCLIB_test.h>
 
+#include <limits.h>
+#include <stdint.h>
+#include <string.h>
+
+static int testprintf( char * s, size_t n, const char * format, ... )
+{
+    int i;
+    va_list arg;
+    va_start( arg, format );
+    i = vsnprintf( s, n, format, arg );
+    va_end( arg );
+    return i;
+}
+
+#define TESTCASE_SPRINTF( x ) if ( strcmp( buffer, x ) == 0 ) {} \
+                              else { TEST_RESULTS += 1; printf( "FAILED: " __FILE__ ", line %d - \"%s\" != %s\n", __LINE__, buffer, #x ); }
+
 int main( void )
 {
-    TESTCASE( NO_TESTDRIVER );
+    char buffer[100];
+#include "printf_testcases.incl"
     return TEST_RESULTS;
 }
 
 #endif
+