X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Ffscanf.c;h=f9b950eee7edcbd4ec68f62532a4ea4ed20d84e2;hb=b5b6c4a890795ea76f9b92b817b0a83c6bb4862c;hp=6ea4866452bebfa70c0b7c8aa13768257edbfbc5;hpb=c541b161cd56c9de041d10827e13d5d9a5bfc151;p=pdclib.old

diff --git a/functions/stdio/fscanf.c b/functions/stdio/fscanf.c
index 6ea4866..f9b950e 100644
--- a/functions/stdio/fscanf.c
+++ b/functions/stdio/fscanf.c
@@ -10,8 +10,21 @@
 #include <stdarg.h>
 
 #ifndef REGTEST
+#include <_PDCLIB_io.h>
 
-int fscanf( FILE * _PDCLIB_restrict stream, const char * _PDCLIB_restrict format, ... )
+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 rc;
     va_list ap;
@@ -24,29 +37,19 @@ int fscanf( FILE * _PDCLIB_restrict stream, const char * _PDCLIB_restrict format
 #endif
 
 #ifdef TEST
+#define _PDCLIB_FILEID "stdio/fscanf.c"
+#define _PDCLIB_FILEIO
+
 #include <_PDCLIB_test.h>
 
-#include <limits.h>
-#include <string.h>
+#define testscanf( stream, format, ... ) fscanf( stream, format, __VA_ARGS__ )
 
 int main( void )
 {
-    char teststring1[] = "  1 23\045\0\067 ";
-    char buffer[15];
-    FILE * fh;
-    TESTCASE( ( fh = fopen( "testfile", "w+" ) ) != NULL );
-    TESTCASE( fwrite( teststring1, 15, 1, fh ) == 1 );
-    rewind( fh );
-    /* */
-    TESTCASE( memset( buffer, CHAR_MAX, 15 ) == buffer ); \
-    TESTCASE( fseek( fh, 0, SEEK_SET ) == 0 ); \
-    TESTCASE( fscanf( fh, "%14c", buffer ) == 1 ); \
-    TESTCASE( memcmp( buffer, teststring1 + 0, 14 ) == 0 ); \
-    TESTCASE( buffer[ 14 ] == CHAR_MAX ); \
-    TESTCASE( memset( buffer, CHAR_MAX, 15 ) == buffer ); \
-    TESTCASE( sscanf( teststring1 + 14, "%14c", buffer ) ); \
-    TESTCASE( memcmp( buffer, teststring1 + 0, 14 ) == 0 ); \
-    TESTCASE( buffer[ 14 ] == CHAR_MAX );
+    FILE * source;
+    TESTCASE( ( source = tmpfile() ) != NULL );
+#include "scanf_testcases.h"
+    TESTCASE( fclose( source ) == 0 );
     return TEST_RESULTS;
 }