# 
# patch "ChangeLog"
#  from [a81aac5978b6088577eacf6ce685ec5c58e7c753]
#    to [b4afee9931cc13409a2204e1172fd6bad15d4df5]
# 
# patch "botan/gzip.cpp"
#  from [fb3d19b654bb5d8183961396f8f65ee3e3c35134]
#    to [6120187e9450c4934ae6f196829baa8653e98210]
# 
# patch "botan/gzip.h"
#  from [01488d72ebff8a76915a32fb7bcdbb7af91eb101]
#    to [4966cf920d955ea04b7f33680e5c4e975547bfd5]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,7 @@
+2005-04-18  Matt Johnston  <address@hidden>
+
+	* botan/gzip.cpp: renamed functions for clarity, indenting fixup
+
 2005-04-17  Matt Johnston  <address@hidden>
 
 	* change_set.cc (confirm_proper_tree): remove incorrect code
--- botan/gzip.cpp
+++ botan/gzip.cpp
@@ -216,7 +216,7 @@
 
       send(buf.begin(), buf.size());
 
-      // Length - LSB first
+     // Length - LSB first
      for (int i = 0; i < 4; i++)
         buf[3-i] = get_byte(i, count);
 
@@ -262,11 +262,11 @@
    // If we're in the footer, take what we need, then go to the next block
    if (in_footer)
       {
-      u32bit eat_len = write_footer(input, length);
-          input += eat_len;
-          length -= eat_len;
-          if (length == 0)
-                  return;
+         u32bit eat_len = eat_footer(input, length);
+         input += eat_len;
+         length -= eat_len;
+         if (length == 0)
+            return;
       }
 
    // Check the gzip header
@@ -317,7 +317,7 @@
       if(rc == Z_STREAM_END)
          {
          u32bit read_from_block = length - zlib->stream.avail_in;
-         u32bit eat_len = write_footer((Bytef*)input + read_from_block, zlib->stream.avail_in);
+         u32bit eat_len = eat_footer((Bytef*)input + read_from_block, zlib->stream.avail_in);
          read_from_block += eat_len;
          input += read_from_block;
          length -= read_from_block;
@@ -330,7 +330,7 @@
 /*************************************************
 * Store the footer bytes                         *
 *************************************************/
-u32bit Gzip_Decompression::write_footer(const byte input[], u32bit length)
+u32bit Gzip_Decompression::eat_footer(const byte input[], u32bit length)
    {
       if (footer.size() >= GZIP::FOOTER_LENGTH)
          throw Decoding_Error("Gzip_Decompression: Data integrity error in footer");
--- botan/gzip.h
+++ botan/gzip.h
@@ -67,7 +67,7 @@
       Gzip_Decompression();
       ~Gzip_Decompression() { clear(); }
    private:
-      u32bit write_footer(const byte input[], u32bit length);
+      u32bit eat_footer(const byte input[], u32bit length);
       void check_footer();
       void clear();
       SecureVector<byte> buffer;