#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 };
+ /* base, flags, n, i, current, s, width, prec, stream, arg */
+ struct _PDCLIB_status_t status = { 0, 0, n, 0, 0, s, 0, 0, NULL, NULL };
+ va_copy( status.arg, arg );
+
while ( *format != '\0' )
{
const char * rc;
}
}
s[ status.i ] = '\0';
+ va_end( status.arg );
return status.i;
}
static int testprintf( char * s, size_t n, const char * format, ... )
{
- int rc;
+ int i;
va_list arg;
va_start( arg, format );
- rc = vsnprintf( s, n, format, arg );
+ i = vsnprintf( s, n, format, arg );
va_end( arg );
- return rc;
+ return i;
}
int main( void )
TESTCASE( strcmp( buffer, "x" ) == 0 );
TESTCASE( testprintf( buffer, 100, "%s", "abcdef" ) == 6 );
TESTCASE( strcmp( buffer, "abcdef" ) == 0 );
- TESTCASE( testprintf( buffer, 100, "%p", 0xdeadbeef ) == 10 );
+ TESTCASE( testprintf( buffer, 100, "%p", (void *)0xdeadbeef ) == 10 );
TESTCASE( strcmp( buffer, "0xdeadbeef" ) == 0 );
{
int val1, val2;
}
#endif
+