X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Ffscanf.c;h=fbe280b4b6be6b0fc04a78ddb42ab194bc61f026;hb=84d648157e22cecc65902ecfdd4e3a1b88d5e53f;hp=f680076b28c425476109789a90fe70733e5fddd5;hpb=d9dcf16664c81809258992e1653ecb68c8079974;p=pdclib.old

diff --git a/functions/stdio/fscanf.c b/functions/stdio/fscanf.c
index f680076..fbe280b 100644
--- a/functions/stdio/fscanf.c
+++ b/functions/stdio/fscanf.c
@@ -11,21 +11,44 @@
 
 #ifndef REGTEST
 
-int fscanf( FILE * _PDCLIB_restrict stream, const char * _PDCLIB_restrict format, ... )
+int fscanf_unlocked( FILE * _PDCLIB_restrict stream, 
+                     const char * _PDCLIB_restrict format, ... )
 {
+    int rc;
     va_list ap;
     va_start( ap, format );
-    return vfscanf( stream, format, ap );
+    rc = vfscanf_unlocked( stream, format, ap );
+    va_end( ap );
+    return rc;
+}
+
+int fscanf( FILE * _PDCLIB_restrict stream, 
+            const char * _PDCLIB_restrict format, ... )
+{
+    int rc;
+    va_list ap;
+    va_start( ap, format );
+    rc = vfscanf( stream, format, ap );
+    va_end( ap );
+    return rc;
 }
 
 #endif
 
 #ifdef TEST
+#define _PDCLIB_FILEID "stdio/fscanf.c"
+#define _PDCLIB_FILEIO
+
 #include <_PDCLIB_test.h>
 
+#define testscanf( stream, format, ... ) fscanf( stream, format, __VA_ARGS__ )
+
 int main( void )
 {
-    TESTCASE( NO_TESTDRIVER );
+    FILE * source;
+    TESTCASE( ( source = tmpfile() ) != NULL );
+#include "scanf_testcases.h"
+    TESTCASE( fclose( source ) == 0 );
     return TEST_RESULTS;
 }