X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Fvfscanf.c;h=a1ffdbdd7aa4f92ed1e62e760928c0403ab5d9fd;hb=36ba0291514888662188f6a64fe34e9acad1c298;hp=da365bdb618eb3b2f8aa8ab74ad31b71c3c79cdc;hpb=6ca24b75c75b9c6f22e1e69693d326b8e3330841;p=pdclib

diff --git a/functions/stdio/vfscanf.c b/functions/stdio/vfscanf.c
index da365bd..a1ffdbd 100644
--- a/functions/stdio/vfscanf.c
+++ b/functions/stdio/vfscanf.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* vfscanf( FILE *, const char *, va_list )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -11,8 +9,9 @@
 #include <ctype.h>
 
 #ifndef REGTEST
+#include <_PDCLIB_io.h>
 
-int vfscanf_unlocked( FILE * _PDCLIB_restrict stream, 
+int _PDCLIB_vfscanf_unlocked( FILE * _PDCLIB_restrict stream, 
                       const char * _PDCLIB_restrict format, 
                       va_list arg )
 {
@@ -46,18 +45,18 @@ int vfscanf_unlocked( FILE * _PDCLIB_restrict stream,
                 }
                 if ( ! feof( stream ) )
                 {
-                    ungetc( c, stream );
+                    _PDCLIB_ungetc_unlocked( c, stream );
                 }
             }
             else
             {
                 /* Non-whitespace char in format string: Match verbatim */
-                if ( ( ( c = getc( stream ) ) != *format ) || feof( stream ) )
+                if ( ( ( c = _PDCLIB_getc_unlocked( stream ) ) != *format ) || feof( stream ) )
                 {
                     /* Matching error */
                     if ( ! feof( stream ) && ! ferror( stream ) )
                     {
-                        ungetc( c, stream );
+                        _PDCLIB_ungetc_unlocked( c, stream );
                     }
                     else if ( status.n == 0 )
                     {
@@ -91,9 +90,9 @@ int vfscanf( FILE * _PDCLIB_restrict stream,
              const char * _PDCLIB_restrict format, 
              va_list arg )
 {
-    flockfile( stream );
-    int r = vfscanf_unlocked( stream, format, arg );
-    funlockfile( stream );
+    _PDCLIB_flockfile( stream );
+    int r = _PDCLIB_vfscanf_unlocked( stream, format, arg );
+    _PDCLIB_funlockfile( stream );
     return r;
 }