Reworked scanf() testing. General cleanups.

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

diff --git a/functions/stdio/sscanf.c b/functions/stdio/sscanf.c
index 0b902eeedda1c804df86117fa97c5afd25ad0092..dc343b863170646edaaa74ad7870cc7bd160f6f4 100644 (file)
--- a/functions/stdio/sscanf.c
+++ b/functions/stdio/sscanf.c
@@ -1,20 +1,42 @@
-// ----------------------------------------------------------------------------
-// $Id$
-// ----------------------------------------------------------------------------
-// Public Domain C Library - http://pdclib.sourceforge.net
-// This code is Public Domain. Use, modify, and redistribute at will.
-// ----------------------------------------------------------------------------
+/* $Id$ */
 
-int sscanf( const char * restrict s, const char * restrict format, ... ) { /* TODO */ };
+/* sscanf( const char *, 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 sscanf( const char * _PDCLIB_restrict s, const char * _PDCLIB_restrict format, ... )
 {
-    va_list arg;
-    int ret;
+    int rc;
+    va_list ap;
+    va_start( ap, format );
+    rc = vsscanf( s, format, ap );
+    va_end( ap );
+    return rc;
+}
+
+#endif
+
+#ifdef TEST
+#define _PDCLIB_FILEID "stdio/sscanf.c"
+#define _PDCLIB_STRINGIO
 
-    va_start(arg, format);
-    ret = vvscanf(format, arg, NULL, s);
-    va_end(arg);
-    return (ret);
+#include <_PDCLIB_test.h>
+
+#define testscanf( s, format, ... ) sscanf( s, format, __VA_ARGS__ )
+
+int main()
+{
+    char source[100];
+#include "scanf_testcases.h"
+    return TEST_RESULTS;
 }
-*/
+
+#endif
+