X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Ffscanf.c;h=9bb775ffc6597178c5dc811b12b760127e951bef;hb=be738e08ec9ba2498d81153bee1de9b8af7e764c;hp=b560448f14e49a49ff6fd7cd6d17ec3cca3da128;hpb=f56f5d756f412e9c7058e2af4e36bc1de21dd642;p=pdclib

diff --git a/functions/stdio/fscanf.c b/functions/stdio/fscanf.c
index b560448..9bb775f 100644
--- a/functions/stdio/fscanf.c
+++ b/functions/stdio/fscanf.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* fscanf( FILE *, const char *, ... )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -10,8 +8,21 @@
 #include <stdarg.h>
 
 #ifndef REGTEST
+#include "_PDCLIB_io.h"
+
+int _PDCLIB_fscanf_unlocked( FILE * _PDCLIB_restrict stream, 
+                     const char * _PDCLIB_restrict format, ... )
+{
+    int rc;
+    va_list ap;
+    va_start( ap, format );
+    rc = _PDCLIB_vfscanf_unlocked( stream, format, ap );
+    va_end( ap );
+    return rc;
+}
 
-int fscanf( FILE * _PDCLIB_restrict stream, const char * _PDCLIB_restrict format, ... )
+int fscanf( FILE * _PDCLIB_restrict stream, 
+            const char * _PDCLIB_restrict format, ... )
 {
     int rc;
     va_list ap;
@@ -24,15 +35,19 @@ int fscanf( FILE * _PDCLIB_restrict stream, const char * _PDCLIB_restrict format
 #endif
 
 #ifdef TEST
-#include <_PDCLIB_test.h>
+#define _PDCLIB_FILEID "stdio/fscanf.c"
+#define _PDCLIB_FILEIO
+
+#include "_PDCLIB_test.h"
 
-#include "scan_test.h"
+#define testscanf( stream, format, ... ) fscanf( stream, format, __VA_ARGS__ )
 
 int main( void )
 {
-#define SCANFUNC( source, format, ... ) fscanf( source, format, __VA_ARGS__ )
-#include "fscan_sources.incl"
-#include "scanf_testcases.incl"
+    FILE * source;
+    TESTCASE( ( source = tmpfile() ) != NULL );
+#include "scanf_testcases.h"
+    TESTCASE( fclose( source ) == 0 );
     return TEST_RESULTS;
 }