Further streamlined testing.

[fw/pdclib] / functions / stdio / vsprintf.c

diff --git a/functions/stdio/vsprintf.c b/functions/stdio/vsprintf.c
index e17f6ffda1e9ac82a9048ca20aab65f1fe0e7537..733dcd452807f882d56b14af88dd7669a26ac1df 100644 (file)
--- a/functions/stdio/vsprintf.c
+++ b/functions/stdio/vsprintf.c
@@ -1,21 +1,48 @@
-/* ----------------------------------------------------------------------------
- * $Id$
- * ----------------------------------------------------------------------------
- * Public Domain C Library - http://pdclib.sourceforge.net
- * This code is Public Domain. Use, modify, and redistribute at will.
- * --------------------------------------------------------------------------*/
+/* $Id$ */
 
-int vsprintf( char * restrict s, const char * restrict format, va_list ap) { /* TODO */ };
+/* vsprintf( char *, const char *, va_list ap )
 
-/* PDPC code - unreviewed
+   This file is part of the Public Domain C Library (PDCLib).
+   Permission is granted to use, modify, and / or redistribute at will.
+*/
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stdarg.h>
+
+#ifndef REGTEST
+
+int vsprintf( char * _PDCLIB_restrict s, const char * _PDCLIB_restrict format, va_list arg )
 {
-    int ret;
-
-    ret = vvprintf(format, arg, NULL, s);
-    if (ret >= 0)
-    {
-        *(s + ret) = '\0';
-    }
-    return (ret);
+    return vsnprintf( s, SIZE_MAX, format, arg ); /* TODO: Replace with a non-checking call */
 }
-*/
+
+#endif
+
+#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 = vsprintf( s, format, arg );
+    va_end( arg );
+    return i;
+}
+
+#define TESTCASE_SPRINTF( x ) TESTCASE( x )
+
+int main( void )
+{
+    char buffer[100];
+#include "printf_testcases.incl"
+    return TEST_RESULTS;
+}
+
+#endif