Index: trunk/Mars/mbase/MZlib.cc
===================================================================
--- trunk/Mars/mbase/MZlib.cc	(revision 11433)
+++ trunk/Mars/mbase/MZlib.cc	(revision 11434)
@@ -80,21 +80,4 @@
 // --------------------------------------------------------------------------
 //
-// 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,6 +96,12 @@
     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,7 +176,6 @@
         return EOF;
 
-    // Fill buffer
-    if (fill_buffer()==EOF)
-        return EOF;
+    // Buffer is empty
+    setg(fBuffer+4, fBuffer+4, fBuffer+4);
 
     return pos;
Index: trunk/Mars/mbase/MZlib.h
===================================================================
--- trunk/Mars/mbase/MZlib.h	(revision 11433)
+++ trunk/Mars/mbase/MZlib.h	(revision 11434)
@@ -23,5 +23,4 @@
 
     int underflow();
-    int fill_buffer(int putback=0);
 
 public: