Changeset 11434 for trunk/Mars

Timestamp:

07/18/11 09:57:05 (13 years ago)

Author:

tbretz

Message:

Removed the need of fill_buffer

Location:

trunk/Mars/mbase

Files:

• MZlib.cc (modified) (3 diffs)
• MZlib.h (modified) (1 diff)

trunk/Mars/mbase/MZlib.cc

@@ -80 +80 @@
 // --------------------------------------------------------------------------
 //
-// Fill the buffer starting at the current file position and reset buffer
-// pointers by calling setg
-//
-int MZlib::fill_buffer(int iputback)
-{
-    const int num = gzread(fFile, fBuffer+4, fgBufferSize-4);
-    if (num <= 0) // ERROR or EOF
-        return EOF;
-
-    // reset buffer pointers
-    setg(fBuffer+(4-iputback), fBuffer+4, fBuffer+4+num);
-
-    return num;
-}
-
-// --------------------------------------------------------------------------
-//
 // Handle a buffer underflow (buffer went empty)
 //
@@ -113 +96 @@
     memcpy(fBuffer+(4-iputback), gptr()-iputback, iputback);
 
-    if (fill_buffer(iputback)==EOF)
+    // Fill the buffer starting at the current file position and reset buffer
+    // pointers by calling setg
+    const int num = gzread(fFile, fBuffer+4, fgBufferSize-4);
+    if (num <= 0) // ERROR or EOF
         return EOF;
+
+    // reset buffer pointers
+    setg(fBuffer+(4-iputback), fBuffer+4, fBuffer+4+num);
 
     // return next character
@@ -187 +176 @@
         return EOF;
 
-    // Fill buffer
-    if (fill_buffer()==EOF)
-        return EOF;
+    // Buffer is empty
+    setg(fBuffer+4, fBuffer+4, fBuffer+4);
 
     return pos;

trunk/Mars/mbase/MZlib.h

@@ -23 +23 @@
 
     int underflow();
-    int fill_buffer(int putback=0);
 
 public: