Reworked scanf() testing. General cleanups.

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

diff --git a/functions/stdio/printf.c b/functions/stdio/printf.c
index 440fa5f9562ffef8a456adb5d11f3b3c5d250537..23536dd84e145761f7c29360dd1b13e4c9f2404b 100644 (file)
--- a/functions/stdio/printf.c
+++ b/functions/stdio/printf.c
@@ -1,20 +1,44 @@
-// ----------------------------------------------------------------------------
-// $Id$
-// ----------------------------------------------------------------------------
-// Public Domain C Library - http://pdclib.sourceforge.net
-// This code is Public Domain. Use, modify, and redistribute at will.
-// ----------------------------------------------------------------------------
+/* $Id$ */
 
-int printf( const char * restrict format, ... ) { /* TODO */ };
+/* printf( const char *, ... )
 
-/* 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 <stdarg.h>
+
+#ifndef REGTEST
+
+int printf( const char * _PDCLIB_restrict format, ... )
 {
-    va_list arg;
-    int ret;
+    int rc;
+    va_list ap;
+    va_start( ap, format );
+    rc = vfprintf( stdout, format, ap );
+    va_end( ap );
+    return rc;
+}
+
+#endif
 
-    va_start(arg, format);
-    ret = vfprintf(stdout, format, arg);
-    va_end(arg);
-    return (ret);
+#ifdef TEST
+#define _PDCLIB_FILEID "stdio/printf.c"
+#define _PDCLIB_FILEIO
+
+#include <_PDCLIB_test.h>
+
+#define testprintf( stream, format, ... ) printf( format, __VA_ARGS__ )
+
+int main( void )
+{
+    FILE * target;
+    TESTCASE( ( target = freopen( testfile, "wb+", stdout ) ) != NULL );
+#include "printf_testcases.h"
+    TESTCASE( fclose( target ) == 0 );
+    TESTCASE( remove( testfile ) == 0 );
+    return TEST_RESULTS;
 }
-*/
+
+#endif