X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Fvsscanf.c;h=51b49e5cbc90d7c25521f0775fd5d641da5edeb1;hb=e1c526e9bad3f6e69391e94059096145390508d3;hp=be9bf61ae16ba5c699e718fc2d5285fa708c17b8;hpb=51c28f42a44612c2684d808fe62c854d1e39d992;p=pdclib

diff --git a/functions/stdio/vsscanf.c b/functions/stdio/vsscanf.c
index be9bf61..51b49e5 100644
--- a/functions/stdio/vsscanf.c
+++ b/functions/stdio/vsscanf.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* vsscanf( const char *, const char *, va_list arg )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -11,8 +9,11 @@
 
 #ifndef REGTEST
 #include <ctype.h>
+#include <_PDCLIB_io.h>
 
-int vsscanf( const char * _PDCLIB_restrict s, const char * _PDCLIB_restrict format, va_list arg )
+int vsscanf( const char * _PDCLIB_restrict s, 
+             const char * _PDCLIB_restrict format, 
+             va_list arg )
 {
     /* TODO: This function should interpret format as multibyte characters.  */
     struct _PDCLIB_status_t status;
@@ -86,11 +87,12 @@ int vsscanf( const char * _PDCLIB_restrict s, const char * _PDCLIB_restrict form
 #endif
 
 #ifdef TEST
-#include <_PDCLIB_test.h>
+#define _PDCLIB_FILEID "stdio/vsscanf.c"
+#define _PDCLIB_STRINGIO
 
-#include "scan_test.h"
+#include <_PDCLIB_test.h>
 
-static int SCANFUNC( char const * stream, char const * format, ... )
+static int testscanf( char const * stream, char const * format, ... )
 {
     va_list ap;
     va_start( ap, format );
@@ -101,8 +103,8 @@ static int SCANFUNC( char const * stream, char const * format, ... )
 
 int main( void )
 {
-#include "sscan_sources.incl"
-#include "scanf_testcases.incl"
+    char source[100];
+#include "scanf_testcases.h"
     return TEST_RESULTS;
 }