Namespace cleanliness: Rename all ***_unlocked functions to _PDCLIB_***_unlocked.

[pdclib.old] / functions / stdio / fread.c

diff --git a/functions/stdio/fread.c b/functions/stdio/fread.c
index 1fdc75326c887ac6bcfc76717e0f20ce38114954..9695db43bb1f43a833fb5a02447dce1dfe07886f 100644 (file)
--- a/functions/stdio/fread.c
+++ b/functions/stdio/fread.c
@@ -9,15 +9,16 @@
 #include <stdio.h>
 
 #ifndef REGTEST
-
-#include <_PDCLIB_glue.h>
+#include <_PDCLIB_io.h>
 
 #include <stdbool.h>
 #include <string.h>
 
-size_t fread_unlocked( void * _PDCLIB_restrict ptr, 
-                       size_t size, size_t nmemb, 
-                       struct _PDCLIB_file_t * _PDCLIB_restrict stream )
+size_t _PDCLIB_fread_unlocked( 
+    void * _PDCLIB_restrict ptr, 
+    size_t size, size_t nmemb, 
+    FILE * _PDCLIB_restrict stream 
+)
 {
     if ( _PDCLIB_prepread( stream ) == EOF )
     {
@@ -27,29 +28,21 @@ size_t fread_unlocked( void * _PDCLIB_restrict ptr,
     size_t nmemb_i;
     for ( nmemb_i = 0; nmemb_i < nmemb; ++nmemb_i )
     {
-        for ( size_t size_i = 0; size_i < size; ++size_i )
-        {
-            if ( stream->bufidx == stream->bufend )
-            {
-                if ( _PDCLIB_fillbuffer( stream ) == EOF )
-                {
-                    /* Could not read requested data */
-                    return nmemb_i;
-                }
-            }
-            dest[ nmemb_i * size + size_i ] = stream->buffer[ stream->bufidx++ ];
-        }
+        size_t numread = _PDCLIB_getchars( &dest[ nmemb_i * size ], size, EOF, 
+                                           stream );
+        if( numread != size )
+            break;
     }
     return nmemb_i;
 }
 
 size_t fread( void * _PDCLIB_restrict ptr, 
               size_t size, size_t nmemb, 
-              struct _PDCLIB_file_t * _PDCLIB_restrict stream )
+              FILE * _PDCLIB_restrict stream )
 {
-    flockfile( stream );
-    size_t r = fread_unlocked( ptr, size, nmemb, stream );
-    funlockfile( stream );
+    _PDCLIB_flockfile( stream );
+    size_t r = _PDCLIB_fread_unlocked( ptr, size, nmemb, stream );
+    _PDCLIB_funlockfile( stream );
     return r;
 }