Restoring authorship annotation for <f0b0s@yandex-team.ru>. Commit 2 of 2.

56 files changed, 18551 insertions, 18551 deletions

diff --git a/contrib/libs/crcutil/aligned_alloc.h b/contrib/libs/crcutil/aligned_alloc.h
index 57bdc91d8a..37cefbacd9 100644
--- a/contrib/libs/crcutil/aligned_alloc.h
+++ b/contrib/libs/crcutil/aligned_alloc.h
@@ -1,66 +1,66 @@
-// Copyright 2010 Google Inc.  All rights reserved. 
-// 
-// Licensed under the Apache License, Version 2.0 (the "License"); 
-// you may not use this file except in compliance with the License. 
-// You may obtain a copy of the License at 
-// 
-//      http://www.apache.org/licenses/LICENSE-2.0 
-// 
-// Unless required by applicable law or agreed to in writing, software 
-// distributed under the License is distributed on an "AS IS" BASIS, 
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-// See the License for the specific language governing permissions and 
-// limitations under the License. 
-// 
-// Poor man's platform-independent implementation of aligned memory allocator. 
- 
-#ifndef CRCUTIL_ALIGNED_ALLOC_H_ 
-#define CRCUTIL_ALIGNED_ALLOC_H_ 
- 
-#include "std_headers.h"    // size_t, ptrdiff_t 
- 
-namespace crcutil { 
- 
-// Allocates a block of memory of "size" bytes so that a field 
-// at "field_offset" is aligned on "align" boundary. 
-// 
-// NB #1: "align" shall be exact power of two. 
-// 
-// NB #2: memory allocated by AlignedAlloc should be release by AlignedFree(). 
-// 
-inline void *AlignedAlloc(size_t size, 
-                          size_t field_offset, 
-                          size_t align, 
-                          const void **allocated_mem) { 
-  if (align == 0 || (align & (align - 1)) != 0 || align < sizeof(char *)) { 
-    align = sizeof(*allocated_mem); 
-  } 
-  size += align - 1 + sizeof(*allocated_mem); 
-  char *allocated_memory = new char[size]; 
-  char *aligned_memory = allocated_memory + sizeof(*allocated_mem); 
-  field_offset &= align - 1; 
-  size_t actual_alignment = 
-      reinterpret_cast<size_t>(aligned_memory + field_offset) & (align - 1); 
-  if (actual_alignment != 0) { 
-    aligned_memory += align - actual_alignment; 
-  } 
-  reinterpret_cast<char **>(aligned_memory)[-1] = allocated_memory; 
- 
-  if (allocated_mem != NULL) { 
-    *allocated_mem = allocated_memory; 
-  } 
- 
-  return aligned_memory; 
-} 
- 
-// Frees memory allocated by AlignedAlloc(). 
-inline void AlignedFree(void *aligned_memory) { 
-  if (aligned_memory != NULL) { 
-    char *allocated_memory = reinterpret_cast<char **>(aligned_memory)[-1]; 
-    delete[] allocated_memory; 
-  } 
-} 
- 
-}  // namespace crcutil 
- 
-#endif  // CRCUTIL_ALIGNED_ALLOC_H_ 
+// Copyright 2010 Google Inc.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// Poor man's platform-independent implementation of aligned memory allocator.
+
+#ifndef CRCUTIL_ALIGNED_ALLOC_H_
+#define CRCUTIL_ALIGNED_ALLOC_H_
+
+#include "std_headers.h"    // size_t, ptrdiff_t
+
+namespace crcutil {
+
+// Allocates a block of memory of "size" bytes so that a field
+// at "field_offset" is aligned on "align" boundary.
+//
+// NB #1: "align" shall be exact power of two.
+//
+// NB #2: memory allocated by AlignedAlloc should be release by AlignedFree().
+//
+inline void *AlignedAlloc(size_t size,
+                          size_t field_offset,
+                          size_t align,
+                          const void **allocated_mem) {
+  if (align == 0 || (align & (align - 1)) != 0 || align < sizeof(char *)) {
+    align = sizeof(*allocated_mem);
+  }
+  size += align - 1 + sizeof(*allocated_mem);
+  char *allocated_memory = new char[size];
+  char *aligned_memory = allocated_memory + sizeof(*allocated_mem);
+  field_offset &= align - 1;
+  size_t actual_alignment =
+      reinterpret_cast<size_t>(aligned_memory + field_offset) & (align - 1);
+  if (actual_alignment != 0) {
+    aligned_memory += align - actual_alignment;
+  }
+  reinterpret_cast<char **>(aligned_memory)[-1] = allocated_memory;
+
+  if (allocated_mem != NULL) {
+    *allocated_mem = allocated_memory;
+  }
+
+  return aligned_memory;
+}
+
+// Frees memory allocated by AlignedAlloc().
+inline void AlignedFree(void *aligned_memory) {
+  if (aligned_memory != NULL) {
+    char *allocated_memory = reinterpret_cast<char **>(aligned_memory)[-1];
+    delete[] allocated_memory;
+  }
+}
+
+}  // namespace crcutil
+
+#endif  // CRCUTIL_ALIGNED_ALLOC_H_
diff --git a/contrib/libs/crcutil/base_types.h b/contrib/libs/crcutil/base_types.h
index a0d9d9a093..5b743640a4 100644
--- a/contrib/libs/crcutil/base_types.h
+++ b/contrib/libs/crcutil/base_types.h
@@ -1,73 +1,73 @@
-// Copyright 2010 Google Inc.  All rights reserved. 
-// 
-// Licensed under the Apache License, Version 2.0 (the "License"); 
-// you may not use this file except in compliance with the License. 
-// You may obtain a copy of the License at 
-// 
-//      http://www.apache.org/licenses/LICENSE-2.0 
-// 
-// Unless required by applicable law or agreed to in writing, software 
-// distributed under the License is distributed on an "AS IS" BASIS, 
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-// See the License for the specific language governing permissions and 
-// limitations under the License. 
- 
-// Defines 8/16/32/64-bit integer types. 
-// 
-// Either uint64 or uint32 will map to size_t. 
-// This way, specialized variants of CRC implementation 
-// parameterized by "size_t" will be reused when 
-// parameterized by "uint64" or "uint32". 
-// In their turn, specialized verisons are parameterized 
-// by "size_t" so that one version of the code is optimal 
-// both on 32-bit and 64-bit platforms. 
- 
-#ifndef CRCUTIL_BASE_TYPES_H_ 
-#define CRCUTIL_BASE_TYPES_H_ 
- 
-#include "std_headers.h"    // size_t, ptrdiff_t 
- 
-namespace crcutil { 
- 
-template<typename A, typename B> class ChooseFirstIfSame { 
- public: 
-  template<bool same_size, typename AA, typename BB> class ChooseFirstIfTrue { 
-   public: 
-    typedef AA Type; 
-  }; 
-  template<typename AA, typename BB> class ChooseFirstIfTrue<false, AA, BB> { 
-   public: 
-    typedef BB Type; 
-  }; 
- 
-  typedef typename ChooseFirstIfTrue<sizeof(A) == sizeof(B), A, B>::Type Type; 
-}; 
- 
-typedef unsigned char uint8; 
-typedef signed char int8; 
- 
-typedef unsigned short uint16; 
-typedef short int16; 
- 
-typedef ChooseFirstIfSame<size_t, unsigned int>::Type uint32; 
-typedef ChooseFirstIfSame<ptrdiff_t, int>::Type int32; 
- 
-#if defined(_MSC_VER) 
-typedef ChooseFirstIfSame<size_t, unsigned __int64>::Type uint64; 
-typedef ChooseFirstIfSame<ptrdiff_t, __int64>::Type int64; 
-#define HAVE_UINT64 1 
-#elif defined(__GNUC__) 
-typedef ChooseFirstIfSame<size_t, unsigned long long>::Type uint64; 
-typedef ChooseFirstIfSame<ptrdiff_t, long long>::Type int64; 
-#define HAVE_UINT64 1 
-#else 
-// TODO: ensure that everything compiles and works when HAVE_UINT64 is false. 
-// TODO: remove HAVE_UINT64 and use sizeof(uint64) instead? 
-#define HAVE_UINT64 0 
-typedef uint32 uint64; 
-typedef int32 int64; 
-#endif 
- 
-}  // namespace crcutil 
- 
-#endif  // CRCUTIL_BASE_TYPES_H_ 
+// Copyright 2010 Google Inc.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Defines 8/16/32/64-bit integer types.
+//
+// Either uint64 or uint32 will map to size_t.
+// This way, specialized variants of CRC implementation
+// parameterized by "size_t" will be reused when
+// parameterized by "uint64" or "uint32".
+// In their turn, specialized verisons are parameterized
+// by "size_t" so that one version of the code is optimal
+// both on 32-bit and 64-bit platforms.
+
+#ifndef CRCUTIL_BASE_TYPES_H_
+#define CRCUTIL_BASE_TYPES_H_
+
+#include "std_headers.h"    // size_t, ptrdiff_t
+
+namespace crcutil {
+
+template<typename A, typename B> class ChooseFirstIfSame {
+ public:
+  template<bool same_size, typename AA, typename BB> class ChooseFirstIfTrue {
+   public:
+    typedef AA Type;
+  };
+  template<typename AA, typename BB> class ChooseFirstIfTrue<false, AA, BB> {
+   public:
+    typedef BB Type;
+  };
+
+  typedef typename ChooseFirstIfTrue<sizeof(A) == sizeof(B), A, B>::Type Type;
+};
+
+typedef unsigned char uint8;
+typedef signed char int8;
+
+typedef unsigned short uint16;
+typedef short int16;
+
+typedef ChooseFirstIfSame<size_t, unsigned int>::Type uint32;
+typedef ChooseFirstIfSame<ptrdiff_t, int>::Type int32;
+
+#if defined(_MSC_VER)
+typedef ChooseFirstIfSame<size_t, unsigned __int64>::Type uint64;
+typedef ChooseFirstIfSame<ptrdiff_t, __int64>::Type int64;
+#define HAVE_UINT64 1
+#elif defined(__GNUC__)
+typedef ChooseFirstIfSame<size_t, unsigned long long>::Type uint64;
+typedef ChooseFirstIfSame<ptrdiff_t, long long>::Type int64;
+#define HAVE_UINT64 1
+#else
+// TODO: ensure that everything compiles and works when HAVE_UINT64 is false.
+// TODO: remove HAVE_UINT64 and use sizeof(uint64) instead?
+#define HAVE_UINT64 0
+typedef uint32 uint64;
+typedef int32 int64;
+#endif
+
+}  // namespace crcutil
+
+#endif  // CRCUTIL_BASE_TYPES_H_
diff --git a/contrib/libs/crcutil/bob_jenkins_rng.h b/contrib/libs/crcutil/bob_jenkins_rng.h
index 0925af960d..aed178c2a7 100644
--- a/contrib/libs/crcutil/bob_jenkins_rng.h
+++ b/contrib/libs/crcutil/bob_jenkins_rng.h
@@ -1,126 +1,126 @@
-// Copyright 2010 Google Inc.  All rights reserved. 
-// 
-// Licensed under the Apache License, Version 2.0 (the "License"); 
-// you may not use this file except in compliance with the License. 
-// You may obtain a copy of the License at 
-// 
-//      http://www.apache.org/licenses/LICENSE-2.0 
-// 
-// Unless required by applicable law or agreed to in writing, software 
-// distributed under the License is distributed on an "AS IS" BASIS, 
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-// See the License for the specific language governing permissions and 
-// limitations under the License. 
- 
-// Glorified C++ version of Bob Jenkins' random number generator. 
-// See http://burtleburtle.net/bob/rand/smallprng.html for more details. 
- 
-#ifndef CRCUTIL_BOB_JENKINS_RNG_H_ 
-#define CRCUTIL_BOB_JENKINS_RNG_H_ 
- 
-#include "base_types.h" 
- 
-#if !defined(_MSC_VER) 
-#define _rotl(value, bits) \ 
-  static_cast<uint32>(((value) << (bits)) + ((value) >> (32 - (bits)))) 
-#define _rotl64(value, bits) \ 
-  static_cast<uint64>(((value) << (bits)) + ((value) >> (64 - (bits)))) 
-#endif  // !defined(_MSC_VER) 
- 
-namespace crcutil { 
- 
-#pragma pack(push, 8) 
- 
-template<typename T> class BobJenkinsRng; 
- 
-template<> class BobJenkinsRng<uint32> { 
- public: 
-  typedef uint32 value; 
- 
-  value Get() { 
-    value e = a_ - _rotl(b_, 23); 
-    a_ = b_ ^ _rotl(c_, 16); 
-    b_ = c_ + _rotl(d_, 11); 
-    c_ = d_ + e; 
-    d_ = e + a_; 
-    return (d_); 
-  } 
- 
-  void Init(value seed) { 
-    a_ = 0xf1ea5eed; 
-    b_ = seed; 
-    c_ = seed; 
-    d_ = seed; 
-    for (size_t i = 0; i < 20; ++i) { 
-      (void) Get(); 
-    } 
-  } 
- 
-  explicit BobJenkinsRng(value seed) { 
-    Init(seed); 
-  } 
- 
-  BobJenkinsRng() { 
-    Init(0x1234567); 
-  } 
- 
- private: 
-  value a_; 
-  value b_; 
-  value c_; 
-  value d_; 
-}; 
- 
- 
-#if HAVE_UINT64 
- 
-template<> class BobJenkinsRng<uint64> { 
- public: 
-  typedef uint64 value; 
- 
-  value Get() { 
-    value e = a_ - _rotl64(b_, 7); 
-    a_ = b_ ^ _rotl64(c_, 13); 
-    b_ = c_ + _rotl64(d_, 37); 
-    c_ = d_ + e; 
-    d_ = e + a_; 
-    return d_; 
-  } 
- 
-  void Init(value seed) { 
-    a_ = 0xf1ea5eed; 
-    b_ = seed; 
-    c_ = seed; 
-    d_ = seed; 
-    for (size_t i = 0; i < 20; ++i) { 
-      (void) Get(); 
-    } 
-  } 
- 
-  explicit BobJenkinsRng(value seed) { 
-    Init(seed); 
-  } 
- 
-  BobJenkinsRng() { 
-    Init(0x1234567); 
-  } 
- 
- private: 
-  value a_; 
-  value b_; 
-  value c_; 
-  value d_; 
-}; 
- 
-#endif  // HAVE_UINT64 
- 
-#if !defined(_MSC_VER) 
-#undef _rotl 
-#undef _rotl64 
-#endif  // !defined(_MSC_VER) 
- 
-#pragma pack(pop) 
- 
-}  // namespace crcutil 
- 
-#endif  // CRCUTIL_BOB_JENKINS_RNG_H_ 
+// Copyright 2010 Google Inc.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Glorified C++ version of Bob Jenkins' random number generator.
+// See http://burtleburtle.net/bob/rand/smallprng.html for more details.
+
+#ifndef CRCUTIL_BOB_JENKINS_RNG_H_
+#define CRCUTIL_BOB_JENKINS_RNG_H_
+
+#include "base_types.h"
+
+#if !defined(_MSC_VER)
+#define _rotl(value, bits) \
+  static_cast<uint32>(((value) << (bits)) + ((value) >> (32 - (bits))))
+#define _rotl64(value, bits) \
+  static_cast<uint64>(((value) << (bits)) + ((value) >> (64 - (bits))))
+#endif  // !defined(_MSC_VER)
+
+namespace crcutil {
+
+#pragma pack(push, 8)
+
+template<typename T> class BobJenkinsRng;
+
+template<> class BobJenkinsRng<uint32> {
+ public:
+  typedef uint32 value;
+
+  value Get() {
+    value e = a_ - _rotl(b_, 23);
+    a_ = b_ ^ _rotl(c_, 16);
+    b_ = c_ + _rotl(d_, 11);
+    c_ = d_ + e;
+    d_ = e + a_;
+    return (d_);
+  }
+
+  void Init(value seed) {
+    a_ = 0xf1ea5eed;
+    b_ = seed;
+    c_ = seed;
+    d_ = seed;
+    for (size_t i = 0; i < 20; ++i) {
+      (void) Get();
+    }
+  }
+
+  explicit BobJenkinsRng(value seed) {
+    Init(seed);
+  }
+
+  BobJenkinsRng() {
+    Init(0x1234567);
+  }
+
+ private:
+  value a_;
+  value b_;
+  value c_;
+  value d_;
+};
+
+
+#if HAVE_UINT64
+
+template<> class BobJenkinsRng<uint64> {
+ public:
+  typedef uint64 value;
+
+  value Get() {
+    value e = a_ - _rotl64(b_, 7);
+    a_ = b_ ^ _rotl64(c_, 13);
+    b_ = c_ + _rotl64(d_, 37);
+    c_ = d_ + e;
+    d_ = e + a_;
+    return d_;
+  }
+
+  void Init(value seed) {
+    a_ = 0xf1ea5eed;
+    b_ = seed;
+    c_ = seed;
+    d_ = seed;
+    for (size_t i = 0; i < 20; ++i) {
+      (void) Get();
+    }
+  }
+
+  explicit BobJenkinsRng(value seed) {
+    Init(seed);
+  }
+
+  BobJenkinsRng() {
+    Init(0x1234567);
+  }
+
+ private:
+  value a_;
+  value b_;
+  value c_;
+  value d_;
+};
+
+#endif  // HAVE_UINT64
+
+#if !defined(_MSC_VER)
+#undef _rotl
+#undef _rotl64
+#endif  // !defined(_MSC_VER)
+
+#pragma pack(pop)
+
+}  // namespace crcutil
+
+#endif  // CRCUTIL_BOB_JENKINS_RNG_H_
diff --git a/contrib/libs/crcutil/crc32c_sse4.cc b/contrib/libs/crcutil/crc32c_sse4.cc
index 9875ab4ff2..ed0f64410a 100644
--- a/contrib/libs/crcutil/crc32c_sse4.cc
+++ b/contrib/libs/crcutil/crc32c_sse4.cc
@@ -1,369 +1,369 @@
-// Copyright 2010 Google Inc.  All rights reserved. 
-// 
-// Licensed under the Apache License, Version 2.0 (the "License"); 
-// you may not use this file except in compliance with the License. 
-// You may obtain a copy of the License at 
-// 
-//      http://www.apache.org/licenses/LICENSE-2.0 
-// 
-// Unless required by applicable law or agreed to in writing, software 
-// distributed under the License is distributed on an "AS IS" BASIS, 
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-// See the License for the specific language governing permissions and 
-// limitations under the License. 
- 
-// Implements CRC32C using Intel's SSE4 crc32 instruction. 
-// Uses _mm_crc32_u64/32/8 intrinsics if CRCUTIL_USE_MM_CRC32 is not zero, 
-// emilates intrinsics via CRC_WORD/CRC_BYTE otherwise. 
- 
-#include "crc32c_sse4.h" 
- 
+// Copyright 2010 Google Inc.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Implements CRC32C using Intel's SSE4 crc32 instruction.
+// Uses _mm_crc32_u64/32/8 intrinsics if CRCUTIL_USE_MM_CRC32 is not zero,
+// emilates intrinsics via CRC_WORD/CRC_BYTE otherwise.
+
+#include "crc32c_sse4.h"
+
 #include <util/system/compiler.h>
 
-#if HAVE_I386 || HAVE_AMD64 
- 
-namespace crcutil { 
- 
-#define UPDATE_STRIPE_CRCS(index, block_size, num_stripes) do { \ 
-  CRC_UPDATE_WORD(crc0, \ 
-      reinterpret_cast<const size_t *>(src + \ 
-          0 * CRC32C_SSE4_STRIPE_SIZE(block_size, num_stripes))[index]); \ 
-  CRC_UPDATE_WORD(crc1, \ 
-      reinterpret_cast<const size_t *>(src + \ 
-          1 * CRC32C_SSE4_STRIPE_SIZE(block_size, num_stripes))[index]); \ 
-  CRC_UPDATE_WORD(crc2, \ 
-      reinterpret_cast<const size_t *>(src + \ 
-          2 * CRC32C_SSE4_STRIPE_SIZE(block_size, num_stripes))[index]); \ 
-  if (num_stripes > 3) { \ 
-    CRC_UPDATE_WORD(crc3, \ 
-        reinterpret_cast<const size_t *>(src + \ 
-            3 * CRC32C_SSE4_STRIPE_SIZE(block_size, num_stripes))[index]); \ 
-  } \ 
-} while (0) 
- 
-// Multiplies "crc" by "x**(8 *  STRIPE_SIZE(block_size)" 
-// using appropriate multiplication table(s). 
-// 
-#if 0 
- 
-// This variant is for illustration purposes only. 
-// Actual implementation below: 
-// 1. Splits the computation into 2 data-independent paths 
-//    by independently multiplying lower and upper halves 
-//    of "crc0" in interleaved manner, and combining the 
-//    results in the end. 
-// 2. Removing redundant "crc0 = 0" etc. in the beginning. 
-// 3. Removing redundant shifts of "tmp0" and "tmp1" in the last round. 
-#define MULTIPLY_CRC(crc0, block_size, num_stripes) do { \ 
-  size_t tmp0 = crc0; \ 
-  crc0 = 0; \ 
-  for (size_t i = 0; i < kNumTables; ++i) { \ 
-    crc0 ^= CRC32C_SSE4_MUL_TABLE(block_size, num_stripes) \ 
-            [i][tmp0 & (kTableEntries - 1)]; \ 
-    tmp0 >>= kTableEntryBits; \ 
-  } \ 
-} while (0) 
- 
-#else 
- 
-#define MULTIPLY_CRC(crc0, block_size, num_stripes) do { \ 
-  size_t tmp0 = crc0; \ 
-  size_t tmp1 = crc0 >> (kTableEntryBits * kNumTablesHalfHi); \ 
-  crc0 = CRC32C_SSE4_MUL_TABLE(block_size, num_stripes) \ 
-         [0][tmp0 & (kTableEntries - 1)]; \ 
-  tmp0 >>= kTableEntryBits; \ 
-  size_t crc1 = CRC32C_SSE4_MUL_TABLE(block_size, num_stripes) \ 
-                [kNumTablesHalfHi][tmp1 & (kTableEntries - 1)]; \ 
-  tmp1 >>= kTableEntryBits; \ 
-  for (size_t i = 1; i < kNumTablesHalfLo - 1; ++i) { \ 
-    crc0 ^= CRC32C_SSE4_MUL_TABLE(block_size, num_stripes) \ 
-            [i][tmp0 & (kTableEntries - 1)]; \ 
-    tmp0 >>= kTableEntryBits; \ 
-    crc1 ^= CRC32C_SSE4_MUL_TABLE(block_size, num_stripes) \ 
-            [i + kNumTablesHalfHi][tmp1 & (kTableEntries - 1)]; \ 
-    tmp1 >>= kTableEntryBits; \ 
-  } \ 
-  crc0 ^= CRC32C_SSE4_MUL_TABLE(block_size, num_stripes) \ 
-          [kNumTablesHalfLo - 1][tmp0 & (kTableEntries - 1)]; \ 
-  if (kNumTables & 1) { \ 
-    tmp0 >>= kTableEntryBits; \ 
-  } \ 
-  crc1 ^= CRC32C_SSE4_MUL_TABLE(block_size, num_stripes) \ 
-          [kNumTables - 1][tmp1]; \ 
-  if (kNumTables & 1) { \ 
-    crc0 ^= CRC32C_SSE4_MUL_TABLE(block_size, num_stripes) \ 
-            [kNumTablesHalfLo][tmp0 & (kTableEntries - 1)]; \ 
-  } \ 
-  crc0 ^= crc1; \ 
-} while (0) 
- 
-#endif 
- 
-// Given CRCs (crc0, crc1, etc.) of consequitive 
-// stripes of STRIPE_SIZE(block_size) bytes each, 
-// produces CRC of concatenated stripes. 
-#define COMBINE_STRIPE_CRCS(block_size, num_stripes) do { \ 
-  MULTIPLY_CRC(crc0, block_size, num_stripes); \ 
-  crc0 ^= crc1; \ 
-  MULTIPLY_CRC(crc0, block_size, num_stripes); \ 
-  crc0 ^= crc2; \ 
-  if (num_stripes > 3) { \ 
-    MULTIPLY_CRC(crc0, block_size, num_stripes); \ 
-    crc0 ^= crc3; \ 
-  } \ 
-} while (0) 
- 
-// Processes input BLOCK_SIZE(block) bytes per iteration 
-// by splitting a block of BLOCK_SIZE(block) bytes into N 
-// equally-sized stripes of STRIPE_SIZE(block_size) each, 
-// computing CRC of each stripe, and concatenating stripe CRCs. 
-#define PROCESS_BLOCK(block_size, num_stripes) do { \ 
-  while (bytes >= CRC32C_SSE4_BLOCK_SIZE(block_size, num_stripes)) { \ 
-    Crc crc1 = 0; \ 
-    Crc crc2 = 0; \ 
-    Crc crc3; \ 
-    if (num_stripes > 3) crc3 = 0; \ 
-    { \ 
-      const uint8 *stripe_end = src + \ 
-          (CRC32C_SSE4_STRIPE_SIZE(block_size, num_stripes) / \ 
-              kUnrolledLoopBytes) * kUnrolledLoopBytes; \ 
-      do { \ 
-        UPDATE_STRIPE_CRCS(0, block_size, num_stripes); \ 
-        UPDATE_STRIPE_CRCS(1, block_size, num_stripes); \ 
-        UPDATE_STRIPE_CRCS(2, block_size, num_stripes); \ 
-        UPDATE_STRIPE_CRCS(3, block_size, num_stripes); \ 
-        UPDATE_STRIPE_CRCS(4, block_size, num_stripes); \ 
-        UPDATE_STRIPE_CRCS(5, block_size, num_stripes); \ 
-        UPDATE_STRIPE_CRCS(6, block_size, num_stripes); \ 
-        UPDATE_STRIPE_CRCS(7, block_size, num_stripes); \ 
-        src += kUnrolledLoopBytes; \ 
-      } while (src < stripe_end); \ 
-      if ((CRC32C_SSE4_STRIPE_SIZE(block_size, num_stripes) % \ 
-          kUnrolledLoopBytes) != 0) { \ 
-        stripe_end += \ 
-            CRC32C_SSE4_STRIPE_SIZE(block_size, num_stripes) % \ 
-                kUnrolledLoopBytes; \ 
-        do { \ 
-          UPDATE_STRIPE_CRCS(0, block_size, num_stripes); \ 
-          src += sizeof(size_t); \ 
-        } while (src < stripe_end); \ 
-      } \ 
-    } \ 
-    COMBINE_STRIPE_CRCS(block_size, num_stripes); \ 
-    src += CRC32C_SSE4_STRIPE_SIZE(block_size, num_stripes) * \ 
-           ((num_stripes) - 1); \ 
-    bytes = static_cast<size_t>(end - src); \ 
-  } \ 
- no_more_##block_size##_##num_stripes:; \ 
-} while (0) 
- 
+#if HAVE_I386 || HAVE_AMD64
+
+namespace crcutil {
+
+#define UPDATE_STRIPE_CRCS(index, block_size, num_stripes) do { \
+  CRC_UPDATE_WORD(crc0, \
+      reinterpret_cast<const size_t *>(src + \
+          0 * CRC32C_SSE4_STRIPE_SIZE(block_size, num_stripes))[index]); \
+  CRC_UPDATE_WORD(crc1, \
+      reinterpret_cast<const size_t *>(src + \
+          1 * CRC32C_SSE4_STRIPE_SIZE(block_size, num_stripes))[index]); \
+  CRC_UPDATE_WORD(crc2, \
+      reinterpret_cast<const size_t *>(src + \
+          2 * CRC32C_SSE4_STRIPE_SIZE(block_size, num_stripes))[index]); \
+  if (num_stripes > 3) { \
+    CRC_UPDATE_WORD(crc3, \
+        reinterpret_cast<const size_t *>(src + \
+            3 * CRC32C_SSE4_STRIPE_SIZE(block_size, num_stripes))[index]); \
+  } \
+} while (0)
+
+// Multiplies "crc" by "x**(8 *  STRIPE_SIZE(block_size)"
+// using appropriate multiplication table(s).
+//
+#if 0
+
+// This variant is for illustration purposes only.
+// Actual implementation below:
+// 1. Splits the computation into 2 data-independent paths
+//    by independently multiplying lower and upper halves
+//    of "crc0" in interleaved manner, and combining the
+//    results in the end.
+// 2. Removing redundant "crc0 = 0" etc. in the beginning.
+// 3. Removing redundant shifts of "tmp0" and "tmp1" in the last round.
+#define MULTIPLY_CRC(crc0, block_size, num_stripes) do { \
+  size_t tmp0 = crc0; \
+  crc0 = 0; \
+  for (size_t i = 0; i < kNumTables; ++i) { \
+    crc0 ^= CRC32C_SSE4_MUL_TABLE(block_size, num_stripes) \
+            [i][tmp0 & (kTableEntries - 1)]; \
+    tmp0 >>= kTableEntryBits; \
+  } \
+} while (0)
+
+#else
+
+#define MULTIPLY_CRC(crc0, block_size, num_stripes) do { \
+  size_t tmp0 = crc0; \
+  size_t tmp1 = crc0 >> (kTableEntryBits * kNumTablesHalfHi); \
+  crc0 = CRC32C_SSE4_MUL_TABLE(block_size, num_stripes) \
+         [0][tmp0 & (kTableEntries - 1)]; \
+  tmp0 >>= kTableEntryBits; \
+  size_t crc1 = CRC32C_SSE4_MUL_TABLE(block_size, num_stripes) \
+                [kNumTablesHalfHi][tmp1 & (kTableEntries - 1)]; \
+  tmp1 >>= kTableEntryBits; \
+  for (size_t i = 1; i < kNumTablesHalfLo - 1; ++i) { \
+    crc0 ^= CRC32C_SSE4_MUL_TABLE(block_size, num_stripes) \
+            [i][tmp0 & (kTableEntries - 1)]; \
+    tmp0 >>= kTableEntryBits; \
+    crc1 ^= CRC32C_SSE4_MUL_TABLE(block_size, num_stripes) \
+            [i + kNumTablesHalfHi][tmp1 & (kTableEntries - 1)]; \
+    tmp1 >>= kTableEntryBits; \
+  } \
+  crc0 ^= CRC32C_SSE4_MUL_TABLE(block_size, num_stripes) \
+          [kNumTablesHalfLo - 1][tmp0 & (kTableEntries - 1)]; \
+  if (kNumTables & 1) { \
+    tmp0 >>= kTableEntryBits; \
+  } \
+  crc1 ^= CRC32C_SSE4_MUL_TABLE(block_size, num_stripes) \
+          [kNumTables - 1][tmp1]; \
+  if (kNumTables & 1) { \
+    crc0 ^= CRC32C_SSE4_MUL_TABLE(block_size, num_stripes) \
+            [kNumTablesHalfLo][tmp0 & (kTableEntries - 1)]; \
+  } \
+  crc0 ^= crc1; \
+} while (0)
+
+#endif
+
+// Given CRCs (crc0, crc1, etc.) of consequitive
+// stripes of STRIPE_SIZE(block_size) bytes each,
+// produces CRC of concatenated stripes.
+#define COMBINE_STRIPE_CRCS(block_size, num_stripes) do { \
+  MULTIPLY_CRC(crc0, block_size, num_stripes); \
+  crc0 ^= crc1; \
+  MULTIPLY_CRC(crc0, block_size, num_stripes); \
+  crc0 ^= crc2; \
+  if (num_stripes > 3) { \
+    MULTIPLY_CRC(crc0, block_size, num_stripes); \
+    crc0 ^= crc3; \
+  } \
+} while (0)
+
+// Processes input BLOCK_SIZE(block) bytes per iteration
+// by splitting a block of BLOCK_SIZE(block) bytes into N
+// equally-sized stripes of STRIPE_SIZE(block_size) each,
+// computing CRC of each stripe, and concatenating stripe CRCs.
+#define PROCESS_BLOCK(block_size, num_stripes) do { \
+  while (bytes >= CRC32C_SSE4_BLOCK_SIZE(block_size, num_stripes)) { \
+    Crc crc1 = 0; \
+    Crc crc2 = 0; \
+    Crc crc3; \
+    if (num_stripes > 3) crc3 = 0; \
+    { \
+      const uint8 *stripe_end = src + \
+          (CRC32C_SSE4_STRIPE_SIZE(block_size, num_stripes) / \
+              kUnrolledLoopBytes) * kUnrolledLoopBytes; \
+      do { \
+        UPDATE_STRIPE_CRCS(0, block_size, num_stripes); \
+        UPDATE_STRIPE_CRCS(1, block_size, num_stripes); \
+        UPDATE_STRIPE_CRCS(2, block_size, num_stripes); \
+        UPDATE_STRIPE_CRCS(3, block_size, num_stripes); \
+        UPDATE_STRIPE_CRCS(4, block_size, num_stripes); \
+        UPDATE_STRIPE_CRCS(5, block_size, num_stripes); \
+        UPDATE_STRIPE_CRCS(6, block_size, num_stripes); \
+        UPDATE_STRIPE_CRCS(7, block_size, num_stripes); \
+        src += kUnrolledLoopBytes; \
+      } while (src < stripe_end); \
+      if ((CRC32C_SSE4_STRIPE_SIZE(block_size, num_stripes) % \
+          kUnrolledLoopBytes) != 0) { \
+        stripe_end += \
+            CRC32C_SSE4_STRIPE_SIZE(block_size, num_stripes) % \
+                kUnrolledLoopBytes; \
+        do { \
+          UPDATE_STRIPE_CRCS(0, block_size, num_stripes); \
+          src += sizeof(size_t); \
+        } while (src < stripe_end); \
+      } \
+    } \
+    COMBINE_STRIPE_CRCS(block_size, num_stripes); \
+    src += CRC32C_SSE4_STRIPE_SIZE(block_size, num_stripes) * \
+           ((num_stripes) - 1); \
+    bytes = static_cast<size_t>(end - src); \
+  } \
+ no_more_##block_size##_##num_stripes:; \
+} while (0)
+
 Y_NO_SANITIZE("undefined")
-size_t Crc32cSSE4::Crc32c(const void *data, size_t bytes, Crc crc0) const { 
-  const uint8 *src = static_cast<const uint8 *>(data); 
-  const uint8 *end = src + bytes; 
-  crc0 ^= Base().Canonize(); 
- 
-  // If we don't have too much data to process, 
-  // do not waste time trying to align input etc. 
-  // Noticeably improves performance on small inputs. 
-  if (bytes < 4 * sizeof(size_t)) goto less_than_4_size_t; 
-  if (bytes < 8 * sizeof(size_t)) goto less_than_8_size_t; 
-  if (bytes < 16 * sizeof(size_t)) goto less_than_16_size_t; 
- 
-#define PROCESS_TAIL_IF_SMALL(block_size, num_stripes) do { \ 
-  if (bytes < CRC32C_SSE4_BLOCK_SIZE(block_size, num_stripes)) { \ 
-    goto no_more_##block_size##_##num_stripes; \ 
-  } \ 
-} while (0) 
-#define NOOP(block_size, num_stripes) 
- 
-  CRC32C_SSE4_ENUMERATE_ALL_BLOCKS_ASCENDING(PROCESS_TAIL_IF_SMALL, 
-                                             NOOP, 
-                                             NOOP); 
- 
-#undef PROCESS_TAIL_IF_SMALL 
- 
- 
-  // Do not use ALIGN_ON_WORD_BOUNDARY_IF_NEEDED() here because: 
-  // 1. It uses CRC_BYTE() which won't work. 
-  // 2. Its threshold may be incorrect becuase Crc32 that uses 
-  //    native CPU crc32 instruction is much faster than 
-  //    generic table-based CRC computation. 
-  // 
-  // In case of X5550 CPU, break even point is at 2KB -- exactly. 
-  if (bytes >= 2 * 1024) { 
-    while ((reinterpret_cast<size_t>(src) & (sizeof(Word) - 1)) != 0) { 
-      if (src >= end) { 
-        return (crc0 ^ Base().Canonize()); 
-      } 
-      CRC_UPDATE_BYTE(crc0, src[0]); 
-      src += 1; 
-    } 
-    bytes = static_cast<size_t>(end - src); 
-  } 
-  if (src >= end) { 
-    return (crc0 ^ Base().Canonize()); 
-  } 
- 
-  // Quickly skip processing of too large blocks 
-  // Noticeably improves performance on small inputs. 
-#define SKIP_BLOCK_IF_NEEDED(block_size, num_stripes) do { \ 
-  if (bytes < CRC32C_SSE4_BLOCK_SIZE(block_size, num_stripes)) { \ 
-    goto no_more_##block_size##_##num_stripes; \ 
-  } \ 
-} while (0) 
- 
-  CRC32C_SSE4_ENUMERATE_ALL_BLOCKS_ASCENDING(NOOP, 
-                                             SKIP_BLOCK_IF_NEEDED, 
-                                             SKIP_BLOCK_IF_NEEDED); 
- 
-#undef SKIP_BLOCK_IF_NEEDED 
- 
-  // Process data in all blocks. 
-  CRC32C_SSE4_ENUMERATE_ALL_BLOCKS_DESCENDING(PROCESS_BLOCK, 
-                                              PROCESS_BLOCK, 
-                                              PROCESS_BLOCK); 
- 
-  // Finish the tail word-by-word and then byte-by-byte. 
-#define CRC_UPDATE_WORD_4(index) do { \ 
-  CRC_UPDATE_WORD(crc0, reinterpret_cast<const size_t *>(src)[index]); \ 
-  CRC_UPDATE_WORD(crc0, reinterpret_cast<const size_t *>(src)[index + 1]); \ 
-  CRC_UPDATE_WORD(crc0, reinterpret_cast<const size_t *>(src)[index + 2]); \ 
-  CRC_UPDATE_WORD(crc0, reinterpret_cast<const size_t *>(src)[index + 3]); \ 
-} while (0) 
- 
-  if (bytes >= 4 * 4 * sizeof(size_t)) { 
-    end -= 4 * 4 * sizeof(size_t); 
-    do { 
-      CRC_UPDATE_WORD_4(4 * 0); 
-      CRC_UPDATE_WORD_4(4 * 1); 
-      CRC_UPDATE_WORD_4(4 * 2); 
-      CRC_UPDATE_WORD_4(4 * 3); 
-      src += 4 * 4 * sizeof(size_t); 
-    } while (src <= end); 
-    end += 4 * 4 * sizeof(size_t); 
-    bytes = static_cast<size_t>(end - src); 
-  } 
- less_than_16_size_t: 
- 
-  if (bytes >= 4 * 2 * sizeof(size_t)) { 
-    CRC_UPDATE_WORD_4(4 * 0); 
-    CRC_UPDATE_WORD_4(4 * 1); 
-    src += 4 * 2 * sizeof(size_t); 
-    bytes -= 4 * 2 * sizeof(size_t); 
-  } 
- less_than_8_size_t: 
- 
-  if (bytes >= 4 * sizeof(size_t)) { 
-    CRC_UPDATE_WORD_4(0); 
-    src += 4 * sizeof(size_t); 
-    bytes -= 4 * sizeof(size_t); 
-  } 
- less_than_4_size_t: 
- 
-  if (bytes >= 1 * sizeof(size_t)) { 
-    end -= 1 * sizeof(size_t); 
-    do { 
-      CRC_UPDATE_WORD(crc0, reinterpret_cast<const size_t *>(src)[0]); 
-      src += 1 * sizeof(size_t); 
-    } while (src <= end); 
-    end += 1 * sizeof(size_t); 
-  } 
- 
-  while (src < end) { 
-    CRC_UPDATE_BYTE(crc0, src[0]); 
-    src += 1; 
-  } 
- 
-  return (crc0 ^ Base().Canonize()); 
-} 
- 
- 
-void Crc32cSSE4::Init(bool constant) { 
-  base_.Init(FixedGeneratingPolynomial(), FixedDegree(), constant); 
- 
-#define INIT_MUL_TABLE(block_size, num_stripes) do { \ 
-  size_t multiplier = \ 
-      Base().Xpow8N(CRC32C_SSE4_STRIPE_SIZE(block_size, num_stripes)); \ 
-  for (size_t table = 0; table < kNumTables; ++table) { \ 
-    for (size_t entry = 0; entry < kTableEntries; ++entry) { \ 
-      size_t value = static_cast<uint32>(entry << (kTableEntryBits * table)); \ 
-      CRC32C_SSE4_MUL_TABLE(block_size, num_stripes)[table][entry] = \ 
-            static_cast<Entry>(Base().Multiply(value, multiplier)); \ 
-    } \ 
-  } \ 
-} while (0) 
- 
-  CRC32C_SSE4_ENUMERATE_ALL_BLOCKS(INIT_MUL_TABLE); 
- 
-#undef INIT_MUL_TABLE 
- 
-#if !CRCUTIL_USE_MM_CRC32 
-  for (size_t j = 0; j < sizeof(Word); ++j) { 
-    Crc k = Base().XpowN((sizeof(Word) - 1 - j) * 8 + 32); 
-    for (size_t i = 0; i < 256; ++i) { 
-      crc_word_[j][i] = Base().MultiplyUnnormalized(i, 8, k); 
-    } 
-  } 
-#endif  // !CRCUTIL_USE_MM_CRC32 
-} 
- 
- 
-bool Crc32cSSE4::IsSSE42Available() { 
-#if defined(_MSC_VER) 
-  int cpu_info[4]; 
-  __cpuid(cpu_info, 1); 
+size_t Crc32cSSE4::Crc32c(const void *data, size_t bytes, Crc crc0) const {
+  const uint8 *src = static_cast<const uint8 *>(data);
+  const uint8 *end = src + bytes;
+  crc0 ^= Base().Canonize();
+
+  // If we don't have too much data to process,
+  // do not waste time trying to align input etc.
+  // Noticeably improves performance on small inputs.
+  if (bytes < 4 * sizeof(size_t)) goto less_than_4_size_t;
+  if (bytes < 8 * sizeof(size_t)) goto less_than_8_size_t;
+  if (bytes < 16 * sizeof(size_t)) goto less_than_16_size_t;
+
+#define PROCESS_TAIL_IF_SMALL(block_size, num_stripes) do { \
+  if (bytes < CRC32C_SSE4_BLOCK_SIZE(block_size, num_stripes)) { \
+    goto no_more_##block_size##_##num_stripes; \
+  } \
+} while (0)
+#define NOOP(block_size, num_stripes)
+
+  CRC32C_SSE4_ENUMERATE_ALL_BLOCKS_ASCENDING(PROCESS_TAIL_IF_SMALL,
+                                             NOOP,
+                                             NOOP);
+
+#undef PROCESS_TAIL_IF_SMALL
+
+
+  // Do not use ALIGN_ON_WORD_BOUNDARY_IF_NEEDED() here because:
+  // 1. It uses CRC_BYTE() which won't work.
+  // 2. Its threshold may be incorrect becuase Crc32 that uses
+  //    native CPU crc32 instruction is much faster than
+  //    generic table-based CRC computation.
+  //
+  // In case of X5550 CPU, break even point is at 2KB -- exactly.
+  if (bytes >= 2 * 1024) {
+    while ((reinterpret_cast<size_t>(src) & (sizeof(Word) - 1)) != 0) {
+      if (src >= end) {
+        return (crc0 ^ Base().Canonize());
+      }
+      CRC_UPDATE_BYTE(crc0, src[0]);
+      src += 1;
+    }
+    bytes = static_cast<size_t>(end - src);
+  }
+  if (src >= end) {
+    return (crc0 ^ Base().Canonize());
+  }
+
+  // Quickly skip processing of too large blocks
+  // Noticeably improves performance on small inputs.
+#define SKIP_BLOCK_IF_NEEDED(block_size, num_stripes) do { \
+  if (bytes < CRC32C_SSE4_BLOCK_SIZE(block_size, num_stripes)) { \
+    goto no_more_##block_size##_##num_stripes; \
+  } \
+} while (0)
+
+  CRC32C_SSE4_ENUMERATE_ALL_BLOCKS_ASCENDING(NOOP,
+                                             SKIP_BLOCK_IF_NEEDED,
+                                             SKIP_BLOCK_IF_NEEDED);
+
+#undef SKIP_BLOCK_IF_NEEDED
+
+  // Process data in all blocks.
+  CRC32C_SSE4_ENUMERATE_ALL_BLOCKS_DESCENDING(PROCESS_BLOCK,
+                                              PROCESS_BLOCK,
+                                              PROCESS_BLOCK);
+
+  // Finish the tail word-by-word and then byte-by-byte.
+#define CRC_UPDATE_WORD_4(index) do { \
+  CRC_UPDATE_WORD(crc0, reinterpret_cast<const size_t *>(src)[index]); \
+  CRC_UPDATE_WORD(crc0, reinterpret_cast<const size_t *>(src)[index + 1]); \
+  CRC_UPDATE_WORD(crc0, reinterpret_cast<const size_t *>(src)[index + 2]); \
+  CRC_UPDATE_WORD(crc0, reinterpret_cast<const size_t *>(src)[index + 3]); \
+} while (0)
+
+  if (bytes >= 4 * 4 * sizeof(size_t)) {
+    end -= 4 * 4 * sizeof(size_t);
+    do {
+      CRC_UPDATE_WORD_4(4 * 0);
+      CRC_UPDATE_WORD_4(4 * 1);
+      CRC_UPDATE_WORD_4(4 * 2);
+      CRC_UPDATE_WORD_4(4 * 3);
+      src += 4 * 4 * sizeof(size_t);
+    } while (src <= end);
+    end += 4 * 4 * sizeof(size_t);
+    bytes = static_cast<size_t>(end - src);
+  }
+ less_than_16_size_t:
+
+  if (bytes >= 4 * 2 * sizeof(size_t)) {
+    CRC_UPDATE_WORD_4(4 * 0);
+    CRC_UPDATE_WORD_4(4 * 1);
+    src += 4 * 2 * sizeof(size_t);
+    bytes -= 4 * 2 * sizeof(size_t);
+  }
+ less_than_8_size_t:
+
+  if (bytes >= 4 * sizeof(size_t)) {
+    CRC_UPDATE_WORD_4(0);
+    src += 4 * sizeof(size_t);
+    bytes -= 4 * sizeof(size_t);
+  }
+ less_than_4_size_t:
+
+  if (bytes >= 1 * sizeof(size_t)) {
+    end -= 1 * sizeof(size_t);
+    do {
+      CRC_UPDATE_WORD(crc0, reinterpret_cast<const size_t *>(src)[0]);
+      src += 1 * sizeof(size_t);
+    } while (src <= end);
+    end += 1 * sizeof(size_t);
+  }
+
+  while (src < end) {
+    CRC_UPDATE_BYTE(crc0, src[0]);
+    src += 1;
+  }
+
+  return (crc0 ^ Base().Canonize());
+}
+
+
+void Crc32cSSE4::Init(bool constant) {
+  base_.Init(FixedGeneratingPolynomial(), FixedDegree(), constant);
+
+#define INIT_MUL_TABLE(block_size, num_stripes) do { \
+  size_t multiplier = \
+      Base().Xpow8N(CRC32C_SSE4_STRIPE_SIZE(block_size, num_stripes)); \
+  for (size_t table = 0; table < kNumTables; ++table) { \
+    for (size_t entry = 0; entry < kTableEntries; ++entry) { \
+      size_t value = static_cast<uint32>(entry << (kTableEntryBits * table)); \
+      CRC32C_SSE4_MUL_TABLE(block_size, num_stripes)[table][entry] = \
+            static_cast<Entry>(Base().Multiply(value, multiplier)); \
+    } \
+  } \
+} while (0)
+
+  CRC32C_SSE4_ENUMERATE_ALL_BLOCKS(INIT_MUL_TABLE);
+
+#undef INIT_MUL_TABLE
+
+#if !CRCUTIL_USE_MM_CRC32
+  for (size_t j = 0; j < sizeof(Word); ++j) {
+    Crc k = Base().XpowN((sizeof(Word) - 1 - j) * 8 + 32);
+    for (size_t i = 0; i < 256; ++i) {
+      crc_word_[j][i] = Base().MultiplyUnnormalized(i, 8, k);
+    }
+  }
+#endif  // !CRCUTIL_USE_MM_CRC32
+}
+
+
+bool Crc32cSSE4::IsSSE42Available() {
+#if defined(_MSC_VER)
+  int cpu_info[4];
+  __cpuid(cpu_info, 1);
   return ((cpu_info[2] & (1 << 20)) != 0);
-#elif defined(__GNUC__) && (HAVE_AMD64 || HAVE_I386) 
-  // Not using "cpuid.h" intentionally: it is missing from 
-  // too many installations. 
-  uint32 eax; 
-  uint32 ecx; 
-  uint32 edx; 
-  __asm__ volatile( 
-#if HAVE_I386 && defined(__PIC__) 
+#elif defined(__GNUC__) && (HAVE_AMD64 || HAVE_I386)
+  // Not using "cpuid.h" intentionally: it is missing from
+  // too many installations.
+  uint32 eax;
+  uint32 ecx;
+  uint32 edx;
+  __asm__ volatile(
+#if HAVE_I386 && defined(__PIC__)
     "push %%ebx\n"
-    "cpuid\n" 
+    "cpuid\n"
     "pop %%ebx\n"
-#else 
-    "cpuid\n" 
-#endif  // HAVE_I386 && defined(__PIC__) 
-    : "=a" (eax), "=c" (ecx), "=d" (edx) 
-    : "a" (1), "2" (0) 
-    : "%ebx" 
-  ); 
-  return ((ecx & (1 << 20)) != 0); 
-#else 
-  return false; 
-#endif 
-} 
- 
- 
-void RollingCrc32cSSE4::Init(const Crc32cSSE4 &crc, 
-                             size_t roll_window_bytes, 
-                             const Crc &start_value) { 
-  crc_ = &crc; 
-  roll_window_bytes_ = roll_window_bytes; 
-  start_value_ = start_value; 
- 
-  Crc add = crc.Base().Canonize() ^ start_value; 
-  add = crc.Base().Multiply(add, crc.Base().Xpow8N(roll_window_bytes)); 
-  add ^= crc.Base().Canonize(); 
-  Crc mul = crc.Base().One() ^ crc.Base().Xpow8N(1); 
-  add = crc.Base().Multiply(add, mul); 
- 
-  mul = crc.Base().XpowN(8 * roll_window_bytes + crc.Base().Degree()); 
-  for (size_t i = 0; i < 256; ++i) { 
-    out_[i] = static_cast<Entry>( 
-                  crc.Base().MultiplyUnnormalized( 
-                      static_cast<Crc>(i), 8, mul) ^ add); 
-  } 
- 
-#if !CRCUTIL_USE_MM_CRC32 
-  memcpy(crc_word_, crc_->crc_word_, sizeof(crc_word_)); 
-#endif  // !CRCUTIL_USE_MM_CRC32 
-} 
- 
-}  // namespace crcutil 
- 
-#endif  // HAVE_I386 || HAVE_AMD64 
+#else
+    "cpuid\n"
+#endif  // HAVE_I386 && defined(__PIC__)
+    : "=a" (eax), "=c" (ecx), "=d" (edx)
+    : "a" (1), "2" (0)
+    : "%ebx"
+  );
+  return ((ecx & (1 << 20)) != 0);
+#else
+  return false;
+#endif
+}
+
+
+void RollingCrc32cSSE4::Init(const Crc32cSSE4 &crc,
+                             size_t roll_window_bytes,
+                             const Crc &start_value) {
+  crc_ = &crc;
+  roll_window_bytes_ = roll_window_bytes;
+  start_value_ = start_value;
+
+  Crc add = crc.Base().Canonize() ^ start_value;
+  add = crc.Base().Multiply(add, crc.Base().Xpow8N(roll_window_bytes));
+  add ^= crc.Base().Canonize();
+  Crc mul = crc.Base().One() ^ crc.Base().Xpow8N(1);
+  add = crc.Base().Multiply(add, mul);
+
+  mul = crc.Base().XpowN(8 * roll_window_bytes + crc.Base().Degree());
+  for (size_t i = 0; i < 256; ++i) {
+    out_[i] = static_cast<Entry>(
+                  crc.Base().MultiplyUnnormalized(
+                      static_cast<Crc>(i), 8, mul) ^ add);
+  }
+
+#if !CRCUTIL_USE_MM_CRC32
+  memcpy(crc_word_, crc_->crc_word_, sizeof(crc_word_));
+#endif  // !CRCUTIL_USE_MM_CRC32
+}
+
+}  // namespace crcutil
+
+#endif  // HAVE_I386 || HAVE_AMD64
diff --git a/contrib/libs/crcutil/crc32c_sse4.h b/contrib/libs/crcutil/crc32c_sse4.h
index 24aa815699..ac3d8425b8 100644
--- a/contrib/libs/crcutil/crc32c_sse4.h
+++ b/contrib/libs/crcutil/crc32c_sse4.h
@@ -1,252 +1,252 @@
-// Copyright 2010 Google Inc.  All rights reserved. 
-// 
-// Licensed under the Apache License, Version 2.0 (the "License"); 
-// you may not use this file except in compliance with the License. 
-// You may obtain a copy of the License at 
-// 
-//      http://www.apache.org/licenses/LICENSE-2.0 
-// 
-// Unless required by applicable law or agreed to in writing, software 
-// distributed under the License is distributed on an "AS IS" BASIS, 
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-// See the License for the specific language governing permissions and 
-// limitations under the License. 
- 
-// Implements CRC32C using Intel's SSE4 crc32 instruction. 
-// Uses _mm_crc32_u64/32/8 intrinsics if CRCUTIL_USE_MM_CRC32 is not zero, 
-// emilates intrinsics via CRC_WORD/CRC_BYTE otherwise. 
- 
-#ifndef CRCUTIL_CRC32C_SSE4_H_ 
-#define CRCUTIL_CRC32C_SSE4_H_ 
- 
-#include "gf_util.h"              // base types, gf_util class, etc. 
-#include "crc32c_sse4_intrin.h"   // _mm_crc32_u* intrinsics 
- 
-#if HAVE_I386 || HAVE_AMD64 
- 
-#if CRCUTIL_USE_MM_CRC32 
- 
-#if HAVE_I386 
-#define CRC_UPDATE_WORD(crc, value) (crc = _mm_crc32_u32(crc, (value))) 
-#else 
-#define CRC_UPDATE_WORD(crc, value) (crc = _mm_crc32_u64(crc, (value))) 
-#endif  // HAVE_I386 
- 
-#define CRC_UPDATE_BYTE(crc, value) \ 
-    (crc = _mm_crc32_u8(static_cast<uint32>(crc), static_cast<uint8>(value))) 
- 
-#else 
- 
-#include "generic_crc.h" 
- 
-#define CRC_UPDATE_WORD(crc, value) do { \ 
-  size_t buf = (value); \ 
-  CRC_WORD(this, crc, buf); \ 
-} while (0) 
-#define CRC_UPDATE_BYTE(crc, value) do { \ 
-  CRC_BYTE(this, crc, (value)); \ 
-} while (0) 
- 
-#endif  // CRCUTIL_USE_MM_CRC32 
- 
-namespace crcutil { 
- 
-#pragma pack(push, 16) 
- 
-// Since the same pieces should be parameterized in many different places 
-// and we do not want to introduce a mistake which is rather hard to find, 
-// use a macro to enumerate all block sizes. 
-// 
-// Block sizes and number of stripes were tuned for best performance. 
-// 
-// All constants should be literal constants (too lazy to fix the macro). 
-// 
-// The use of different "macro_first", "macro", and "macro_last" 
-// allows generation of different code for smallest, in between, 
-// and largest block sizes. 
-// 
-// This macro shall be kept in sync with 
-// CRC32C_SSE4_ENUMERATE_ALL_BLOCKS_DESCENDING. 
-// Failure to do so will cause compile-time error. 
-#define CRC32C_SSE4_ENUMERATE_ALL_BLOCKS_ASCENDING( \ 
-    macro_smallest, macro, macro_largest) \ 
-  macro_smallest(512, 3); \ 
-  macro(1024, 3); \ 
-  macro(4096, 3); \ 
-  macro_largest(32768, 3) 
- 
-// This macro shall be kept in sync with 
-// CRC32C_SSE4_ENUMERATE_ALL_BLOCKS_ASCENDING. 
-// Failure to do so will cause compile-time error. 
-#define CRC32C_SSE4_ENUMERATE_ALL_BLOCKS_DESCENDING( \ 
-    macro_smallest, macro, macro_largest) \ 
-  macro_largest(32768, 3); \ 
-  macro(4096, 3); \ 
-  macro(1024, 3); \ 
-  macro_smallest(512, 3) 
- 
-// Enumerates all block sizes. 
-#define CRC32C_SSE4_ENUMERATE_ALL_BLOCKS(macro) \ 
-  CRC32C_SSE4_ENUMERATE_ALL_BLOCKS_ASCENDING(macro, macro, macro) 
- 
-#define CRC32C_SSE4_STRIPE_SIZE(block_size, num_stripes) \ 
-  (((block_size) / (num_stripes)) & ~(sizeof(size_t) - 1)) 
- 
-#define CRC32C_SSE4_BLOCK_SIZE(block_size, num_stripes) \ 
-  (CRC32C_SSE4_STRIPE_SIZE(block_size, num_stripes) * (num_stripes)) 
- 
-#define CRC32C_SSE4_MUL_TABLE(block_size, num_stripes) \ 
-  mul_table_##block_size##_##num_blocks##_ 
- 
-class RollingCrc32cSSE4; 
- 
-class Crc32cSSE4 { 
- public: 
-  // Exports Crc, TableEntry, and Word (needed by RollingCrc). 
-  typedef size_t Crc; 
-  typedef Crc Word; 
-  typedef Crc TableEntry; 
- 
-  Crc32cSSE4() {} 
- 
-  // Initializes the tables given generating polynomial of degree (degree). 
-  // If "canonical" is true, crc value will be XOR'ed with (-1) before and 
-  // after actual CRC computation. 
-  explicit Crc32cSSE4(bool canonical) { 
-    Init(canonical); 
-  } 
-  void Init(bool canonical); 
- 
-  // Initializes the tables given generating polynomial of degree. 
-  // If "canonical" is true, crc value will be XOR'ed with (-1) before and 
-  // after actual CRC computation. 
-  // Provided for compatibility with GenericCrc. 
-  Crc32cSSE4(const Crc &generating_polynomial, 
-            size_t degree, 
-            bool canonical) { 
-    Init(generating_polynomial, degree, canonical); 
-  } 
-  void Init(const Crc &generating_polynomial, 
-            size_t degree, 
-            bool canonical) { 
-    if (generating_polynomial == FixedGeneratingPolynomial() && 
-        degree == FixedDegree()) { 
-      Init(canonical); 
-    } 
-  } 
- 
-  // Returns fixed generating polymonial the class implements. 
-  static Crc FixedGeneratingPolynomial() { 
-    return 0x82f63b78; 
-  } 
- 
-  // Returns degree of fixed generating polymonial the class implements. 
-  static Crc FixedDegree() { 
-    return 32; 
-  } 
- 
-  // Returns base class. 
-  const GfUtil<Crc> &Base() const { return base_; } 
- 
-  // Computes CRC32. 
-  size_t CrcDefault(const void *data, size_t bytes, const Crc &crc) const { 
-    return Crc32c(data, bytes, crc); 
-  } 
- 
-  // Returns true iff crc32 instruction is available. 
-  static bool IsSSE42Available(); 
- 
- protected: 
-  // Actual implementation. 
-  size_t Crc32c(const void *data, size_t bytes, Crc crc) const; 
- 
-  enum { 
-    kTableEntryBits = 8, 
-    kTableEntries = 1 << kTableEntryBits, 
-    kNumTables = (32 + kTableEntryBits - 1) / kTableEntryBits, 
-    kNumTablesHalfLo = kNumTables / 2, 
-    kNumTablesHalfHi = (kNumTables + 1) / 2, 
- 
-    kUnrolledLoopCount = 8, 
-    kUnrolledLoopBytes = kUnrolledLoopCount * sizeof(size_t), 
-  }; 
- 
-  // May be set to size_t or uint32, whichever is faster. 
-  typedef uint32 Entry; 
- 
-#define DECLARE_MUL_TABLE(block_size, num_stripes) \ 
-  Entry CRC32C_SSE4_MUL_TABLE(block_size, num_stripes) \ 
-      [kNumTables][kTableEntries] 
- 
-  CRC32C_SSE4_ENUMERATE_ALL_BLOCKS(DECLARE_MUL_TABLE); 
- 
-#undef DECLARE_MUL_TABLE 
- 
-  GfUtil<Crc> base_; 
- 
-#if !CRCUTIL_USE_MM_CRC32 
-  TableEntry crc_word_[sizeof(Word)][256]; 
-  friend class RollingCrc32cSSE4; 
-#endif  // !CRCUTIL_USE_MM_CRC32 
-} GCC_ALIGN_ATTRIBUTE(16); 
- 
-class RollingCrc32cSSE4 { 
- public: 
-  typedef Crc32cSSE4::Crc Crc; 
-  typedef Crc32cSSE4::TableEntry TableEntry; 
-  typedef Crc32cSSE4::Word Word; 
- 
-  RollingCrc32cSSE4() {} 
- 
-  // Initializes internal data structures. 
-  // Retains reference to "crc" instance -- it is used by Start(). 
-  RollingCrc32cSSE4(const Crc32cSSE4 &crc, 
-            size_t roll_window_bytes, 
-            const Crc &start_value) { 
-    Init(crc, roll_window_bytes, start_value); 
-  } 
-  void Init(const Crc32cSSE4 &crc, 
-            size_t roll_window_bytes, 
-            const Crc &start_value); 
- 
-  // Computes crc of "roll_window_bytes" using 
-  // "start_value" of "crc" (see Init()). 
-  Crc Start(const void *data) const { 
-    return crc_->CrcDefault(data, roll_window_bytes_, start_value_); 
-  } 
- 
-  // Computes CRC of "roll_window_bytes" starting in next position. 
-  Crc Roll(const Crc &old_crc, size_t byte_out, size_t byte_in) const { 
-    Crc crc = old_crc; 
-    CRC_UPDATE_BYTE(crc, byte_in); 
-    crc ^= out_[byte_out]; 
-    return crc; 
-  } 
- 
-  // Returns start value. 
-  Crc StartValue() const { return start_value_; } 
- 
-  // Returns length of roll window. 
-  size_t WindowBytes() const { return roll_window_bytes_; } 
- 
- protected: 
-  typedef Crc Entry; 
-  Entry out_[256]; 
- 
-  // Used only by Start(). 
-  Crc start_value_; 
-  const Crc32cSSE4 *crc_; 
-  size_t roll_window_bytes_; 
- 
-#if !CRCUTIL_USE_MM_CRC32 
-  TableEntry crc_word_[sizeof(Word)][256]; 
-#endif  // !CRCUTIL_USE_MM_CRC32 
-} GCC_ALIGN_ATTRIBUTE(16); 
- 
-#pragma pack(pop) 
- 
-}  // namespace crcutil 
- 
-#endif  // HAVE_I386 || HAVE_AMD64 
- 
-#endif  // CRCUTIL_CRC32C_SSE4_H_ 
+// Copyright 2010 Google Inc.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Implements CRC32C using Intel's SSE4 crc32 instruction.
+// Uses _mm_crc32_u64/32/8 intrinsics if CRCUTIL_USE_MM_CRC32 is not zero,
+// emilates intrinsics via CRC_WORD/CRC_BYTE otherwise.
+
+#ifndef CRCUTIL_CRC32C_SSE4_H_
+#define CRCUTIL_CRC32C_SSE4_H_
+
+#include "gf_util.h"              // base types, gf_util class, etc.
+#include "crc32c_sse4_intrin.h"   // _mm_crc32_u* intrinsics
+
+#if HAVE_I386 || HAVE_AMD64
+
+#if CRCUTIL_USE_MM_CRC32
+
+#if HAVE_I386
+#define CRC_UPDATE_WORD(crc, value) (crc = _mm_crc32_u32(crc, (value)))
+#else
+#define CRC_UPDATE_WORD(crc, value) (crc = _mm_crc32_u64(crc, (value)))
+#endif  // HAVE_I386
+
+#define CRC_UPDATE_BYTE(crc, value) \
+    (crc = _mm_crc32_u8(static_cast<uint32>(crc), static_cast<uint8>(value)))
+
+#else
+
+#include "generic_crc.h"
+
+#define CRC_UPDATE_WORD(crc, value) do { \
+  size_t buf = (value); \
+  CRC_WORD(this, crc, buf); \
+} while (0)
+#define CRC_UPDATE_BYTE(crc, value) do { \
+  CRC_BYTE(this, crc, (value)); \
+} while (0)
+
+#endif  // CRCUTIL_USE_MM_CRC32
+
+namespace crcutil {
+
+#pragma pack(push, 16)
+
+// Since the same pieces should be parameterized in many different places
+// and we do not want to introduce a mistake which is rather hard to find,
+// use a macro to enumerate all block sizes.
+//
+// Block sizes and number of stripes were tuned for best performance.
+//
+// All constants should be literal constants (too lazy to fix the macro).
+//
+// The use of different "macro_first", "macro", and "macro_last"
+// allows generation of different code for smallest, in between,
+// and largest block sizes.
+//
+// This macro shall be kept in sync with
+// CRC32C_SSE4_ENUMERATE_ALL_BLOCKS_DESCENDING.
+// Failure to do so will cause compile-time error.
+#define CRC32C_SSE4_ENUMERATE_ALL_BLOCKS_ASCENDING( \
+    macro_smallest, macro, macro_largest) \
+  macro_smallest(512, 3); \
+  macro(1024, 3); \
+  macro(4096, 3); \
+  macro_largest(32768, 3)
+
+// This macro shall be kept in sync with
+// CRC32C_SSE4_ENUMERATE_ALL_BLOCKS_ASCENDING.
+// Failure to do so will cause compile-time error.
+#define CRC32C_SSE4_ENUMERATE_ALL_BLOCKS_DESCENDING( \
+    macro_smallest, macro, macro_largest) \
+  macro_largest(32768, 3); \
+  macro(4096, 3); \
+  macro(1024, 3); \
+  macro_smallest(512, 3)
+
+// Enumerates all block sizes.
+#define CRC32C_SSE4_ENUMERATE_ALL_BLOCKS(macro) \
+  CRC32C_SSE4_ENUMERATE_ALL_BLOCKS_ASCENDING(macro, macro, macro)
+
+#define CRC32C_SSE4_STRIPE_SIZE(block_size, num_stripes) \
+  (((block_size) / (num_stripes)) & ~(sizeof(size_t) - 1))
+
+#define CRC32C_SSE4_BLOCK_SIZE(block_size, num_stripes) \
+  (CRC32C_SSE4_STRIPE_SIZE(block_size, num_stripes) * (num_stripes))
+
+#define CRC32C_SSE4_MUL_TABLE(block_size, num_stripes) \
+  mul_table_##block_size##_##num_blocks##_
+
+class RollingCrc32cSSE4;
+
+class Crc32cSSE4 {
+ public:
+  // Exports Crc, TableEntry, and Word (needed by RollingCrc).
+  typedef size_t Crc;
+  typedef Crc Word;
+  typedef Crc TableEntry;
+
+  Crc32cSSE4() {}
+
+  // Initializes the tables given generating polynomial of degree (degree).
+  // If "canonical" is true, crc value will be XOR'ed with (-1) before and
+  // after actual CRC computation.
+  explicit Crc32cSSE4(bool canonical) {
+    Init(canonical);
+  }
+  void Init(bool canonical);
+
+  // Initializes the tables given generating polynomial of degree.
+  // If "canonical" is true, crc value will be XOR'ed with (-1) before and
+  // after actual CRC computation.
+  // Provided for compatibility with GenericCrc.
+  Crc32cSSE4(const Crc &generating_polynomial,
+            size_t degree,
+            bool canonical) {
+    Init(generating_polynomial, degree, canonical);
+  }
+  void Init(const Crc &generating_polynomial,
+            size_t degree,
+            bool canonical) {
+    if (generating_polynomial == FixedGeneratingPolynomial() &&
+        degree == FixedDegree()) {
+      Init(canonical);
+    }
+  }
+
+  // Returns fixed generating polymonial the class implements.
+  static Crc FixedGeneratingPolynomial() {
+    return 0x82f63b78;
+  }
+
+  // Returns degree of fixed generating polymonial the class implements.
+  static Crc FixedDegree() {
+    return 32;
+  }
+
+  // Returns base class.
+  const GfUtil<Crc> &Base() const { return base_; }
+
+  // Computes CRC32.
+  size_t CrcDefault(const void *data, size_t bytes, const Crc &crc) const {
+    return Crc32c(data, bytes, crc);
+  }
+
+  // Returns true iff crc32 instruction is available.
+  static bool IsSSE42Available();
+
+ protected:
+  // Actual implementation.
+  size_t Crc32c(const void *data, size_t bytes, Crc crc) const;
+
+  enum {
+    kTableEntryBits = 8,
+    kTableEntries = 1 << kTableEntryBits,
+    kNumTables = (32 + kTableEntryBits - 1) / kTableEntryBits,
+    kNumTablesHalfLo = kNumTables / 2,
+    kNumTablesHalfHi = (kNumTables + 1) / 2,
+
+    kUnrolledLoopCount = 8,
+    kUnrolledLoopBytes = kUnrolledLoopCount * sizeof(size_t),
+  };
+
+  // May be set to size_t or uint32, whichever is faster.
+  typedef uint32 Entry;
+
+#define DECLARE_MUL_TABLE(block_size, num_stripes) \
+  Entry CRC32C_SSE4_MUL_TABLE(block_size, num_stripes) \
+      [kNumTables][kTableEntries]
+
+  CRC32C_SSE4_ENUMERATE_ALL_BLOCKS(DECLARE_MUL_TABLE);
+
+#undef DECLARE_MUL_TABLE
+
+  GfUtil<Crc> base_;
+
+#if !CRCUTIL_USE_MM_CRC32
+  TableEntry crc_word_[sizeof(Word)][256];
+  friend class RollingCrc32cSSE4;
+#endif  // !CRCUTIL_USE_MM_CRC32
+} GCC_ALIGN_ATTRIBUTE(16);
+
+class RollingCrc32cSSE4 {
+ public:
+  typedef Crc32cSSE4::Crc Crc;
+  typedef Crc32cSSE4::TableEntry TableEntry;
+  typedef Crc32cSSE4::Word Word;
+
+  RollingCrc32cSSE4() {}
+
+  // Initializes internal data structures.
+  // Retains reference to "crc" instance -- it is used by Start().
+  RollingCrc32cSSE4(const Crc32cSSE4 &crc,
+            size_t roll_window_bytes,
+            const Crc &start_value) {
+    Init(crc, roll_window_bytes, start_value);
+  }
+  void Init(const Crc32cSSE4 &crc,
+            size_t roll_window_bytes,
+            const Crc &start_value);
+
+  // Computes crc of "roll_window_bytes" using
+  // "start_value" of "crc" (see Init()).
+  Crc Start(const void *data) const {
+    return crc_->CrcDefault(data, roll_window_bytes_, start_value_);
+  }
+
+  // Computes CRC of "roll_window_bytes" starting in next position.
+  Crc Roll(const Crc &old_crc, size_t byte_out, size_t byte_in) const {
+    Crc crc = old_crc;
+    CRC_UPDATE_BYTE(crc, byte_in);
+    crc ^= out_[byte_out];
+    return crc;
+  }
+
+  // Returns start value.
+  Crc StartValue() const { return start_value_; }
+
+  // Returns length of roll window.
+  size_t WindowBytes() const { return roll_window_bytes_; }
+
+ protected:
+  typedef Crc Entry;
+  Entry out_[256];
+
+  // Used only by Start().
+  Crc start_value_;
+  const Crc32cSSE4 *crc_;
+  size_t roll_window_bytes_;
+
+#if !CRCUTIL_USE_MM_CRC32
+  TableEntry crc_word_[sizeof(Word)][256];
+#endif  // !CRCUTIL_USE_MM_CRC32
+} GCC_ALIGN_ATTRIBUTE(16);
+
+#pragma pack(pop)
+
+}  // namespace crcutil
+
+#endif  // HAVE_I386 || HAVE_AMD64
+
+#endif  // CRCUTIL_CRC32C_SSE4_H_
diff --git a/contrib/libs/crcutil/crc32c_sse4_intrin.h b/contrib/libs/crcutil/crc32c_sse4_intrin.h
index 5338d21d29..ab7cc3e03d 100644
--- a/contrib/libs/crcutil/crc32c_sse4_intrin.h
+++ b/contrib/libs/crcutil/crc32c_sse4_intrin.h
@@ -1,99 +1,99 @@
-// Copyright 2010 Google Inc.  All rights reserved. 
-// 
-// Licensed under the Apache License, Version 2.0 (the "License"); 
-// you may not use this file except in compliance with the License. 
-// You may obtain a copy of the License at 
-// 
-//      http://www.apache.org/licenses/LICENSE-2.0 
-// 
-// Unless required by applicable law or agreed to in writing, software 
-// distributed under the License is distributed on an "AS IS" BASIS, 
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-// See the License for the specific language governing permissions and 
-// limitations under the License. 
- 
-// Provides _mm_crc32_u64/32/8 intrinsics. 
- 
-#ifndef CRCUTIL_CRC32C_SSE4_INTRIN_H_ 
-#define CRCUTIL_CRC32C_SSE4_INTRIN_H_ 
- 
-#include "platform.h" 
-#include "base_types.h" 
- 
-#if CRCUTIL_USE_MM_CRC32 && (HAVE_I386 || HAVE_AMD64) 
- 
-#if defined(_MSC_VER) || defined(__SSE4_2__) 
- 
-#if defined(_MSC_VER) 
-#pragma warning(push) 
-// '_M_IA64' is not defined as a preprocessor macro 
-#pragma warning(disable: 4668) 
-#endif  // defined(_MSC_VER) 
- 
-#include <nmmintrin.h> 
- 
-#if defined(_MSC_VER) 
-#pragma warning(pop) 
-#endif  // defined(_MSC_VER) 
- 
-#elif GCC_VERSION_AVAILABLE(4, 5) && !defined(CRCUTIL_FORCE_ASM_CRC32C) 
-// Allow the use of _mm_crc32_u* intrinsic when CRCUTIL_USE_MM_CRC32 
-// is set irrespective of "-msse*" settings. This way, the sources 
-// may be compiled with "-msse2 -mcrc32" and work on older CPUs, 
-// while taking full advantage of "crc32" instruction on newer 
-// CPUs (requires dynamic CPU detection). See "interface.cc". 
-// 
-// If neither -msse4 or -mcrc32 is provided and CRCUTIL_USE_MM_CRC32 is set 
-// and CRCUTIL_FORCE_ASM_CRC32 is not set, compile-time error will happen. 
-// Why? Becuase GCC disables __builtin_ia32_crc32* intrinsics when compiled 
-// without -msse4 or -mcrc32. -msse4 could be detected at run time by checking 
-// whether __SSE4_2__ is defined, but there is no way to tell whether the 
-// sources are compiled with -mcrc32. 
- 
-extern __inline unsigned int __attribute__(( 
-    __gnu_inline__, __always_inline__, __artificial__)) 
-_mm_crc32_u8(unsigned int __C, unsigned char __V) { 
-  return __builtin_ia32_crc32qi(__C, __V); 
-} 
-#ifdef __x86_64__ 
-extern __inline unsigned long long __attribute__(( 
-    __gnu_inline__, __always_inline__, __artificial__)) 
-_mm_crc32_u64(unsigned long long __C, unsigned long long __V) { 
-  return __builtin_ia32_crc32di(__C, __V); 
-} 
-#else 
-extern __inline unsigned int __attribute__(( 
-    __gnu_inline__, __always_inline__, __artificial__)) 
-_mm_crc32_u32(unsigned int __C, unsigned int __V) { 
-  return __builtin_ia32_crc32si (__C, __V); 
-} 
-#endif  // __x86_64__ 
- 
-#else 
- 
-// GCC 4.4.x and earlier: use inline asm. 
- 
-namespace crcutil { 
- 
-__forceinline uint64 _mm_crc32_u64(uint64 crc, uint64 value) { 
-  asm("crc32q %[value], %[crc]\n" : [crc] "+r" (crc) : [value] "rm" (value)); 
-  return crc; 
-} 
- 
-__forceinline uint32 _mm_crc32_u32(uint32 crc, uint64 value) { 
-  asm("crc32l %[value], %[crc]\n" : [crc] "+r" (crc) : [value] "rm" (value)); 
-  return crc; 
-} 
- 
-__forceinline uint32 _mm_crc32_u8(uint32 crc, uint8 value) { 
-  asm("crc32b %[value], %[crc]\n" : [crc] "+r" (crc) : [value] "rm" (value)); 
-  return crc; 
-} 
- 
-}  // namespace crcutil 
- 
-#endif 
- 
-#endif  // CRCUTIL_USE_MM_CRC32 && (HAVE_I386 || HAVE_AMD64) 
- 
-#endif  // CRCUTIL_CRC32C_SSE4_INTRIN_H_ 
+// Copyright 2010 Google Inc.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Provides _mm_crc32_u64/32/8 intrinsics.
+
+#ifndef CRCUTIL_CRC32C_SSE4_INTRIN_H_
+#define CRCUTIL_CRC32C_SSE4_INTRIN_H_
+
+#include "platform.h"
+#include "base_types.h"
+
+#if CRCUTIL_USE_MM_CRC32 && (HAVE_I386 || HAVE_AMD64)
+
+#if defined(_MSC_VER) || defined(__SSE4_2__)
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+// '_M_IA64' is not defined as a preprocessor macro
+#pragma warning(disable: 4668)
+#endif  // defined(_MSC_VER)
+
+#include <nmmintrin.h>
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif  // defined(_MSC_VER)
+
+#elif GCC_VERSION_AVAILABLE(4, 5) && !defined(CRCUTIL_FORCE_ASM_CRC32C)
+// Allow the use of _mm_crc32_u* intrinsic when CRCUTIL_USE_MM_CRC32
+// is set irrespective of "-msse*" settings. This way, the sources
+// may be compiled with "-msse2 -mcrc32" and work on older CPUs,
+// while taking full advantage of "crc32" instruction on newer
+// CPUs (requires dynamic CPU detection). See "interface.cc".
+//
+// If neither -msse4 or -mcrc32 is provided and CRCUTIL_USE_MM_CRC32 is set
+// and CRCUTIL_FORCE_ASM_CRC32 is not set, compile-time error will happen.
+// Why? Becuase GCC disables __builtin_ia32_crc32* intrinsics when compiled
+// without -msse4 or -mcrc32. -msse4 could be detected at run time by checking
+// whether __SSE4_2__ is defined, but there is no way to tell whether the
+// sources are compiled with -mcrc32.
+
+extern __inline unsigned int __attribute__((
+    __gnu_inline__, __always_inline__, __artificial__))
+_mm_crc32_u8(unsigned int __C, unsigned char __V) {
+  return __builtin_ia32_crc32qi(__C, __V);
+}
+#ifdef __x86_64__
+extern __inline unsigned long long __attribute__((
+    __gnu_inline__, __always_inline__, __artificial__))
+_mm_crc32_u64(unsigned long long __C, unsigned long long __V) {
+  return __builtin_ia32_crc32di(__C, __V);
+}
+#else
+extern __inline unsigned int __attribute__((
+    __gnu_inline__, __always_inline__, __artificial__))
+_mm_crc32_u32(unsigned int __C, unsigned int __V) {
+  return __builtin_ia32_crc32si (__C, __V);
+}
+#endif  // __x86_64__
+
+#else
+
+// GCC 4.4.x and earlier: use inline asm.
+
+namespace crcutil {
+
+__forceinline uint64 _mm_crc32_u64(uint64 crc, uint64 value) {
+  asm("crc32q %[value], %[crc]\n" : [crc] "+r" (crc) : [value] "rm" (value));
+  return crc;
+}
+
+__forceinline uint32 _mm_crc32_u32(uint32 crc, uint64 value) {
+  asm("crc32l %[value], %[crc]\n" : [crc] "+r" (crc) : [value] "rm" (value));
+  return crc;
+}
+
+__forceinline uint32 _mm_crc32_u8(uint32 crc, uint8 value) {
+  asm("crc32b %[value], %[crc]\n" : [crc] "+r" (crc) : [value] "rm" (value));
+  return crc;
+}
+
+}  // namespace crcutil
+
+#endif
+
+#endif  // CRCUTIL_USE_MM_CRC32 && (HAVE_I386 || HAVE_AMD64)
+
+#endif  // CRCUTIL_CRC32C_SSE4_INTRIN_H_
diff --git a/contrib/libs/crcutil/crc_casts.h b/contrib/libs/crcutil/crc_casts.h
index f732329978..a14044fea3 100644
--- a/contrib/libs/crcutil/crc_casts.h
+++ b/contrib/libs/crcutil/crc_casts.h
@@ -1,68 +1,68 @@
-// Copyright 2010 Google Inc.  All rights reserved. 
-// 
-// Licensed under the Apache License, Version 2.0 (the "License"); 
-// you may not use this file except in compliance with the License. 
-// You may obtain a copy of the License at 
-// 
-//      http://www.apache.org/licenses/LICENSE-2.0 
-// 
-// Unless required by applicable law or agreed to in writing, software 
-// distributed under the License is distributed on an "AS IS" BASIS, 
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-// See the License for the specific language governing permissions and 
-// limitations under the License. 
- 
-// Casting between integers and compound CRC types. 
- 
-#ifndef CRCUTIL_CRC_CASTS_H_ 
-#define CRCUTIL_CRC_CASTS_H_ 
- 
-#include "base_types.h"   // uint8, uint64 
-#include "platform.h"     // __forceinline 
- 
-namespace crcutil { 
- 
-// Downcasts a value of (oftentimes larger) Crc type to (smaller base integer) 
-// Result type, enabling specialized downcasts implemented by "large integer" 
-// classes (e.g. uint128_sse2). 
-template<typename Crc, typename Result> 
-__forceinline Result Downcast(const Crc &x) { 
-  return static_cast<Result>(x); 
-} 
- 
-// Extracts 8 least significant bits from a value of Crc type. 
-#define TO_BYTE(x) Downcast<Crc, uint8>(x) 
- 
-// Converts a pair of uint64 bit values into single value of CRC type. 
-// It is caller's responsibility to ensure that the input is correct. 
-template<typename Crc> 
-__forceinline Crc CrcFromUint64(uint64 lo, uint64 hi = 0) { 
-  if (sizeof(Crc) <= sizeof(lo)) { 
-    return static_cast<Crc>(lo); 
-  } else { 
-    // static_cast to keep compiler happy. 
-    Crc result = static_cast<Crc>(hi); 
-    result = SHIFT_LEFT_SAFE(result, 8 * sizeof(lo)); 
-    result ^= lo; 
-    return result; 
-  } 
-} 
- 
-// Converts Crc value to a pair of uint64 values. 
-template<typename Crc> 
-__forceinline void Uint64FromCrc(const Crc &crc, 
-                                 uint64 *lo, uint64 *hi = NULL) { 
-  if (sizeof(*lo) >= sizeof(crc)) { 
-    *lo = Downcast<Crc, uint64>(crc); 
-    if (hi != NULL) { 
-      *hi = 0; 
-    } 
-  } else { 
-    *lo = Downcast<Crc, uint64>(crc); 
-    *hi = Downcast<Crc, uint64>(SHIFT_RIGHT_SAFE(crc, 8 * sizeof(lo))); 
-  } 
-} 
- 
-}  // namespace crcutil 
- 
-#endif  // CRCUTIL_CRC_CASTS_H_ 
+// Copyright 2010 Google Inc.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Casting between integers and compound CRC types.
+
+#ifndef CRCUTIL_CRC_CASTS_H_
+#define CRCUTIL_CRC_CASTS_H_
+
+#include "base_types.h"   // uint8, uint64
+#include "platform.h"     // __forceinline
+
+namespace crcutil {
+
+// Downcasts a value of (oftentimes larger) Crc type to (smaller base integer)
+// Result type, enabling specialized downcasts implemented by "large integer"
+// classes (e.g. uint128_sse2).
+template<typename Crc, typename Result>
+__forceinline Result Downcast(const Crc &x) {
+  return static_cast<Result>(x);
+}
+
+// Extracts 8 least significant bits from a value of Crc type.
+#define TO_BYTE(x) Downcast<Crc, uint8>(x)
+
+// Converts a pair of uint64 bit values into single value of CRC type.
+// It is caller's responsibility to ensure that the input is correct.
+template<typename Crc>
+__forceinline Crc CrcFromUint64(uint64 lo, uint64 hi = 0) {
+  if (sizeof(Crc) <= sizeof(lo)) {
+    return static_cast<Crc>(lo);
+  } else {
+    // static_cast to keep compiler happy.
+    Crc result = static_cast<Crc>(hi);
+    result = SHIFT_LEFT_SAFE(result, 8 * sizeof(lo));
+    result ^= lo;
+    return result;
+  }
+}
+
+// Converts Crc value to a pair of uint64 values.
+template<typename Crc>
+__forceinline void Uint64FromCrc(const Crc &crc,
+                                 uint64 *lo, uint64 *hi = NULL) {
+  if (sizeof(*lo) >= sizeof(crc)) {
+    *lo = Downcast<Crc, uint64>(crc);
+    if (hi != NULL) {
+      *hi = 0;
+    }
+  } else {
+    *lo = Downcast<Crc, uint64>(crc);
+    *hi = Downcast<Crc, uint64>(SHIFT_RIGHT_SAFE(crc, 8 * sizeof(lo)));
+  }
+}
+
+}  // namespace crcutil
+
+#endif  // CRCUTIL_CRC_CASTS_H_
diff --git a/contrib/libs/crcutil/generic_crc.h b/contrib/libs/crcutil/generic_crc.h
index 4832005776..06af21c925 100644
--- a/contrib/libs/crcutil/generic_crc.h
+++ b/contrib/libs/crcutil/generic_crc.h
@@ -1,687 +1,687 @@
-// Copyright 2010 Google Inc.  All rights reserved. 
-// 
-// Licensed under the Apache License, Version 2.0 (the "License"); 
-// you may not use this file except in compliance with the License. 
-// You may obtain a copy of the License at 
-// 
-//      http://www.apache.org/licenses/LICENSE-2.0 
-// 
-// Unless required by applicable law or agreed to in writing, software 
-// distributed under the License is distributed on an "AS IS" BASIS, 
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-// See the License for the specific language governing permissions and 
-// limitations under the License. 
- 
-// Defines GenericCrc class which implements arbitrary CRCs. 
-// 
-// Please read crc.pdf to understand how it all works. 
- 
-#ifndef CRCUTIL_GENERIC_CRC_H_ 
-#define CRCUTIL_GENERIC_CRC_H_ 
- 
-#include "base_types.h"     // uint8 
-#include "crc_casts.h"      // TO_BYTE(), Downcast<>. 
-#include "gf_util.h"        // GfUtil<Crc> class. 
-#include "platform.h"       // GCC_ALIGN_ATTRIBUTE(16) 
-#include "uint128_sse2.h"   // uint128_sse2 type (if necessary) 
- 
-namespace crcutil { 
- 
-#pragma pack(push, 16) 
- 
-// Extends CRC by one byte. 
-// Technically, if degree of a polynomial does not exceed 8, 
-// right shift by 8 bits is not required, but who cares about CRC-8? 
-#define CRC_BYTE(table, crc, byte) do { \ 
-  crc = ((sizeof(crc) > 1) ? SHIFT_RIGHT_SAFE(crc, 8) : 0) ^ \ 
-        table->crc_word_[sizeof(Word) - 1][TO_BYTE(crc) ^ (byte)]; \ 
-} while (0) 
- 
-#define TABLE_ENTRY(table, byte, buf) \ 
-  table[byte][Downcast<Word, uint8>(buf)] 
- 
-#define TABLE_ENTRY_LAST(table, buf) \ 
-  table[sizeof(Word) - 1][buf] 
- 
-// Extends CRC by one word. 
-#define CRC_WORD(table, crc, buf) do { \ 
-  buf ^= Downcast<Crc, Word>(crc); \ 
-  if (sizeof(crc) > sizeof(buf)) { \ 
-    crc = SHIFT_RIGHT_SAFE(crc, sizeof(buf) * 8); \ 
-    crc ^= TABLE_ENTRY(table->crc_word_, 0, buf); \ 
-  } else { \ 
-    crc = TABLE_ENTRY(table->crc_word_, 0, buf); \ 
-  } \ 
-  buf >>= 8; \ 
-  for (size_t byte = 1; byte < sizeof(buf) - 1; ++byte) { \ 
-    crc ^= TABLE_ENTRY(table->crc_word_, byte, buf); \ 
-    buf >>= 8; \ 
-  } \ 
-  crc ^= TABLE_ENTRY_LAST(table->crc_word_, buf); \ 
-} while (0) 
- 
-// Process beginning of data block byte by byte until source pointer 
-// becomes perfectly aligned on Word boundary. 
-#define ALIGN_ON_WORD_BOUNDARY(table, src, end, crc, Word) do { \ 
-  while ((reinterpret_cast<size_t>(src) & (sizeof(Word) - 1)) != 0) { \ 
-    if (src >= end) { \ 
-      return (crc ^ table->Base().Canonize()); \ 
-    } \ 
-    CRC_BYTE(table, crc, *src); \ 
-    src += 1; \ 
-  } \ 
-} while (0) 
- 
- 
-// On amd64, enforcing alignment is 2-4% slower on small (<= 64 bytes) blocks 
-// but 6-10% faster on larger blocks (>= 2KB). 
-// Break-even point (+-1%) is around 1KB (Q9650, E6600). 
-// 
-#define ALIGN_ON_WORD_BOUNDARY_IF_NEEDED(bytes, table, src, end, crc, Word) \ 
-do { \ 
-  if (sizeof(Word) > 8 || (bytes) > CRCUTIL_MIN_ALIGN_SIZE) { \ 
-    ALIGN_ON_WORD_BOUNDARY(table, src, end, crc, Word); \ 
-  } \ 
-} while (0) 
- 
-#if defined(_MSC_VER) 
-#pragma warning(push) 
-#pragma warning(disable: 4127)  // conditional expression is constant 
-#endif  // defined(_MSC_VER) 
- 
-// Forward declarations. 
-template<typename CrcImplementation> class RollingCrc; 
- 
-// Crc        is the type used internally and to return values of N-bit CRC. 
-//            It should be at least as large as "TableEntry" and "Word" but 
-//            may be larger (e.g. for 16-bit CRC, TableEntry and Word may be 
-//            set to uint16 but Crc may be set to uint32). 
-// 
-// TableEntry is the type of values stored in the tables. 
-//            To implement N-bit CRC, TableEntry should be large enough 
-//            to store N bits. 
-// 
-// Word       is the type used to read data sizeof(Word) at a time. 
-//            Ideally, it shoulde be "most suitable for given architecture" 
-//            integer type -- typically "size_t". 
-// 
-// kStride    is the number of words processed in interleaved manner by 
-//            CrcMultiword() and CrcWordblock(). Shall be either 3 or 4. 
-//            Optimal value depends on hardware architecture (AMD64, ARM, etc). 
-// 
-template<typename _Crc, typename _TableEntry, typename _Word, int kStride> 
-    class GenericCrc { 
- public: 
-  // Make Crc, TableEntry, and Word types visible (used by RollingCrc etc.) 
-  typedef _Crc Crc; 
-  typedef _TableEntry TableEntry; 
-  typedef _Word Word; 
- 
-  GenericCrc() {} 
- 
-  // Initializes the tables given generating polynomial of degree. 
-  // If "canonical" is true, crc value will be XOR'ed with (-1) before and 
-  // after actual CRC computation. 
-  GenericCrc(const Crc &generating_polynomial, size_t degree, bool canonical) { 
-    Init(generating_polynomial, degree, canonical); 
-  } 
-  void Init(const Crc &generating_polynomial, size_t degree, bool canonical) { 
-    base_.Init(generating_polynomial, degree, canonical); 
- 
-    // Instead of computing 
-    //    table[j][i] = MultiplyUnnormalized(i, 8, k), 
-    // for all i = 0...255, we may notice that 
-    // if i = 2**n then for all m = 1...(i-1) 
-    // MultiplyUnnormalized(i + m, 8, k) = 
-    //    MultiplyUnnormalized(i ^ m, 8, k) = 
-    //    MultiplyUnnormalized(i, 8, k) ^ MultiplyUnnormalized(m, 8, k) = 
-    //    MultiplyUnnormalized(i, 8, k) ^ crc_word_interleaved[j][m] = 
-    //    table[i] ^ table[m]. 
-#if 0 
-    for (size_t j = 0; j < sizeof(Word); ++j) { 
-      Crc k = Base().XpowN((sizeof(Word) * kStride - 1 - j) * 8 + degree); 
-      for (size_t i = 0; i < 256; ++i) { 
-        Crc temp = Base().MultiplyUnnormalized(static_cast<Crc>(i), 8, k); 
-        this->crc_word_interleaved_[j][i] = Downcast<Crc, TableEntry>(temp); 
-      } 
-    } 
-#else 
-    for (size_t j = 0; j < sizeof(Word); ++j) { 
-      Crc k = Base().XpowN((sizeof(Word) * kStride - 1 - j) * 8 + degree); 
-      TableEntry *table = this->crc_word_interleaved_[j]; 
-      table[0] = 0;  // Init 0s entry -- multiply 0 by anything yields 0. 
-      for (size_t i = 1; i < 256; i <<= 1) { 
-        TableEntry value = Downcast<Crc, TableEntry>( 
-            Base().MultiplyUnnormalized(static_cast<Crc>(i), 8, k)); 
-        table[i] = value; 
-        for (size_t m = 1; m < i; ++m) { 
-          table[i + m] = value ^ table[m]; 
-        } 
-      } 
-    } 
-#endif 
- 
-#if 0 
-    for (size_t j = 0; j < sizeof(Word); ++j) { 
-      Crc k = Base().XpowN((sizeof(Word) - 1 - j) * 8 + degree); 
-      for (size_t i = 0; i < 256; ++i) { 
-        Crc temp = Base().MultiplyUnnormalized(static_cast<Crc>(i), 8, k); 
-        this->crc_word_[j][i] = Downcast<Crc, TableEntry>(temp); 
-      } 
-    } 
-#else 
-    for (size_t j = 0; j < sizeof(Word); ++j) { 
-      Crc k = Base().XpowN((sizeof(Word) - 1 - j) * 8 + degree); 
-      TableEntry *table = this->crc_word_[j]; 
-      table[0] = 0;  // Init 0s entry -- multiply 0 by anything yields 0. 
-      for (size_t i = 1; i < 256; i <<= 1) { 
-        TableEntry value = Downcast<Crc, TableEntry>( 
-            Base().MultiplyUnnormalized(static_cast<Crc>(i), 8, k)); 
-        table[i] = value; 
-        for (size_t m = 1; m < i; ++m) { 
-          table[i + m] = value ^ table[m]; 
-        } 
-      } 
-    } 
-#endif 
-  } 
- 
-  // Default CRC implementation 
-  Crc CrcDefault(const void *data, size_t bytes, const Crc &start) const { 
-#if HAVE_AMD64 || HAVE_I386 
-    return CrcMultiword(data, bytes, start); 
-#else 
-    // Very few CPUs have multiple ALUs and speculative execution 
-    // (Itanium is an exception) so sophisticated algorithms will 
-    // not perform better than good old Sarwate algorithm. 
-    return CrcByteUnrolled(data, bytes, start); 
-#endif  // HAVE_AMD64 || HAVE_I386 
-  } 
- 
-  // Returns base class. 
-  const GfUtil<Crc> &Base() const { return base_; } 
- 
- protected: 
-  // Canonical, byte-by-byte CRC computation. 
-  Crc CrcByte(const void *data, size_t bytes, const Crc &start) const { 
-    const uint8 *src = static_cast<const uint8 *>(data); 
-    Crc crc = start ^ Base().Canonize(); 
-    for (const uint8 *end = src + bytes; src < end; ++src) { 
-      CRC_BYTE(this, crc, *src); 
-    } 
-    return (crc ^ Base().Canonize()); 
-  } 
- 
-  // Byte-by-byte CRC with main loop unrolled. 
-  Crc CrcByteUnrolled(const void *data, size_t bytes, const Crc &start) const { 
-    if (bytes == 0) { 
-      return start; 
-    } 
- 
-    const uint8 *src = static_cast<const uint8 *>(data); 
-    const uint8 *end = src + bytes; 
-    Crc crc = start ^ Base().Canonize(); 
- 
-    // Unroll loop 4 times. 
-    end -= 3; 
-    for (; src < end; src += 4) { 
-      PREFETCH(src); 
-      CRC_BYTE(this, crc, src[0]); 
-      CRC_BYTE(this, crc, src[1]); 
-      CRC_BYTE(this, crc, src[2]); 
-      CRC_BYTE(this, crc, src[3]); 
-    } 
-    end += 3; 
- 
-    // Compute CRC of remaining bytes. 
-    for (; src < end; ++src) { 
-      CRC_BYTE(this, crc, *src); 
-    } 
- 
-    return (crc ^ Base().Canonize()); 
-  } 
- 
-  // Canonical, byte-by-byte CRC computation. 
-  Crc CrcByteWord(const void *data, size_t bytes, const Crc &start) const { 
-    const uint8 *src = static_cast<const uint8 *>(data); 
-    const uint8 *end = src + bytes; 
-    Crc crc0 = start ^ Base().Canonize(); 
- 
-    ALIGN_ON_WORD_BOUNDARY_IF_NEEDED(bytes, this, src, end, crc0, Crc); 
-    if (src >= end) { 
-      return (crc0 ^ Base().Canonize()); 
-    } 
- 
-    // Process 4*sizeof(Crc) bytes at a time. 
-    end -= 4 * sizeof(Crc) - 1; 
-    for (; src < end; src += 4 * sizeof(Crc)) { 
-      for (size_t i = 0; i < 4; ++i) { 
-        crc0 ^= reinterpret_cast<const Crc *>(src)[i]; 
-        if (i == 0) { 
-          PREFETCH(src); 
-        } 
-        for (size_t byte = 0; byte < sizeof(crc0); ++byte) { 
-          CRC_BYTE(this, crc0, 0); 
-        } 
-      } 
-    } 
-    end += 4 * sizeof(Crc) - 1; 
- 
-    // Process sizeof(Crc) bytes at a time. 
-    end -= sizeof(Crc) - 1; 
-    for (; src < end; src += sizeof(Crc)) { 
-      crc0 ^= reinterpret_cast<const Crc *>(src)[0]; 
-      for (size_t byte = 0; byte < sizeof(crc0); ++byte) { 
-        CRC_BYTE(this, crc0, 0); 
-      } 
-    } 
-    end += sizeof(Crc) - 1; 
- 
-    // Compute CRC of remaining bytes. 
-    for (;src < end; ++src) { 
-      CRC_BYTE(this, crc0, *src); 
-    } 
- 
-    return (crc0 ^ Base().Canonize()); 
-  } 
- 
-  // Faster, word-by-word CRC. 
-  Crc CrcWord(const void *data, size_t bytes, const Crc &start) const { 
-    const uint8 *src = static_cast<const uint8 *>(data); 
-    const uint8 *end = src + bytes; 
-    Crc crc0 = start ^ Base().Canonize(); 
- 
-    ALIGN_ON_WORD_BOUNDARY_IF_NEEDED(bytes, this, src, end, crc0, Word); 
-    if (src >= end) { 
-      return (crc0 ^ Base().Canonize()); 
-    } 
- 
-    // Process 4 sizeof(Word) bytes at once. 
-    end -= 4 * sizeof(Word) - 1; 
-    for (; src < end; src += 4 * sizeof(Word)) { 
-      Word buf0 = reinterpret_cast<const Word *>(src)[0]; 
-      PREFETCH(src); 
-      CRC_WORD(this, crc0, buf0); 
-      buf0 = reinterpret_cast<const Word *>(src)[1]; 
-      CRC_WORD(this, crc0, buf0); 
-      buf0 = reinterpret_cast<const Word *>(src)[2]; 
-      CRC_WORD(this, crc0, buf0); 
-      buf0 = reinterpret_cast<const Word *>(src)[3]; 
-      CRC_WORD(this, crc0, buf0); 
-    } 
-    end += 4 * sizeof(Word) - 1; 
- 
-    // Process sizeof(Word) bytes at a time. 
-    end -= sizeof(Word) - 1; 
-    for (; src < end; src += sizeof(Word)) { 
-      Word buf0 = reinterpret_cast<const Word *>(src)[0]; 
-      CRC_WORD(this, crc0, buf0); 
-    } 
-    end += sizeof(Word) - 1; 
- 
-    // Compute CRC of remaining bytes. 
-    for (;src < end; ++src) { 
-      CRC_BYTE(this, crc0, *src); 
-    } 
- 
-    return (crc0 ^ Base().Canonize()); 
-  } 
- 
-#define REPEAT_FROM_1(macro) \ 
-  macro(1); \ 
-  macro(2); \ 
-  macro(3); \ 
-  macro(4); \ 
-  macro(5); \ 
-  macro(6); \ 
-  macro(7); 
- 
-#define REPEAT_FROM_0(macro) \ 
-  macro(0); \ 
-  REPEAT_FROM_1(macro) 
- 
-  // Faster, process adjusent blocks in parallel and concatenate CRCs. 
-  Crc CrcBlockword(const void *data, size_t bytes, const Crc &start) const { 
-    if (kStride < 2 || kStride > 8) { 
-      // Unsupported configuration; 
-      // fall back to something sensible. 
-      return CrcWord(data, bytes, start); 
-    } 
- 
-    const uint8 *src = static_cast<const uint8 *>(data); 
-    const uint8 *end = src + bytes; 
-    Crc crc0 = start ^ Base().Canonize(); 
-    enum { 
-      // Add 16 to avoid false L1 cache collisions. 
-      kStripe = (15*1024 + 16) & ~(sizeof(Word) - 1), 
-    }; 
- 
-    ALIGN_ON_WORD_BOUNDARY_IF_NEEDED(bytes, this, src, end, crc0, Word); 
-    if (src >= end) { 
-      return (crc0 ^ Base().Canonize()); 
-    } 
- 
-    end -= kStride * kStripe - 1; 
-    if (src < end) { 
-      Crc x_pow_8kStripe = Base().Xpow8N(kStripe); 
-      do { 
-        const uint8 *stripe_end = src + kStripe; 
- 
-#define INIT_CRC(reg) \ 
-        Crc crc##reg; \ 
-        if (kStride >= reg) { \ 
-          crc##reg = 0; \ 
-        } 
-        REPEAT_FROM_1(INIT_CRC); 
-#undef INIT_CRC 
- 
-        do { 
-#define FIRST(reg) \ 
-          Word buf##reg; \ 
-          if (kStride > reg) { \ 
-            buf##reg = reinterpret_cast<const Word *>(src + reg * kStripe)[0]; \ 
-            buf##reg ^= Downcast<Crc, Word>(crc##reg); \ 
-            if (sizeof(crc##reg) > sizeof(buf##reg)) { \ 
-              crc##reg = SHIFT_RIGHT_SAFE(crc##reg, sizeof(buf##reg) * 8); \ 
-              crc##reg ^= TABLE_ENTRY(this->crc_word_, 0, buf##reg); \ 
-            } else { \ 
-              crc##reg = TABLE_ENTRY(this->crc_word_, 0, buf##reg); \ 
-            } \ 
-            buf##reg >>= 8; \ 
-          } 
-          REPEAT_FROM_0(FIRST); 
-#undef FIRST 
- 
-          for (size_t byte = 1; byte < sizeof(buf0) - 1; ++byte) { 
-#define NEXT(reg) do { \ 
-            if (kStride > reg) { \ 
-              crc##reg ^= TABLE_ENTRY(this->crc_word_, byte, buf##reg); \ 
-              buf##reg >>= 8; \ 
-            } \ 
-} while (0) 
-            REPEAT_FROM_0(NEXT); 
-#undef NEXT 
-          } 
- 
-#define LAST(reg) do { \ 
-          if (kStride > reg) { \ 
-            crc##reg ^= TABLE_ENTRY_LAST(this->crc_word_, buf##reg); \ 
-          } \ 
-} while (0) 
-          REPEAT_FROM_0(LAST); 
-#undef LAST 
- 
-          src += sizeof(Word); 
-        } while (src < stripe_end); 
- 
-#if 0 
-// The code is left for illustrational purposes only. 
-#define COMBINE(reg) do { \ 
-        if (reg > 0 && kStride > reg) { \ 
-          crc0 = Base().ChangeStartValue(crc##reg, kStripe, 0, crc0); \ 
-        } \ 
-} while (0) 
-#else 
-#define COMBINE(reg) do { \ 
-        if (reg > 0 && kStride > reg) { \ 
-          crc0 = crc##reg ^ Base().Multiply(crc0, x_pow_8kStripe); \ 
-        } \ 
-} while (0) 
-#endif 
-        REPEAT_FROM_0(COMBINE); 
-#undef COMBINE 
- 
-        src += (kStride - 1) * kStripe; 
-      } 
-      while (src < end); 
-    } 
-    end += kStride * kStripe - 1; 
- 
-    // Process sizeof(Word) bytes at a time. 
-    end -= sizeof(Word) - 1; 
-    for (; src < end; src += sizeof(Word)) { 
-      Word buf0 = reinterpret_cast<const Word *>(src)[0]; 
-      CRC_WORD(this, crc0, buf0); 
-    } 
-    end += sizeof(Word) - 1; 
- 
-    // Compute CRC of remaining bytes. 
-    for (;src < end; ++src) { 
-      CRC_BYTE(this, crc0, *src); 
-    } 
- 
-    return (crc0 ^ Base().Canonize()); 
-  } 
- 
-  // Fastest, interleaved multi-byte CRC. 
-  Crc CrcMultiword(const void *data, size_t bytes, const Crc &start) const { 
-    if (kStride < 2 || kStride > 8) { 
-      // Unsupported configuration; 
-      // fall back to something sensible. 
-      return CrcWord(data, bytes, start); 
-    } 
- 
-    const uint8 *src = static_cast<const uint8 *>(data); 
-    const uint8 *end = src + bytes; 
-    Crc crc0 = start ^ Base().Canonize(); 
- 
-    ALIGN_ON_WORD_BOUNDARY_IF_NEEDED(bytes, this, src, end, crc0, Word); 
-    if (src >= end) { 
-      return (crc0 ^ Base().Canonize()); 
-    } 
- 
-    // Process kStride Word registers at once; 
-    // should have have at least 2*kInterleaveBytes of data to start. 
-    end -= 2*kInterleaveBytes - 1; 
-    if (src < end) { 
-      Crc crc_carryover; 
-      if (sizeof(Crc) > sizeof(Word)) { 
-        // crc_carryover is used if and only if Crc is wider than Word. 
-        crc_carryover = 0; 
-      } 
-#define INIT_CRC(reg) \ 
-      Crc crc##reg; \ 
-      if (reg > 0 && kStride > reg) { \ 
-        crc##reg = 0; \ 
-      } 
-      REPEAT_FROM_1(INIT_CRC); 
-#undef INIT_CRC 
- 
-#define INIT_BUF(reg) \ 
-      Word buf##reg; \ 
-      if (kStride > reg) { \ 
-        buf##reg = reinterpret_cast<const Word *>(src)[reg]; \ 
-      } 
-      REPEAT_FROM_0(INIT_BUF); 
-#undef INIT_BUF 
- 
-      do { 
-        PREFETCH(src); 
-        src += kInterleaveBytes; 
- 
-        if (sizeof(Crc) > sizeof(Word)) { 
-          crc0 ^= crc_carryover; 
-        } 
- 
-#define FIRST(reg, next_reg) do { \ 
-        if (kStride > reg) { \ 
-          buf##reg ^= Downcast<Crc, Word>(crc##reg); \ 
-          if (sizeof(Crc) > sizeof(Word)) { \ 
-            if (reg < kStride - 1) { \ 
-              crc##next_reg ^= SHIFT_RIGHT_SAFE(crc##reg, 8 * sizeof(buf0)); \ 
-            } else { \ 
-              crc_carryover = SHIFT_RIGHT_SAFE(crc##reg, 8 * sizeof(buf0)); \ 
-            } \ 
-          } \ 
-          crc##reg = TABLE_ENTRY(this->crc_word_interleaved_, 0, buf##reg); \ 
-          buf##reg >>= 8; \ 
-        } \ 
-} while (0) 
-        FIRST(0, 1); 
-        FIRST(1, 2); 
-        FIRST(2, 3); 
-        FIRST(3, 4); 
-        FIRST(4, 5); 
-        FIRST(5, 6); 
-        FIRST(6, 7); 
-        FIRST(7, 0); 
-#undef FIRST 
- 
-        for (size_t byte = 1; byte < sizeof(Word) - 1; ++byte) { 
-#define NEXT(reg) do { \ 
-          if (kStride > reg) { \ 
-            crc##reg ^= \ 
-                TABLE_ENTRY(this->crc_word_interleaved_, byte, buf##reg); \ 
-            buf##reg >>= 8; \ 
-          } \ 
-} while(0) 
-          REPEAT_FROM_0(NEXT); 
-#undef NEXT 
-        } 
- 
-#define LAST(reg) do { \ 
-        if (kStride > reg) { \ 
-          crc##reg ^= TABLE_ENTRY_LAST(this->crc_word_interleaved_, buf##reg); \ 
-          buf##reg = reinterpret_cast<const Word *>(src)[reg]; \ 
-        } \ 
-} while(0) 
-        REPEAT_FROM_0(LAST); 
-#undef LAST 
-      } 
-      while (src < end); 
- 
-      if (sizeof(Crc) > sizeof(Word)) { 
-        crc0 ^= crc_carryover; 
-      } 
- 
-#define COMBINE(reg) do { \ 
-      if (kStride > reg) { \ 
-        if (reg != 0) { \ 
-          crc0 ^= crc##reg; \ 
-        } \ 
-        CRC_WORD(this, crc0, buf##reg); \ 
-      } \ 
-} while (0) 
-      REPEAT_FROM_0(COMBINE); 
-#undef COMBINE 
- 
-      src += kInterleaveBytes; 
-    } 
-    end += 2*kInterleaveBytes - 1; 
- 
-    // Process sizeof(Word) bytes at once. 
-    end -= sizeof(Word) - 1; 
-    for (; src < end; src += sizeof(Word)) { 
-      Word buf0 = reinterpret_cast<const Word *>(src)[0]; 
-      CRC_WORD(this, crc0, buf0); 
-    } 
-    end += sizeof(Word) - 1; 
- 
-    // Compute CRC of remaining bytes. 
-    for (;src < end; ++src) { 
-      CRC_BYTE(this, crc0, *src); 
-    } 
- 
-    return (crc0 ^ Base().Canonize()); 
-  } 
- 
- protected: 
-  enum { 
-    kInterleaveBytes = sizeof(Word) * kStride, 
-  }; 
- 
-  // Multiplication tables used by CRCs. 
-  TableEntry crc_word_interleaved_[sizeof(Word)][256]; 
-  TableEntry crc_word_[sizeof(Word)][256]; 
- 
-  // Base class stored after CRC tables so that the most frequently 
-  // used table is at offset 0 and may be accessed faster. 
-  GfUtil<Crc> base_; 
- 
-  friend class RollingCrc< GenericCrc<Crc, TableEntry, Word, kStride> >; 
- 
- private: 
-  // CrcMultiword on amd64 may run at 1.2 CPU cycles per byte which is 
-  // noticeably faster than CrcWord (2.2-2.6 cycles/byte depending on 
-  // hardware and compiler). However, there are problems with compilers. 
-  // 
-  // Test system: P45 chipset, Intel Q9650 CPU, 800MHz 4-4-4-12 memory. 
-  // 
-  // 64-bit compiler, <= 64-bit CRC, 64-bit tables, 64-bit reads: 
-  // CL 15.00.307291.1  C++   >1.2< CPU cycles/byte 
-  // ICL 11.1.051 -O3   C++    1.5  CPU cycles/byte 
-  // GCC 4.5 -O3        C++    2.0  CPU cycles/byte 
-  // GCC 4.x -O3        ASM   >1.2< CPU cycles/byte 
-  // 
-  // 32-bit compiler, MMX used, <= 64-bit CRC, 64-bit tables, 64-bit reads 
-  // CL 15.00.307291.1  C++   2.0  CPU cycles/byte 
-  // GCC 4.5 -O3        C++   1.9  CPU cycles/byte 
-  // ICL 11.1.051 -S    C++   1.6  CPU cycles/byte 
-  // GCC 4.x -O3        ASM  >1.3< CPU cycles/byte 
-  // 
-  // So, use inline ASM code for GCC for both i386 and amd64. 
- 
-  Crc CrcMultiwordI386Mmx( 
-          const void *data, size_t bytes, const Crc &start) const; 
-  Crc CrcMultiwordGccAmd64( 
-          const void *data, size_t bytes, const Crc &start) const; 
-  Crc CrcMultiwordGccAmd64Sse2( 
-          const uint8 *src, const uint8 *end, const Crc &start) const; 
-} GCC_ALIGN_ATTRIBUTE(16); 
- 
-#undef REPEAT_FROM_0 
-#undef REPEAT_FROM_1 
- 
- 
-// Specialized variants. 
-#if CRCUTIL_USE_ASM 
- 
-#if (defined(__GNUC__) && (HAVE_AMD64 || (HAVE_I386 && HAVE_MMX))) 
- 
-// Declare specialized functions. 
-template<> uint64 GenericCrc<uint64, uint64, uint64, 4>::CrcMultiword( 
-    const void *data, size_t bytes, const uint64 &start) const; 
- 
-#if HAVE_AMD64 && HAVE_SSE2 
-template<> 
-uint128_sse2 
-GenericCrc<uint128_sse2, uint128_sse2, uint64, 4>::CrcMultiword( 
-    const void *data, size_t bytes, const uint128_sse2 &start) const; 
-#endif  // HAVE_AMD64 && HAVE_SSE2 
- 
-#elif defined(_MSC_FULL_VER) && _MSC_FULL_VER <= 150030729 && \ 
-      (HAVE_I386 && HAVE_MMX) 
- 
-// Work around bug in MSC (present at least in v. 15.00.30729.1) 
-template<> uint64 GenericCrc<uint64, uint64, uint64, 4>::CrcMultiwordI386Mmx( 
-    const void *data, 
-    size_t bytes, 
-    const uint64 &start) const; 
-template<> __forceinline 
-uint64 GenericCrc<uint64, uint64, uint64, 4>::CrcMultiword( 
-    const void *data, 
-    size_t bytes, 
-    const uint64 &start) const { 
-  typedef uint64 Word; 
-  typedef uint64 Crc; 
-  if (bytes <= 12) { 
-    const uint8 *src = static_cast<const uint8 *>(data); 
-    uint64 crc = start ^ Base().Canonize(); 
-    for (const uint8 *end = src + bytes; src < end; ++src) { 
-      CRC_BYTE(this, crc, *src); 
-    } 
-    return (crc ^ Base().Canonize()); 
-  } 
-  return CrcMultiwordI386Mmx(data, bytes, start); 
-} 
- 
-#endif  // (defined(__GNUC__) && (HAVE_AMD64 || (HAVE_I386 && HAVE_MMX))) 
- 
-#endif  // CRCUTIL_USE_ASM 
- 
- 
-#pragma pack(pop) 
- 
-}  // namespace crcutil 
- 
-#endif  // CRCUTIL_GENERIC_CRC_H_ 
+// Copyright 2010 Google Inc.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Defines GenericCrc class which implements arbitrary CRCs.
+//
+// Please read crc.pdf to understand how it all works.
+
+#ifndef CRCUTIL_GENERIC_CRC_H_
+#define CRCUTIL_GENERIC_CRC_H_
+
+#include "base_types.h"     // uint8
+#include "crc_casts.h"      // TO_BYTE(), Downcast<>.
+#include "gf_util.h"        // GfUtil<Crc> class.
+#include "platform.h"       // GCC_ALIGN_ATTRIBUTE(16)
+#include "uint128_sse2.h"   // uint128_sse2 type (if necessary)
+
+namespace crcutil {
+
+#pragma pack(push, 16)
+
+// Extends CRC by one byte.
+// Technically, if degree of a polynomial does not exceed 8,
+// right shift by 8 bits is not required, but who cares about CRC-8?
+#define CRC_BYTE(table, crc, byte) do { \
+  crc = ((sizeof(crc) > 1) ? SHIFT_RIGHT_SAFE(crc, 8) : 0) ^ \
+        table->crc_word_[sizeof(Word) - 1][TO_BYTE(crc) ^ (byte)]; \
+} while (0)
+
+#define TABLE_ENTRY(table, byte, buf) \
+  table[byte][Downcast<Word, uint8>(buf)]
+
+#define TABLE_ENTRY_LAST(table, buf) \
+  table[sizeof(Word) - 1][buf]
+
+// Extends CRC by one word.
+#define CRC_WORD(table, crc, buf) do { \
+  buf ^= Downcast<Crc, Word>(crc); \
+  if (sizeof(crc) > sizeof(buf)) { \
+    crc = SHIFT_RIGHT_SAFE(crc, sizeof(buf) * 8); \
+    crc ^= TABLE_ENTRY(table->crc_word_, 0, buf); \
+  } else { \
+    crc = TABLE_ENTRY(table->crc_word_, 0, buf); \
+  } \
+  buf >>= 8; \
+  for (size_t byte = 1; byte < sizeof(buf) - 1; ++byte) { \
+    crc ^= TABLE_ENTRY(table->crc_word_, byte, buf); \
+    buf >>= 8; \
+  } \
+  crc ^= TABLE_ENTRY_LAST(table->crc_word_, buf); \
+} while (0)
+
+// Process beginning of data block byte by byte until source pointer
+// becomes perfectly aligned on Word boundary.
+#define ALIGN_ON_WORD_BOUNDARY(table, src, end, crc, Word) do { \
+  while ((reinterpret_cast<size_t>(src) & (sizeof(Word) - 1)) != 0) { \
+    if (src >= end) { \
+      return (crc ^ table->Base().Canonize()); \
+    } \
+    CRC_BYTE(table, crc, *src); \
+    src += 1; \
+  } \
+} while (0)
+
+
+// On amd64, enforcing alignment is 2-4% slower on small (<= 64 bytes) blocks
+// but 6-10% faster on larger blocks (>= 2KB).
+// Break-even point (+-1%) is around 1KB (Q9650, E6600).
+//
+#define ALIGN_ON_WORD_BOUNDARY_IF_NEEDED(bytes, table, src, end, crc, Word) \
+do { \
+  if (sizeof(Word) > 8 || (bytes) > CRCUTIL_MIN_ALIGN_SIZE) { \
+    ALIGN_ON_WORD_BOUNDARY(table, src, end, crc, Word); \
+  } \
+} while (0)
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable: 4127)  // conditional expression is constant
+#endif  // defined(_MSC_VER)
+
+// Forward declarations.
+template<typename CrcImplementation> class RollingCrc;
+
+// Crc        is the type used internally and to return values of N-bit CRC.
+//            It should be at least as large as "TableEntry" and "Word" but
+//            may be larger (e.g. for 16-bit CRC, TableEntry and Word may be
+//            set to uint16 but Crc may be set to uint32).
+//
+// TableEntry is the type of values stored in the tables.
+//            To implement N-bit CRC, TableEntry should be large enough
+//            to store N bits.
+//
+// Word       is the type used to read data sizeof(Word) at a time.
+//            Ideally, it shoulde be "most suitable for given architecture"
+//            integer type -- typically "size_t".
+//
+// kStride    is the number of words processed in interleaved manner by
+//            CrcMultiword() and CrcWordblock(). Shall be either 3 or 4.
+//            Optimal value depends on hardware architecture (AMD64, ARM, etc).
+//
+template<typename _Crc, typename _TableEntry, typename _Word, int kStride>
+    class GenericCrc {
+ public:
+  // Make Crc, TableEntry, and Word types visible (used by RollingCrc etc.)
+  typedef _Crc Crc;
+  typedef _TableEntry TableEntry;
+  typedef _Word Word;
+
+  GenericCrc() {}
+
+  // Initializes the tables given generating polynomial of degree.
+  // If "canonical" is true, crc value will be XOR'ed with (-1) before and
+  // after actual CRC computation.
+  GenericCrc(const Crc &generating_polynomial, size_t degree, bool canonical) {
+    Init(generating_polynomial, degree, canonical);
+  }
+  void Init(const Crc &generating_polynomial, size_t degree, bool canonical) {
+    base_.Init(generating_polynomial, degree, canonical);
+
+    // Instead of computing
+    //    table[j][i] = MultiplyUnnormalized(i, 8, k),
+    // for all i = 0...255, we may notice that
+    // if i = 2**n then for all m = 1...(i-1)
+    // MultiplyUnnormalized(i + m, 8, k) =
+    //    MultiplyUnnormalized(i ^ m, 8, k) =
+    //    MultiplyUnnormalized(i, 8, k) ^ MultiplyUnnormalized(m, 8, k) =
+    //    MultiplyUnnormalized(i, 8, k) ^ crc_word_interleaved[j][m] =
+    //    table[i] ^ table[m].
+#if 0
+    for (size_t j = 0; j < sizeof(Word); ++j) {
+      Crc k = Base().XpowN((sizeof(Word) * kStride - 1 - j) * 8 + degree);
+      for (size_t i = 0; i < 256; ++i) {
+        Crc temp = Base().MultiplyUnnormalized(static_cast<Crc>(i), 8, k);
+        this->crc_word_interleaved_[j][i] = Downcast<Crc, TableEntry>(temp);
+      }
+    }
+#else
+    for (size_t j = 0; j < sizeof(Word); ++j) {
+      Crc k = Base().XpowN((sizeof(Word) * kStride - 1 - j) * 8 + degree);
+      TableEntry *table = this->crc_word_interleaved_[j];
+      table[0] = 0;  // Init 0s entry -- multiply 0 by anything yields 0.
+      for (size_t i = 1; i < 256; i <<= 1) {
+        TableEntry value = Downcast<Crc, TableEntry>(
+            Base().MultiplyUnnormalized(static_cast<Crc>(i), 8, k));
+        table[i] = value;
+        for (size_t m = 1; m < i; ++m) {
+          table[i + m] = value ^ table[m];
+        }
+      }
+    }
+#endif
+
+#if 0
+    for (size_t j = 0; j < sizeof(Word); ++j) {
+      Crc k = Base().XpowN((sizeof(Word) - 1 - j) * 8 + degree);
+      for (size_t i = 0; i < 256; ++i) {
+        Crc temp = Base().MultiplyUnnormalized(static_cast<Crc>(i), 8, k);
+        this->crc_word_[j][i] = Downcast<Crc, TableEntry>(temp);
+      }
+    }
+#else
+    for (size_t j = 0; j < sizeof(Word); ++j) {
+      Crc k = Base().XpowN((sizeof(Word) - 1 - j) * 8 + degree);
+      TableEntry *table = this->crc_word_[j];
+      table[0] = 0;  // Init 0s entry -- multiply 0 by anything yields 0.
+      for (size_t i = 1; i < 256; i <<= 1) {
+        TableEntry value = Downcast<Crc, TableEntry>(
+            Base().MultiplyUnnormalized(static_cast<Crc>(i), 8, k));
+        table[i] = value;
+        for (size_t m = 1; m < i; ++m) {
+          table[i + m] = value ^ table[m];
+        }
+      }
+    }
+#endif
+  }
+
+  // Default CRC implementation
+  Crc CrcDefault(const void *data, size_t bytes, const Crc &start) const {
+#if HAVE_AMD64 || HAVE_I386
+    return CrcMultiword(data, bytes, start);
+#else
+    // Very few CPUs have multiple ALUs and speculative execution
+    // (Itanium is an exception) so sophisticated algorithms will
+    // not perform better than good old Sarwate algorithm.
+    return CrcByteUnrolled(data, bytes, start);
+#endif  // HAVE_AMD64 || HAVE_I386
+  }
+
+  // Returns base class.
+  const GfUtil<Crc> &Base() const { return base_; }
+
+ protected:
+  // Canonical, byte-by-byte CRC computation.
+  Crc CrcByte(const void *data, size_t bytes, const Crc &start) const {
+    const uint8 *src = static_cast<const uint8 *>(data);
+    Crc crc = start ^ Base().Canonize();
+    for (const uint8 *end = src + bytes; src < end; ++src) {
+      CRC_BYTE(this, crc, *src);
+    }
+    return (crc ^ Base().Canonize());
+  }
+
+  // Byte-by-byte CRC with main loop unrolled.
+  Crc CrcByteUnrolled(const void *data, size_t bytes, const Crc &start) const {
+    if (bytes == 0) {
+      return start;
+    }
+
+    const uint8 *src = static_cast<const uint8 *>(data);
+    const uint8 *end = src + bytes;
+    Crc crc = start ^ Base().Canonize();
+
+    // Unroll loop 4 times.
+    end -= 3;
+    for (; src < end; src += 4) {
+      PREFETCH(src);
+      CRC_BYTE(this, crc, src[0]);
+      CRC_BYTE(this, crc, src[1]);
+      CRC_BYTE(this, crc, src[2]);
+      CRC_BYTE(this, crc, src[3]);
+    }
+    end += 3;
+
+    // Compute CRC of remaining bytes.
+    for (; src < end; ++src) {
+      CRC_BYTE(this, crc, *src);
+    }
+
+    return (crc ^ Base().Canonize());
+  }
+
+  // Canonical, byte-by-byte CRC computation.
+  Crc CrcByteWord(const void *data, size_t bytes, const Crc &start) const {
+    const uint8 *src = static_cast<const uint8 *>(data);
+    const uint8 *end = src + bytes;
+    Crc crc0 = start ^ Base().Canonize();
+
+    ALIGN_ON_WORD_BOUNDARY_IF_NEEDED(bytes, this, src, end, crc0, Crc);
+    if (src >= end) {
+      return (crc0 ^ Base().Canonize());
+    }
+
+    // Process 4*sizeof(Crc) bytes at a time.
+    end -= 4 * sizeof(Crc) - 1;
+    for (; src < end; src += 4 * sizeof(Crc)) {
+      for (size_t i = 0; i < 4; ++i) {
+        crc0 ^= reinterpret_cast<const Crc *>(src)[i];
+        if (i == 0) {
+          PREFETCH(src);
+        }
+        for (size_t byte = 0; byte < sizeof(crc0); ++byte) {
+          CRC_BYTE(this, crc0, 0);
+        }
+      }
+    }
+    end += 4 * sizeof(Crc) - 1;
+
+    // Process sizeof(Crc) bytes at a time.
+    end -= sizeof(Crc) - 1;
+    for (; src < end; src += sizeof(Crc)) {
+      crc0 ^= reinterpret_cast<const Crc *>(src)[0];
+      for (size_t byte = 0; byte < sizeof(crc0); ++byte) {
+        CRC_BYTE(this, crc0, 0);
+      }
+    }
+    end += sizeof(Crc) - 1;
+
+    // Compute CRC of remaining bytes.
+    for (;src < end; ++src) {
+      CRC_BYTE(this, crc0, *src);
+    }
+
+    return (crc0 ^ Base().Canonize());
+  }
+
+  // Faster, word-by-word CRC.
+  Crc CrcWord(const void *data, size_t bytes, const Crc &start) const {
+    const uint8 *src = static_cast<const uint8 *>(data);
+    const uint8 *end = src + bytes;
+    Crc crc0 = start ^ Base().Canonize();
+
+    ALIGN_ON_WORD_BOUNDARY_IF_NEEDED(bytes, this, src, end, crc0, Word);
+    if (src >= end) {
+      return (crc0 ^ Base().Canonize());
+    }
+
+    // Process 4 sizeof(Word) bytes at once.
+    end -= 4 * sizeof(Word) - 1;
+    for (; src < end; src += 4 * sizeof(Word)) {
+      Word buf0 = reinterpret_cast<const Word *>(src)[0];
+      PREFETCH(src);
+      CRC_WORD(this, crc0, buf0);
+      buf0 = reinterpret_cast<const Word *>(src)[1];
+      CRC_WORD(this, crc0, buf0);
+      buf0 = reinterpret_cast<const Word *>(src)[2];
+      CRC_WORD(this, crc0, buf0);
+      buf0 = reinterpret_cast<const Word *>(src)[3];
+      CRC_WORD(this, crc0, buf0);
+    }
+    end += 4 * sizeof(Word) - 1;
+
+    // Process sizeof(Word) bytes at a time.
+    end -= sizeof(Word) - 1;
+    for (; src < end; src += sizeof(Word)) {
+      Word buf0 = reinterpret_cast<const Word *>(src)[0];
+      CRC_WORD(this, crc0, buf0);
+    }
+    end += sizeof(Word) - 1;
+
+    // Compute CRC of remaining bytes.
+    for (;src < end; ++src) {
+      CRC_BYTE(this, crc0, *src);
+    }
+
+    return (crc0 ^ Base().Canonize());
+  }
+
+#define REPEAT_FROM_1(macro) \
+  macro(1); \
+  macro(2); \
+  macro(3); \
+  macro(4); \
+  macro(5); \
+  macro(6); \
+  macro(7);
+
+#define REPEAT_FROM_0(macro) \
+  macro(0); \
+  REPEAT_FROM_1(macro)
+
+  // Faster, process adjusent blocks in parallel and concatenate CRCs.
+  Crc CrcBlockword(const void *data, size_t bytes, const Crc &start) const {
+    if (kStride < 2 || kStride > 8) {
+      // Unsupported configuration;
+      // fall back to something sensible.
+      return CrcWord(data, bytes, start);
+    }
+
+    const uint8 *src = static_cast<const uint8 *>(data);
+    const uint8 *end = src + bytes;
+    Crc crc0 = start ^ Base().Canonize();
+    enum {
+      // Add 16 to avoid false L1 cache collisions.
+      kStripe = (15*1024 + 16) & ~(sizeof(Word) - 1),
+    };
+
+    ALIGN_ON_WORD_BOUNDARY_IF_NEEDED(bytes, this, src, end, crc0, Word);
+    if (src >= end) {
+      return (crc0 ^ Base().Canonize());
+    }
+
+    end -= kStride * kStripe - 1;
+    if (src < end) {
+      Crc x_pow_8kStripe = Base().Xpow8N(kStripe);
+      do {
+        const uint8 *stripe_end = src + kStripe;
+
+#define INIT_CRC(reg) \
+        Crc crc##reg; \
+        if (kStride >= reg) { \
+          crc##reg = 0; \
+        }
+        REPEAT_FROM_1(INIT_CRC);
+#undef INIT_CRC
+
+        do {
+#define FIRST(reg) \
+          Word buf##reg; \
+          if (kStride > reg) { \
+            buf##reg = reinterpret_cast<const Word *>(src + reg * kStripe)[0]; \
+            buf##reg ^= Downcast<Crc, Word>(crc##reg); \
+            if (sizeof(crc##reg) > sizeof(buf##reg)) { \
+              crc##reg = SHIFT_RIGHT_SAFE(crc##reg, sizeof(buf##reg) * 8); \
+              crc##reg ^= TABLE_ENTRY(this->crc_word_, 0, buf##reg); \
+            } else { \
+              crc##reg = TABLE_ENTRY(this->crc_word_, 0, buf##reg); \
+            } \
+            buf##reg >>= 8; \
+          }
+          REPEAT_FROM_0(FIRST);
+#undef FIRST
+
+          for (size_t byte = 1; byte < sizeof(buf0) - 1; ++byte) {
+#define NEXT(reg) do { \
+            if (kStride > reg) { \
+              crc##reg ^= TABLE_ENTRY(this->crc_word_, byte, buf##reg); \
+              buf##reg >>= 8; \
+            } \
+} while (0)
+            REPEAT_FROM_0(NEXT);
+#undef NEXT
+          }
+
+#define LAST(reg) do { \
+          if (kStride > reg) { \
+            crc##reg ^= TABLE_ENTRY_LAST(this->crc_word_, buf##reg); \
+          } \
+} while (0)
+          REPEAT_FROM_0(LAST);
+#undef LAST
+
+          src += sizeof(Word);
+        } while (src < stripe_end);
+
+#if 0
+// The code is left for illustrational purposes only.
+#define COMBINE(reg) do { \
+        if (reg > 0 && kStride > reg) { \
+          crc0 = Base().ChangeStartValue(crc##reg, kStripe, 0, crc0); \
+        } \
+} while (0)
+#else
+#define COMBINE(reg) do { \
+        if (reg > 0 && kStride > reg) { \
+          crc0 = crc##reg ^ Base().Multiply(crc0, x_pow_8kStripe); \
+        } \
+} while (0)
+#endif
+        REPEAT_FROM_0(COMBINE);
+#undef COMBINE
+
+        src += (kStride - 1) * kStripe;
+      }
+      while (src < end);
+    }
+    end += kStride * kStripe - 1;
+
+    // Process sizeof(Word) bytes at a time.
+    end -= sizeof(Word) - 1;
+    for (; src < end; src += sizeof(Word)) {
+      Word buf0 = reinterpret_cast<const Word *>(src)[0];
+      CRC_WORD(this, crc0, buf0);
+    }
+    end += sizeof(Word) - 1;
+
+    // Compute CRC of remaining bytes.
+    for (;src < end; ++src) {
+      CRC_BYTE(this, crc0, *src);
+    }
+
+    return (crc0 ^ Base().Canonize());
+  }
+
+  // Fastest, interleaved multi-byte CRC.
+  Crc CrcMultiword(const void *data, size_t bytes, const Crc &start) const {
+    if (kStride < 2 || kStride > 8) {
+      // Unsupported configuration;
+      // fall back to something sensible.
+      return CrcWord(data, bytes, start);
+    }
+
+    const uint8 *src = static_cast<const uint8 *>(data);
+    const uint8 *end = src + bytes;
+    Crc crc0 = start ^ Base().Canonize();
+
+    ALIGN_ON_WORD_BOUNDARY_IF_NEEDED(bytes, this, src, end, crc0, Word);
+    if (src >= end) {
+      return (crc0 ^ Base().Canonize());
+    }
+
+    // Process kStride Word registers at once;
+    // should have have at least 2*kInterleaveBytes of data to start.
+    end -= 2*kInterleaveBytes - 1;
+    if (src < end) {
+      Crc crc_carryover;
+      if (sizeof(Crc) > sizeof(Word)) {
+        // crc_carryover is used if and only if Crc is wider than Word.
+        crc_carryover = 0;
+      }
+#define INIT_CRC(reg) \
+      Crc crc##reg; \
+      if (reg > 0 && kStride > reg) { \
+        crc##reg = 0; \
+      }
+      REPEAT_FROM_1(INIT_CRC);
+#undef INIT_CRC
+
+#define INIT_BUF(reg) \
+      Word buf##reg; \
+      if (kStride > reg) { \
+        buf##reg = reinterpret_cast<const Word *>(src)[reg]; \
+      }
+      REPEAT_FROM_0(INIT_BUF);
+#undef INIT_BUF
+
+      do {
+        PREFETCH(src);
+        src += kInterleaveBytes;
+
+        if (sizeof(Crc) > sizeof(Word)) {
+          crc0 ^= crc_carryover;
+        }
+
+#define FIRST(reg, next_reg) do { \
+        if (kStride > reg) { \
+          buf##reg ^= Downcast<Crc, Word>(crc##reg); \
+          if (sizeof(Crc) > sizeof(Word)) { \
+            if (reg < kStride - 1) { \
+              crc##next_reg ^= SHIFT_RIGHT_SAFE(crc##reg, 8 * sizeof(buf0)); \
+            } else { \
+              crc_carryover = SHIFT_RIGHT_SAFE(crc##reg, 8 * sizeof(buf0)); \
+            } \
+          } \
+          crc##reg = TABLE_ENTRY(this->crc_word_interleaved_, 0, buf##reg); \
+          buf##reg >>= 8; \
+        } \
+} while (0)
+        FIRST(0, 1);
+        FIRST(1, 2);
+        FIRST(2, 3);
+        FIRST(3, 4);
+        FIRST(4, 5);
+        FIRST(5, 6);
+        FIRST(6, 7);
+        FIRST(7, 0);
+#undef FIRST
+
+        for (size_t byte = 1; byte < sizeof(Word) - 1; ++byte) {
+#define NEXT(reg) do { \
+          if (kStride > reg) { \
+            crc##reg ^= \
+                TABLE_ENTRY(this->crc_word_interleaved_, byte, buf##reg); \
+            buf##reg >>= 8; \
+          } \
+} while(0)
+          REPEAT_FROM_0(NEXT);
+#undef NEXT
+        }
+
+#define LAST(reg) do { \
+        if (kStride > reg) { \
+          crc##reg ^= TABLE_ENTRY_LAST(this->crc_word_interleaved_, buf##reg); \
+          buf##reg = reinterpret_cast<const Word *>(src)[reg]; \
+        } \
+} while(0)
+        REPEAT_FROM_0(LAST);
+#undef LAST
+      }
+      while (src < end);
+
+      if (sizeof(Crc) > sizeof(Word)) {
+        crc0 ^= crc_carryover;
+      }
+
+#define COMBINE(reg) do { \
+      if (kStride > reg) { \
+        if (reg != 0) { \
+          crc0 ^= crc##reg; \
+        } \
+        CRC_WORD(this, crc0, buf##reg); \
+      } \
+} while (0)
+      REPEAT_FROM_0(COMBINE);
+#undef COMBINE
+
+      src += kInterleaveBytes;
+    }
+    end += 2*kInterleaveBytes - 1;
+
+    // Process sizeof(Word) bytes at once.
+    end -= sizeof(Word) - 1;
+    for (; src < end; src += sizeof(Word)) {
+      Word buf0 = reinterpret_cast<const Word *>(src)[0];
+      CRC_WORD(this, crc0, buf0);
+    }
+    end += sizeof(Word) - 1;
+
+    // Compute CRC of remaining bytes.
+    for (;src < end; ++src) {
+      CRC_BYTE(this, crc0, *src);
+    }
+
+    return (crc0 ^ Base().Canonize());
+  }
+
+ protected:
+  enum {
+    kInterleaveBytes = sizeof(Word) * kStride,
+  };
+
+  // Multiplication tables used by CRCs.
+  TableEntry crc_word_interleaved_[sizeof(Word)][256];
+  TableEntry crc_word_[sizeof(Word)][256];
+
+  // Base class stored after CRC tables so that the most frequently
+  // used table is at offset 0 and may be accessed faster.
+  GfUtil<Crc> base_;
+
+  friend class RollingCrc< GenericCrc<Crc, TableEntry, Word, kStride> >;
+
+ private:
+  // CrcMultiword on amd64 may run at 1.2 CPU cycles per byte which is
+  // noticeably faster than CrcWord (2.2-2.6 cycles/byte depending on
+  // hardware and compiler). However, there are problems with compilers.
+  //
+  // Test system: P45 chipset, Intel Q9650 CPU, 800MHz 4-4-4-12 memory.
+  //
+  // 64-bit compiler, <= 64-bit CRC, 64-bit tables, 64-bit reads:
+  // CL 15.00.307291.1  C++   >1.2< CPU cycles/byte
+  // ICL 11.1.051 -O3   C++    1.5  CPU cycles/byte
+  // GCC 4.5 -O3        C++    2.0  CPU cycles/byte
+  // GCC 4.x -O3        ASM   >1.2< CPU cycles/byte
+  //
+  // 32-bit compiler, MMX used, <= 64-bit CRC, 64-bit tables, 64-bit reads
+  // CL 15.00.307291.1  C++   2.0  CPU cycles/byte
+  // GCC 4.5 -O3        C++   1.9  CPU cycles/byte
+  // ICL 11.1.051 -S    C++   1.6  CPU cycles/byte
+  // GCC 4.x -O3        ASM  >1.3< CPU cycles/byte
+  //
+  // So, use inline ASM code for GCC for both i386 and amd64.
+
+  Crc CrcMultiwordI386Mmx(
+          const void *data, size_t bytes, const Crc &start) const;
+  Crc CrcMultiwordGccAmd64(
+          const void *data, size_t bytes, const Crc &start) const;
+  Crc CrcMultiwordGccAmd64Sse2(
+          const uint8 *src, const uint8 *end, const Crc &start) const;
+} GCC_ALIGN_ATTRIBUTE(16);
+
+#undef REPEAT_FROM_0
+#undef REPEAT_FROM_1
+
+
+// Specialized variants.
+#if CRCUTIL_USE_ASM
+
+#if (defined(__GNUC__) && (HAVE_AMD64 || (HAVE_I386 && HAVE_MMX)))
+
+// Declare specialized functions.
+template<> uint64 GenericCrc<uint64, uint64, uint64, 4>::CrcMultiword(
+    const void *data, size_t bytes, const uint64 &start) const;
+
+#if HAVE_AMD64 && HAVE_SSE2
+template<>
+uint128_sse2
+GenericCrc<uint128_sse2, uint128_sse2, uint64, 4>::CrcMultiword(
+    const void *data, size_t bytes, const uint128_sse2 &start) const;
+#endif  // HAVE_AMD64 && HAVE_SSE2
+
+#elif defined(_MSC_FULL_VER) && _MSC_FULL_VER <= 150030729 && \
+      (HAVE_I386 && HAVE_MMX)
+
+// Work around bug in MSC (present at least in v. 15.00.30729.1)
+template<> uint64 GenericCrc<uint64, uint64, uint64, 4>::CrcMultiwordI386Mmx(
+    const void *data,
+    size_t bytes,
+    const uint64 &start) const;
+template<> __forceinline
+uint64 GenericCrc<uint64, uint64, uint64, 4>::CrcMultiword(
+    const void *data,
+    size_t bytes,
+    const uint64 &start) const {
+  typedef uint64 Word;
+  typedef uint64 Crc;
+  if (bytes <= 12) {
+    const uint8 *src = static_cast<const uint8 *>(data);
+    uint64 crc = start ^ Base().Canonize();
+    for (const uint8 *end = src + bytes; src < end; ++src) {
+      CRC_BYTE(this, crc, *src);
+    }
+    return (crc ^ Base().Canonize());
+  }
+  return CrcMultiwordI386Mmx(data, bytes, start);
+}
+
+#endif  // (defined(__GNUC__) && (HAVE_AMD64 || (HAVE_I386 && HAVE_MMX)))
+
+#endif  // CRCUTIL_USE_ASM
+
+
+#pragma pack(pop)
+
+}  // namespace crcutil
+
+#endif  // CRCUTIL_GENERIC_CRC_H_
diff --git a/contrib/libs/crcutil/gf_util.h b/contrib/libs/crcutil/gf_util.h
index 2a98dfd9e4..43c1d6b216 100644
--- a/contrib/libs/crcutil/gf_util.h
+++ b/contrib/libs/crcutil/gf_util.h
@@ -1,304 +1,304 @@
-// Copyright 2010 Google Inc.  All rights reserved. 
-// 
-// Licensed under the Apache License, Version 2.0 (the "License"); 
-// you may not use this file except in compliance with the License. 
-// You may obtain a copy of the License at 
-// 
-//      http://www.apache.org/licenses/LICENSE-2.0 
-// 
-// Unless required by applicable law or agreed to in writing, software 
-// distributed under the License is distributed on an "AS IS" BASIS, 
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-// See the License for the specific language governing permissions and 
-// limitations under the License. 
- 
-// Defines GfUtil template class which implements 
-// 1. some useful operations in GF(2^n), 
-// 2. CRC helper function (e.g. concatenation of CRCs) which are 
-//    not affected by specific implemenation of CRC computation per se. 
-// 
-// Please read crc.pdf to understand how it all works. 
- 
-#ifndef CRCUTIL_GF_UTIL_H_ 
-#define CRCUTIL_GF_UTIL_H_ 
- 
-#include "base_types.h"   // uint8, uint64 
-#include "crc_casts.h"    // TO_BYTE() 
-#include "platform.h"     // GCC_ALIGN_ATTRIBUTE(16), SHIFT_*_SAFE 
- 
-namespace crcutil { 
- 
-#pragma pack(push, 16) 
- 
-// "Crc" is the type used internally and to return values of N-bit CRC. 
-template<typename Crc> class GfUtil { 
- public: 
-  // Initializes the tables given generating polynomial of degree (degree). 
-  // If "canonical" is true, starting CRC value and computed CRC value will be 
-  // XOR-ed with 111...111. 
-  GfUtil() {} 
-  GfUtil(const Crc &generating_polynomial, size_t degree, bool canonical) { 
-    Init(generating_polynomial, degree, canonical); 
-  } 
-  void Init(const Crc &generating_polynomial, size_t degree, bool canonical) { 
-    Crc one = 1; 
-    one <<= degree - 1; 
-    this->generating_polynomial_ = generating_polynomial; 
-    this->crc_bytes_ = (degree + 7) >> 3; 
-    this->degree_ = degree; 
-    this->one_ = one; 
-    if (canonical) { 
-      this->canonize_ = one | (one - 1); 
-    } else { 
-      this->canonize_ = 0; 
-    } 
-    this->normalize_[0] = 0; 
-    this->normalize_[1] = generating_polynomial; 
- 
-    Crc k = one >> 1; 
-    for (size_t i = 0; i < sizeof(uint64) * 8; ++i) { 
-      this->x_pow_2n_[i] = k; 
-      k = Multiply(k, k); 
-    } 
- 
-    this->crc_of_crc_ = Multiply(this->canonize_, 
-                                 this->one_ ^ Xpow8N((degree + 7) >> 3)); 
- 
-    FindLCD(Xpow8N(this->crc_bytes_), &this->x_pow_minus_W_); 
-  } 
- 
-  // Returns generating polynomial. 
-  Crc GeneratingPolynomial() const { 
-    return this->generating_polynomial_; 
-  } 
- 
-  // Returns number of bits in CRC (degree of generating polynomial). 
-  size_t Degree() const { 
-    return this->degree_; 
-  } 
- 
-  // Returns start/finish adjustment constant. 
-  Crc Canonize() const { 
-    return this->canonize_; 
-  } 
- 
-  // Returns normalized value of 1. 
-  Crc One() const { 
-    return this->one_; 
-  } 
- 
-  // Returns value of CRC(A, |A|, start_new) given known 
-  // crc=CRC(A, |A|, start_old) -- without touching the data. 
-  Crc ChangeStartValue(const Crc &crc, uint64 bytes, 
-                       const Crc &start_old, 
-                       const Crc &start_new) const { 
-    return (crc ^ Multiply(start_new ^ start_old, Xpow8N(bytes))); 
-  } 
- 
-  // Returns CRC of concatenation of blocks A and B when CRCs 
-  // of blocks A and B are known -- without touching the data. 
-  // 
-  // To be precise, given CRC(A, |A|, startA) and CRC(B, |B|, 0), 
-  // returns CRC(AB, |AB|, startA). 
-  Crc Concatenate(const Crc &crc_A, const Crc &crc_B, uint64 bytes_B) const { 
-    return ChangeStartValue(crc_B, bytes_B, 0 /* start_B */, crc_A); 
-  } 
- 
-  // Returns CRC of sequence of zeroes -- without touching the data. 
-  Crc CrcOfZeroes(uint64 bytes, const Crc &start) const { 
-    Crc tmp = Multiply(start ^ this->canonize_, Xpow8N(bytes)); 
-    return (tmp ^ this->canonize_); 
-  } 
- 
-  // Given CRC of a message, stores extra (degree + 7)/8 bytes after 
-  // the message so that CRC(message+extra, start) = result. 
-  // Does not change CRC start value (use ChangeStartValue for that). 
-  // Returns number of stored bytes. 
-  size_t StoreComplementaryCrc(void *dst, 
-                               const Crc &message_crc, 
-                               const Crc &result) const { 
-    Crc crc0 = Multiply(result ^ this->canonize_, this->x_pow_minus_W_); 
-    crc0 ^= message_crc ^ this->canonize_; 
-    uint8 *d = reinterpret_cast<uint8 *>(dst); 
-    for (size_t i = 0; i < this->crc_bytes_; ++i) { 
-      d[i] = TO_BYTE(crc0); 
-      crc0 >>= 8; 
-    } 
-    return this->crc_bytes_; 
-  } 
- 
-  // Stores given CRC of a message as (degree + 7)/8 bytes filled 
-  // with 0s to the right. Returns number of stored bytes. 
-  // CRC of the message and stored CRC is a constant value returned 
-  // by CrcOfCrc() -- it does not depend on contents of the message. 
-  size_t StoreCrc(void *dst, const Crc &crc) const { 
-    uint8 *d = reinterpret_cast<uint8 *>(dst); 
-    Crc crc0 = crc; 
-    for (size_t i = 0; i < this->crc_bytes_; ++i) { 
-      d[i] = TO_BYTE(crc0); 
-      crc0 >>= 8; 
-    } 
-    return this->crc_bytes_; 
-  } 
- 
-  // Returns expected CRC value of CRC(Message,CRC(Message)) 
-  // when CRC is stored after the message. This value is fixed 
-  // and does not depend on the message or CRC start value. 
-  Crc CrcOfCrc() const { 
-    return this->crc_of_crc_; 
-  } 
- 
-  // Returns ((a * b) mod P) where "a" and "b" are of degree <= (D-1). 
-  Crc Multiply(const Crc &aa, const Crc &bb) const { 
-    Crc a = aa; 
-    Crc b = bb; 
-    if ((a ^ (a - 1)) < (b ^ (b - 1))) { 
-      Crc temp = a; 
-      a = b; 
-      b = temp; 
-    } 
- 
-    if (a == 0) { 
-      return a; 
-    } 
- 
-    Crc product = 0; 
-    Crc one = this->one_; 
-    for (; a != 0; a <<= 1) { 
-      if ((a & one) != 0) { 
-        product ^= b; 
-        a ^= one; 
-      } 
-      b = (b >> 1) ^ this->normalize_[Downcast<Crc, size_t>(b & 1)]; 
-    } 
- 
-    return product; 
-  } 
- 
-  // Returns ((unnorm * m) mod P) where degree of m is <= (D-1) 
-  // and degree of value "unnorm" is provided explicitly. 
-  Crc MultiplyUnnormalized(const Crc &unnorm, size_t degree, 
-                           const Crc &m) const { 
-    Crc v = unnorm; 
-    Crc result = 0; 
-    while (degree > this->degree_) { 
-      degree -= this->degree_; 
-      Crc value = v & (this->one_ | (this->one_ - 1)); 
-      result ^= Multiply(value, Multiply(m, XpowN(degree))); 
-      v >>= this->degree_; 
-    } 
-    result ^= Multiply(v << (this->degree_ - degree), m); 
-    return result; 
-  } 
- 
-  // returns ((x ** n) mod P). 
-  Crc XpowN(uint64 n) const { 
-    Crc one = this->one_; 
-    Crc result = one; 
- 
-    for (size_t i = 0; n != 0; ++i, n >>= 1) { 
-      if (n & 1) { 
-        result = Multiply(result, this->x_pow_2n_[i]); 
-      } 
-    } 
- 
-    return result; 
-  } 
- 
-  // Returns (x ** (8 * n) mod P). 
-  Crc Xpow8N(uint64 n) const { 
-    return XpowN(n << 3); 
-  } 
- 
-  // Returns remainder (A mod B) and sets *q = (A/B) of division 
-  // of two polynomials: 
-  //    A = dividend + dividend_x_pow_D_coef * x**degree, 
-  //    B = divisor. 
-  Crc Divide(const Crc &dividend0, int dividend_x_pow_D_coef, 
-             const Crc &divisor0, Crc *q) const { 
-    Crc divisor = divisor0; 
-    Crc dividend = dividend0; 
-    Crc quotient = 0; 
-    Crc coef = this->one_; 
- 
-    while ((divisor & 1) == 0) { 
-      divisor >>= 1; 
-      coef >>= 1; 
-    } 
- 
-    if (dividend_x_pow_D_coef) { 
-      quotient = coef >> 1; 
-      dividend ^= divisor >> 1; 
-    } 
- 
-    Crc x_pow_degree_b = 1; 
-    for (;;) { 
-      if ((dividend & x_pow_degree_b) != 0) { 
-        dividend ^= divisor; 
-        quotient ^= coef; 
-      } 
-      if (coef == this->one_) { 
-        break; 
-      } 
-      coef <<= 1; 
-      x_pow_degree_b <<= 1; 
-      divisor <<= 1; 
-    } 
- 
-    *q = quotient; 
-    return dividend; 
-  } 
- 
-  // Extended Euclid's algorith -- for given A finds LCD(A, P) and 
-  // value B such that (A * B) mod P = LCD(A, P). 
-  Crc FindLCD(const Crc &A, Crc *B) const { 
-    if (A == 0 || A == this->one_) { 
-      *B = A; 
-      return A; 
-    } 
- 
-    // Actually, generating polynomial is 
-    // (generating_polynomial_ + x**degree). 
-    int r0_x_pow_D_coef = 1; 
-    Crc r0 = this->generating_polynomial_; 
-    Crc b0 = 0; 
-    Crc r1 = A; 
-    Crc b1 = this->one_; 
- 
-    for (;;) { 
-      Crc q; 
-      Crc r = Divide(r0, r0_x_pow_D_coef, r1, &q); 
-      if (r == 0) { 
-        break; 
-      } 
-      r0_x_pow_D_coef = 0; 
- 
-      r0 = r1; 
-      r1 = r; 
- 
-      Crc b = b0 ^ Multiply(q, b1); 
-      b0 = b1; 
-      b1 = b; 
-    } 
- 
-    *B = b1; 
-    return r1; 
-  } 
- 
- protected: 
-  Crc canonize_; 
-  Crc x_pow_2n_[sizeof(uint64) * 8]; 
-  Crc generating_polynomial_; 
-  Crc one_; 
-  Crc x_pow_minus_W_; 
-  Crc crc_of_crc_; 
-  Crc normalize_[2]; 
-  size_t crc_bytes_; 
-  size_t degree_; 
-} GCC_ALIGN_ATTRIBUTE(16); 
- 
-#pragma pack(pop) 
- 
-}  // namespace crcutil 
- 
-#endif  // CRCUTIL_GF_UTIL_H_ 
+// Copyright 2010 Google Inc.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Defines GfUtil template class which implements
+// 1. some useful operations in GF(2^n),
+// 2. CRC helper function (e.g. concatenation of CRCs) which are
+//    not affected by specific implemenation of CRC computation per se.
+//
+// Please read crc.pdf to understand how it all works.
+
+#ifndef CRCUTIL_GF_UTIL_H_
+#define CRCUTIL_GF_UTIL_H_
+
+#include "base_types.h"   // uint8, uint64
+#include "crc_casts.h"    // TO_BYTE()
+#include "platform.h"     // GCC_ALIGN_ATTRIBUTE(16), SHIFT_*_SAFE
+
+namespace crcutil {
+
+#pragma pack(push, 16)
+
+// "Crc" is the type used internally and to return values of N-bit CRC.
+template<typename Crc> class GfUtil {
+ public:
+  // Initializes the tables given generating polynomial of degree (degree).
+  // If "canonical" is true, starting CRC value and computed CRC value will be
+  // XOR-ed with 111...111.
+  GfUtil() {}
+  GfUtil(const Crc &generating_polynomial, size_t degree, bool canonical) {
+    Init(generating_polynomial, degree, canonical);
+  }
+  void Init(const Crc &generating_polynomial, size_t degree, bool canonical) {
+    Crc one = 1;
+    one <<= degree - 1;
+    this->generating_polynomial_ = generating_polynomial;
+    this->crc_bytes_ = (degree + 7) >> 3;
+    this->degree_ = degree;
+    this->one_ = one;
+    if (canonical) {
+      this->canonize_ = one | (one - 1);
+    } else {
+      this->canonize_ = 0;
+    }
+    this->normalize_[0] = 0;
+    this->normalize_[1] = generating_polynomial;
+
+    Crc k = one >> 1;
+    for (size_t i = 0; i < sizeof(uint64) * 8; ++i) {
+      this->x_pow_2n_[i] = k;
+      k = Multiply(k, k);
+    }
+
+    this->crc_of_crc_ = Multiply(this->canonize_,
+                                 this->one_ ^ Xpow8N((degree + 7) >> 3));
+
+    FindLCD(Xpow8N(this->crc_bytes_), &this->x_pow_minus_W_);
+  }
+
+  // Returns generating polynomial.
+  Crc GeneratingPolynomial() const {
+    return this->generating_polynomial_;
+  }
+
+  // Returns number of bits in CRC (degree of generating polynomial).
+  size_t Degree() const {
+    return this->degree_;
+  }
+
+  // Returns start/finish adjustment constant.
+  Crc Canonize() const {
+    return this->canonize_;
+  }
+
+  // Returns normalized value of 1.
+  Crc One() const {
+    return this->one_;
+  }
+
+  // Returns value of CRC(A, |A|, start_new) given known
+  // crc=CRC(A, |A|, start_old) -- without touching the data.
+  Crc ChangeStartValue(const Crc &crc, uint64 bytes,
+                       const Crc &start_old,
+                       const Crc &start_new) const {
+    return (crc ^ Multiply(start_new ^ start_old, Xpow8N(bytes)));
+  }
+
+  // Returns CRC of concatenation of blocks A and B when CRCs
+  // of blocks A and B are known -- without touching the data.
+  //
+  // To be precise, given CRC(A, |A|, startA) and CRC(B, |B|, 0),
+  // returns CRC(AB, |AB|, startA).
+  Crc Concatenate(const Crc &crc_A, const Crc &crc_B, uint64 bytes_B) const {
+    return ChangeStartValue(crc_B, bytes_B, 0 /* start_B */, crc_A);
+  }
+
+  // Returns CRC of sequence of zeroes -- without touching the data.
+  Crc CrcOfZeroes(uint64 bytes, const Crc &start) const {
+    Crc tmp = Multiply(start ^ this->canonize_, Xpow8N(bytes));
+    return (tmp ^ this->canonize_);
+  }
+
+  // Given CRC of a message, stores extra (degree + 7)/8 bytes after
+  // the message so that CRC(message+extra, start) = result.
+  // Does not change CRC start value (use ChangeStartValue for that).
+  // Returns number of stored bytes.
+  size_t StoreComplementaryCrc(void *dst,
+                               const Crc &message_crc,
+                               const Crc &result) const {
+    Crc crc0 = Multiply(result ^ this->canonize_, this->x_pow_minus_W_);
+    crc0 ^= message_crc ^ this->canonize_;
+    uint8 *d = reinterpret_cast<uint8 *>(dst);
+    for (size_t i = 0; i < this->crc_bytes_; ++i) {
+      d[i] = TO_BYTE(crc0);
+      crc0 >>= 8;
+    }
+    return this->crc_bytes_;
+  }
+
+  // Stores given CRC of a message as (degree + 7)/8 bytes filled
+  // with 0s to the right. Returns number of stored bytes.
+  // CRC of the message and stored CRC is a constant value returned
+  // by CrcOfCrc() -- it does not depend on contents of the message.
+  size_t StoreCrc(void *dst, const Crc &crc) const {
+    uint8 *d = reinterpret_cast<uint8 *>(dst);
+    Crc crc0 = crc;
+    for (size_t i = 0; i < this->crc_bytes_; ++i) {
+      d[i] = TO_BYTE(crc0);
+      crc0 >>= 8;
+    }
+    return this->crc_bytes_;
+  }
+
+  // Returns expected CRC value of CRC(Message,CRC(Message))
+  // when CRC is stored after the message. This value is fixed
+  // and does not depend on the message or CRC start value.
+  Crc CrcOfCrc() const {
+    return this->crc_of_crc_;
+  }
+
+  // Returns ((a * b) mod P) where "a" and "b" are of degree <= (D-1).
+  Crc Multiply(const Crc &aa, const Crc &bb) const {
+    Crc a = aa;
+    Crc b = bb;
+    if ((a ^ (a - 1)) < (b ^ (b - 1))) {
+      Crc temp = a;
+      a = b;
+      b = temp;
+    }
+
+    if (a == 0) {
+      return a;
+    }
+
+    Crc product = 0;
+    Crc one = this->one_;
+    for (; a != 0; a <<= 1) {
+      if ((a & one) != 0) {
+        product ^= b;
+        a ^= one;
+      }
+      b = (b >> 1) ^ this->normalize_[Downcast<Crc, size_t>(b & 1)];
+    }
+
+    return product;
+  }
+
+  // Returns ((unnorm * m) mod P) where degree of m is <= (D-1)
+  // and degree of value "unnorm" is provided explicitly.
+  Crc MultiplyUnnormalized(const Crc &unnorm, size_t degree,
+                           const Crc &m) const {
+    Crc v = unnorm;
+    Crc result = 0;
+    while (degree > this->degree_) {
+      degree -= this->degree_;
+      Crc value = v & (this->one_ | (this->one_ - 1));
+      result ^= Multiply(value, Multiply(m, XpowN(degree)));
+      v >>= this->degree_;
+    }
+    result ^= Multiply(v << (this->degree_ - degree), m);
+    return result;
+  }
+
+  // returns ((x ** n) mod P).
+  Crc XpowN(uint64 n) const {
+    Crc one = this->one_;
+    Crc result = one;
+
+    for (size_t i = 0; n != 0; ++i, n >>= 1) {
+      if (n & 1) {
+        result = Multiply(result, this->x_pow_2n_[i]);
+      }
+    }
+
+    return result;
+  }
+
+  // Returns (x ** (8 * n) mod P).
+  Crc Xpow8N(uint64 n) const {
+    return XpowN(n << 3);
+  }
+
+  // Returns remainder (A mod B) and sets *q = (A/B) of division
+  // of two polynomials:
+  //    A = dividend + dividend_x_pow_D_coef * x**degree,
+  //    B = divisor.
+  Crc Divide(const Crc &dividend0, int dividend_x_pow_D_coef,
+             const Crc &divisor0, Crc *q) const {
+    Crc divisor = divisor0;
+    Crc dividend = dividend0;
+    Crc quotient = 0;
+    Crc coef = this->one_;
+
+    while ((divisor & 1) == 0) {
+      divisor >>= 1;
+      coef >>= 1;
+    }
+
+    if (dividend_x_pow_D_coef) {
+      quotient = coef >> 1;
+      dividend ^= divisor >> 1;
+    }
+
+    Crc x_pow_degree_b = 1;
+    for (;;) {
+      if ((dividend & x_pow_degree_b) != 0) {
+        dividend ^= divisor;
+        quotient ^= coef;
+      }
+      if (coef == this->one_) {
+        break;
+      }
+      coef <<= 1;
+      x_pow_degree_b <<= 1;
+      divisor <<= 1;
+    }
+
+    *q = quotient;
+    return dividend;
+  }
+
+  // Extended Euclid's algorith -- for given A finds LCD(A, P) and
+  // value B such that (A * B) mod P = LCD(A, P).
+  Crc FindLCD(const Crc &A, Crc *B) const {
+    if (A == 0 || A == this->one_) {
+      *B = A;
+      return A;
+    }
+
+    // Actually, generating polynomial is
+    // (generating_polynomial_ + x**degree).
+    int r0_x_pow_D_coef = 1;
+    Crc r0 = this->generating_polynomial_;
+    Crc b0 = 0;
+    Crc r1 = A;
+    Crc b1 = this->one_;
+
+    for (;;) {
+      Crc q;
+      Crc r = Divide(r0, r0_x_pow_D_coef, r1, &q);
+      if (r == 0) {
+        break;
+      }
+      r0_x_pow_D_coef = 0;
+
+      r0 = r1;
+      r1 = r;
+
+      Crc b = b0 ^ Multiply(q, b1);
+      b0 = b1;
+      b1 = b;
+    }
+
+    *B = b1;
+    return r1;
+  }
+
+ protected:
+  Crc canonize_;
+  Crc x_pow_2n_[sizeof(uint64) * 8];
+  Crc generating_polynomial_;
+  Crc one_;
+  Crc x_pow_minus_W_;
+  Crc crc_of_crc_;
+  Crc normalize_[2];
+  size_t crc_bytes_;
+  size_t degree_;
+} GCC_ALIGN_ATTRIBUTE(16);
+
+#pragma pack(pop)
+
+}  // namespace crcutil
+
+#endif  // CRCUTIL_GF_UTIL_H_
diff --git a/contrib/libs/crcutil/interface.cc b/contrib/libs/crcutil/interface.cc
index cecc0e3c95..dfefebba06 100644
--- a/contrib/libs/crcutil/interface.cc
+++ b/contrib/libs/crcutil/interface.cc
@@ -1,307 +1,307 @@
-// Copyright 2010 Google Inc.  All rights reserved. 
-// 
-// Licensed under the Apache License, Version 2.0 (the "License"); 
-// you may not use this file except in compliance with the License. 
-// You may obtain a copy of the License at 
-// 
-//      http://www.apache.org/licenses/LICENSE-2.0 
-// 
-// Unless required by applicable law or agreed to in writing, software 
-// distributed under the License is distributed on an "AS IS" BASIS, 
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-// See the License for the specific language governing permissions and 
-// limitations under the License. 
- 
-// This is the only file where all details of CRC implementation are buried. 
- 
-#include "interface.h" 
- 
-#include "aligned_alloc.h" 
-#include "crc32c_sse4.h" 
-#include "generic_crc.h" 
-#include "protected_crc.h" 
-#include "rolling_crc.h" 
- 
-// Align all CRC tables on kAlign boundary. 
-// Shall be exact power of 2. 
-static size_t kAlign = 4 * 1024; 
- 
-using namespace crcutil; 
- 
+// Copyright 2010 Google Inc.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// This is the only file where all details of CRC implementation are buried.
+
+#include "interface.h"
+
+#include "aligned_alloc.h"
+#include "crc32c_sse4.h"
+#include "generic_crc.h"
+#include "protected_crc.h"
+#include "rolling_crc.h"
+
+// Align all CRC tables on kAlign boundary.
+// Shall be exact power of 2.
+static size_t kAlign = 4 * 1024;
+
+using namespace crcutil;
+
 #if (!defined(__clang__) && defined(__GNUC__))
-// Suppress 'invalid access to non-static data member ...  of NULL object' 
-#undef offsetof 
-#define offsetof(TYPE, MEMBER) (reinterpret_cast <size_t> \ 
-    ((&reinterpret_cast <const char &>( \ 
-        reinterpret_cast <const TYPE *>(1)->MEMBER))) - 1) 
-#endif  // defined(__GNUC__) 
- 
-namespace crcutil_interface { 
- 
-template<typename CrcImplementation, typename RollingCrcImplementation> 
-    class Implementation : public CRC { 
- public: 
-  typedef typename CrcImplementation::Crc Crc; 
-  typedef Implementation<CrcImplementation, RollingCrcImplementation> Self; 
- 
-  Implementation(const Crc &poly, 
-                 size_t degree, 
-                 bool canonical, 
-                 const Crc &roll_start_value, 
-                 size_t roll_length) 
-    : crc_(poly, degree, canonical), 
-      rolling_crc_(crc_, roll_length, roll_start_value) { 
-  } 
- 
-  static Self *Create(const Crc &poly, 
-                      size_t degree, 
-                      bool canonical, 
-                      const Crc &roll_start_value, 
-                      size_t roll_length, 
-                      const void **allocated_memory) { 
-    void *memory = AlignedAlloc(sizeof(Self), 
-                                offsetof(Self, crc_), 
-                                kAlign, 
-                                allocated_memory); 
-    return new(memory) Self(poly, 
-                            degree, 
-                            canonical, 
-                            roll_start_value, 
-                            roll_length); 
-  } 
- 
-  virtual void Delete() { 
-    AlignedFree(this); 
-  } 
- 
-  void *operator new(size_t, void *p) { 
-    return p; 
-  } 
- 
-  virtual void GeneratingPolynomial(/* OUT */ UINT64 *lo, 
-                                    /* OUT */ UINT64 *hi = NULL) const { 
-    SetValue(crc_.Base().GeneratingPolynomial(), lo, hi); 
-  } 
- 
-  virtual size_t Degree() const { 
-    return crc_.Base().Degree(); 
-  } 
- 
-  virtual void CanonizeValue(/* OUT */ UINT64 *lo, 
-                             /* OUT */ UINT64 *hi = NULL) const { 
-    SetValue(crc_.Base().Canonize(), lo, hi); 
-  } 
- 
-  virtual void RollStartValue(/* OUT */ UINT64 *lo, 
-                              /* OUT */ UINT64 *hi = NULL) const { 
-    SetValue(rolling_crc_.StartValue(), lo, hi); 
-  } 
- 
-  virtual size_t RollWindowBytes() const { 
-    return rolling_crc_.WindowBytes(); 
-  } 
- 
-  virtual void SelfCheckValue(/* OUT */ UINT64 *lo, 
-                              /* OUT */ UINT64 *hi = NULL) const { 
-    Crc crc = crc_.CrcDefault(&crc_, sizeof(crc_), 0); 
-    crc = crc_.CrcDefault(&rolling_crc_, sizeof(rolling_crc_), crc); 
-    SetValue(crc, lo, hi); 
-  } 
- 
-  virtual void Compute(const void *data, 
-                       size_t bytes, 
-                       /* INOUT */ UINT64 *lo, 
-                       /* INOUT */ UINT64 *hi = NULL) const { 
-    SetValue(crc_.CrcDefault(data, bytes, GetValue(lo, hi)), lo, hi); 
-  } 
- 
-  virtual void RollStart(const void *data, 
-                         /* INOUT */ UINT64 *lo, 
-                         /* INOUT */ UINT64 *hi = NULL) const { 
-    SetValue(rolling_crc_.Start(data), lo, hi); 
-  } 
- 
-  virtual void Roll(size_t byte_out, 
-                    size_t byte_in, 
-                    /* INOUT */ UINT64 *lo, 
-                    /* INOUT */ UINT64 *hi = NULL) const { 
-    SetValue(rolling_crc_.Roll(GetValue(lo, hi), byte_out, byte_in), lo, hi); 
-  } 
- 
-  virtual void CrcOfZeroes(UINT64 bytes, 
-                           /* INOUT */ UINT64 *lo, 
-                           /* INOUT */ UINT64 *hi = NULL) const { 
-    SetValue(crc_.Base().CrcOfZeroes(bytes, GetValue(lo, hi)), lo, hi); 
-  } 
- 
-  virtual void ChangeStartValue( 
-      UINT64 start_old_lo, UINT64 start_old_hi, 
-      UINT64 start_new_lo, UINT64 start_new_hi, 
-      UINT64 bytes, 
-      /* INOUT */ UINT64 *lo, 
-      /* INOUT */ UINT64 *hi = NULL) const { 
-    SetValue(crc_.Base().ChangeStartValue( 
-                    GetValue(lo, hi), 
-                    bytes, 
-                    GetValue(start_old_lo, start_old_hi), 
-                    GetValue(start_new_lo, start_new_hi)), 
-             lo, 
-             hi); 
-  } 
- 
-  virtual void Concatenate(UINT64 crcB_lo, UINT64 crcB_hi, 
-                           UINT64 bytes_B, 
-                           /* INOUT */ UINT64* crcA_lo, 
-                           /* INOUT */ UINT64* crcA_hi = NULL) const { 
-    SetValue(crc_.Base().Concatenate(GetValue(crcA_lo, crcA_hi), 
-                                     GetValue(crcB_lo, crcB_hi), 
-                                     bytes_B), 
-             crcA_lo, 
-             crcA_hi); 
-  } 
- 
-  virtual size_t StoreComplementaryCrc( 
-      void *dst, 
-      UINT64 message_crc_lo, UINT64 message_crc_hi, 
-      UINT64 result_crc_lo, UINT64 result_crc_hi = 0) const { 
-    return crc_.Base().StoreComplementaryCrc( 
-        dst, 
-        GetValue(message_crc_lo, message_crc_hi), 
-        GetValue(result_crc_lo, result_crc_hi)); 
-  } 
- 
-  virtual size_t StoreCrc(void *dst, 
-                          UINT64 lo, 
-                          UINT64 hi = 0) const { 
-    return crc_.Base().StoreCrc(dst, GetValue(lo, hi)); 
-  } 
- 
-  virtual void CrcOfCrc(/* OUT */ UINT64 *lo, 
-                        /* OUT */ UINT64 *hi = NULL) const { 
-    SetValue(crc_.Base().CrcOfCrc(), lo, hi); 
-  } 
- 
- private: 
-  static Crc GetValue(UINT64 *lo, UINT64 *hi) { 
-    if (sizeof(Crc) <= sizeof(*lo)) { 
-      return CrcFromUint64<Crc>(*lo); 
-    } else { 
-      return CrcFromUint64<Crc>(*lo, *hi); 
-    } 
-  } 
- 
-  static Crc GetValue(UINT64 lo, UINT64 hi) { 
-    return CrcFromUint64<Crc>(lo, hi); 
-  } 
- 
-  static void SetValue(const Crc &crc, UINT64 *lo, UINT64 *hi) { 
-    Uint64FromCrc<Crc>(crc, 
-                       reinterpret_cast<crcutil::uint64 *>(lo), 
-                       reinterpret_cast<crcutil::uint64 *>(hi)); 
-  } 
- 
-  const CrcImplementation crc_; 
-  const RollingCrcImplementation rolling_crc_; 
- 
-  const Self &operator =(const Self &) {} 
-}; 
- 
-#if defined(_MSC_VER) 
-// 'use_sse4_2' : unreferenced formal parameter 
-#pragma warning(disable: 4100) 
-#endif  // defined(_MSC_VER) 
- 
-bool CRC::IsSSE42Available() { 
-#if HAVE_AMD64 || HAVE_I386 
-  return Crc32cSSE4::IsSSE42Available(); 
-#else 
-  return false; 
-#endif  // HAVE_AMD64 || HAVE_I386 
-} 
- 
-CRC::~CRC() {} 
-CRC::CRC() {} 
- 
-CRC *CRC::Create(UINT64 poly_lo, 
-                 UINT64 poly_hi, 
-                 size_t degree, 
-                 bool canonical, 
-                 UINT64 roll_start_value_lo, 
-                 UINT64 roll_start_value_hi, 
-                 size_t roll_length, 
-                 bool use_sse4_2, 
-                 const void **allocated_memory) { 
-  if (degree == 0) { 
-    return NULL; 
-  } 
- 
-  if (degree > 64) { 
-#if !HAVE_SSE2 
-    return NULL; 
-#else 
-    if (degree > 128) { 
-      return NULL; 
-    } 
-    uint128_sse2 poly = CrcFromUint64<uint128_sse2>(poly_lo, poly_hi); 
-    if (degree != 128 && (poly >> degree) != 0) { 
-      return NULL; 
-    } 
-    uint128_sse2 roll_start_value = 
-        CrcFromUint64<uint128_sse2>(roll_start_value_lo, roll_start_value_hi); 
-    if (degree != 128 && (roll_start_value >> degree) != 0) { 
-      return NULL; 
-    } 
-#if HAVE_I386 
-    typedef GenericCrc<uint128_sse2, uint128_sse2, crcutil::uint32, 3> Crc128; 
-#elif defined(__GNUC__) && GCC_VERSION_AVAILABLE(4, 5) 
-    typedef GenericCrc<uint128_sse2, uint128_sse2, crcutil::uint64, 6> Crc128; 
-#else 
-    typedef GenericCrc<uint128_sse2, uint128_sse2, crcutil::uint64, 4> Crc128; 
-#endif  // HAVE_I386 
-    return Implementation<Crc128, RollingCrc<Crc128> >::Create( 
-        poly, 
-        degree, 
-        canonical, 
-        roll_start_value, 
-        roll_length, 
-        allocated_memory); 
-#endif  // !HAVE_SSE2 
-  } 
- 
-#if CRCUTIL_USE_MM_CRC32 && (HAVE_I386 || HAVE_AMD64) 
-  if (use_sse4_2 && 
-      degree == Crc32cSSE4::FixedDegree() && 
-      poly_lo == Crc32cSSE4::FixedGeneratingPolynomial() && 
-      poly_hi == 0) { 
-      if (roll_start_value_hi != 0 || (roll_start_value_lo >> 32) != 0) { 
-        return NULL; 
-      } 
-    return Implementation<Crc32cSSE4, RollingCrc32cSSE4>::Create( 
-        static_cast<size_t>(poly_lo), 
-        degree, 
-        canonical, 
-        static_cast<size_t>(roll_start_value_lo), 
-        static_cast<size_t>(roll_length), 
-        allocated_memory); 
-  } 
-#endif  // CRCUTIL_USE_MM_CRC32 && (HAVE_I386 || HAVE_AMD64) 
- 
-  if (poly_hi != 0 || (degree != 64 && (poly_lo >> degree) != 0)) { 
-    return NULL; 
-  } 
-  if (roll_start_value_hi != 0 || 
-      (degree != 64 && (roll_start_value_lo >> degree) != 0)) { 
-    return NULL; 
-  } 
-  typedef GenericCrc<crcutil::uint64, crcutil::uint64, crcutil::uint64, 4> 
-      Crc64; 
-  return Implementation<Crc64, RollingCrc<Crc64> >::Create( 
-      poly_lo, 
-      degree, 
-      canonical, 
-      roll_start_value_lo, 
-      roll_length, 
-      allocated_memory); 
-} 
- 
-}  // namespace crcutil_interface 
+// Suppress 'invalid access to non-static data member ...  of NULL object'
+#undef offsetof
+#define offsetof(TYPE, MEMBER) (reinterpret_cast <size_t> \
+    ((&reinterpret_cast <const char &>( \
+        reinterpret_cast <const TYPE *>(1)->MEMBER))) - 1)
+#endif  // defined(__GNUC__)
+
+namespace crcutil_interface {
+
+template<typename CrcImplementation, typename RollingCrcImplementation>
+    class Implementation : public CRC {
+ public:
+  typedef typename CrcImplementation::Crc Crc;
+  typedef Implementation<CrcImplementation, RollingCrcImplementation> Self;
+
+  Implementation(const Crc &poly,
+                 size_t degree,
+                 bool canonical,
+                 const Crc &roll_start_value,
+                 size_t roll_length)
+    : crc_(poly, degree, canonical),
+      rolling_crc_(crc_, roll_length, roll_start_value) {
+  }
+
+  static Self *Create(const Crc &poly,
+                      size_t degree,
+                      bool canonical,
+                      const Crc &roll_start_value,
+                      size_t roll_length,
+                      const void **allocated_memory) {
+    void *memory = AlignedAlloc(sizeof(Self),
+                                offsetof(Self, crc_),
+                                kAlign,
+                                allocated_memory);
+    return new(memory) Self(poly,
+                            degree,
+                            canonical,
+                            roll_start_value,
+                            roll_length);
+  }
+
+  virtual void Delete() {
+    AlignedFree(this);
+  }
+
+  void *operator new(size_t, void *p) {
+    return p;
+  }
+
+  virtual void GeneratingPolynomial(/* OUT */ UINT64 *lo,
+                                    /* OUT */ UINT64 *hi = NULL) const {
+    SetValue(crc_.Base().GeneratingPolynomial(), lo, hi);
+  }
+
+  virtual size_t Degree() const {
+    return crc_.Base().Degree();
+  }
+
+  virtual void CanonizeValue(/* OUT */ UINT64 *lo,
+                             /* OUT */ UINT64 *hi = NULL) const {
+    SetValue(crc_.Base().Canonize(), lo, hi);
+  }
+
+  virtual void RollStartValue(/* OUT */ UINT64 *lo,
+                              /* OUT */ UINT64 *hi = NULL) const {
+    SetValue(rolling_crc_.StartValue(), lo, hi);
+  }
+
+  virtual size_t RollWindowBytes() const {
+    return rolling_crc_.WindowBytes();
+  }
+
+  virtual void SelfCheckValue(/* OUT */ UINT64 *lo,
+                              /* OUT */ UINT64 *hi = NULL) const {
+    Crc crc = crc_.CrcDefault(&crc_, sizeof(crc_), 0);
+    crc = crc_.CrcDefault(&rolling_crc_, sizeof(rolling_crc_), crc);
+    SetValue(crc, lo, hi);
+  }
+
+  virtual void Compute(const void *data,
+                       size_t bytes,
+                       /* INOUT */ UINT64 *lo,
+                       /* INOUT */ UINT64 *hi = NULL) const {
+    SetValue(crc_.CrcDefault(data, bytes, GetValue(lo, hi)), lo, hi);
+  }
+
+  virtual void RollStart(const void *data,
+                         /* INOUT */ UINT64 *lo,
+                         /* INOUT */ UINT64 *hi = NULL) const {
+    SetValue(rolling_crc_.Start(data), lo, hi);
+  }
+
+  virtual void Roll(size_t byte_out,
+                    size_t byte_in,
+                    /* INOUT */ UINT64 *lo,
+                    /* INOUT */ UINT64 *hi = NULL) const {
+    SetValue(rolling_crc_.Roll(GetValue(lo, hi), byte_out, byte_in), lo, hi);
+  }
+
+  virtual void CrcOfZeroes(UINT64 bytes,
+                           /* INOUT */ UINT64 *lo,
+                           /* INOUT */ UINT64 *hi = NULL) const {
+    SetValue(crc_.Base().CrcOfZeroes(bytes, GetValue(lo, hi)), lo, hi);
+  }
+
+  virtual void ChangeStartValue(
+      UINT64 start_old_lo, UINT64 start_old_hi,
+      UINT64 start_new_lo, UINT64 start_new_hi,
+      UINT64 bytes,
+      /* INOUT */ UINT64 *lo,
+      /* INOUT */ UINT64 *hi = NULL) const {
+    SetValue(crc_.Base().ChangeStartValue(
+                    GetValue(lo, hi),
+                    bytes,
+                    GetValue(start_old_lo, start_old_hi),
+                    GetValue(start_new_lo, start_new_hi)),
+             lo,
+             hi);
+  }
+
+  virtual void Concatenate(UINT64 crcB_lo, UINT64 crcB_hi,
+                           UINT64 bytes_B,
+                           /* INOUT */ UINT64* crcA_lo,
+                           /* INOUT */ UINT64* crcA_hi = NULL) const {
+    SetValue(crc_.Base().Concatenate(GetValue(crcA_lo, crcA_hi),
+                                     GetValue(crcB_lo, crcB_hi),
+                                     bytes_B),
+             crcA_lo,
+             crcA_hi);
+  }
+
+  virtual size_t StoreComplementaryCrc(
+      void *dst,
+      UINT64 message_crc_lo, UINT64 message_crc_hi,
+      UINT64 result_crc_lo, UINT64 result_crc_hi = 0) const {
+    return crc_.Base().StoreComplementaryCrc(
+        dst,
+        GetValue(message_crc_lo, message_crc_hi),
+        GetValue(result_crc_lo, result_crc_hi));
+  }
+
+  virtual size_t StoreCrc(void *dst,
+                          UINT64 lo,
+                          UINT64 hi = 0) const {
+    return crc_.Base().StoreCrc(dst, GetValue(lo, hi));
+  }
+
+  virtual void CrcOfCrc(/* OUT */ UINT64 *lo,
+                        /* OUT */ UINT64 *hi = NULL) const {
+    SetValue(crc_.Base().CrcOfCrc(), lo, hi);
+  }
+
+ private:
+  static Crc GetValue(UINT64 *lo, UINT64 *hi) {
+    if (sizeof(Crc) <= sizeof(*lo)) {
+      return CrcFromUint64<Crc>(*lo);
+    } else {
+      return CrcFromUint64<Crc>(*lo, *hi);
+    }
+  }
+
+  static Crc GetValue(UINT64 lo, UINT64 hi) {
+    return CrcFromUint64<Crc>(lo, hi);
+  }
+
+  static void SetValue(const Crc &crc, UINT64 *lo, UINT64 *hi) {
+    Uint64FromCrc<Crc>(crc,
+                       reinterpret_cast<crcutil::uint64 *>(lo),
+                       reinterpret_cast<crcutil::uint64 *>(hi));
+  }
+
+  const CrcImplementation crc_;
+  const RollingCrcImplementation rolling_crc_;
+
+  const Self &operator =(const Self &) {}
+};
+
+#if defined(_MSC_VER)
+// 'use_sse4_2' : unreferenced formal parameter
+#pragma warning(disable: 4100)
+#endif  // defined(_MSC_VER)
+
+bool CRC::IsSSE42Available() {
+#if HAVE_AMD64 || HAVE_I386
+  return Crc32cSSE4::IsSSE42Available();
+#else
+  return false;
+#endif  // HAVE_AMD64 || HAVE_I386
+}
+
+CRC::~CRC() {}
+CRC::CRC() {}
+
+CRC *CRC::Create(UINT64 poly_lo,
+                 UINT64 poly_hi,
+                 size_t degree,
+                 bool canonical,
+                 UINT64 roll_start_value_lo,
+                 UINT64 roll_start_value_hi,
+                 size_t roll_length,
+                 bool use_sse4_2,
+                 const void **allocated_memory) {
+  if (degree == 0) {
+    return NULL;
+  }
+
+  if (degree > 64) {
+#if !HAVE_SSE2
+    return NULL;
+#else
+    if (degree > 128) {
+      return NULL;
+    }
+    uint128_sse2 poly = CrcFromUint64<uint128_sse2>(poly_lo, poly_hi);
+    if (degree != 128 && (poly >> degree) != 0) {
+      return NULL;
+    }
+    uint128_sse2 roll_start_value =
+        CrcFromUint64<uint128_sse2>(roll_start_value_lo, roll_start_value_hi);
+    if (degree != 128 && (roll_start_value >> degree) != 0) {
+      return NULL;
+    }
+#if HAVE_I386
+    typedef GenericCrc<uint128_sse2, uint128_sse2, crcutil::uint32, 3> Crc128;
+#elif defined(__GNUC__) && GCC_VERSION_AVAILABLE(4, 5)
+    typedef GenericCrc<uint128_sse2, uint128_sse2, crcutil::uint64, 6> Crc128;
+#else
+    typedef GenericCrc<uint128_sse2, uint128_sse2, crcutil::uint64, 4> Crc128;
+#endif  // HAVE_I386
+    return Implementation<Crc128, RollingCrc<Crc128> >::Create(
+        poly,
+        degree,
+        canonical,
+        roll_start_value,
+        roll_length,
+        allocated_memory);
+#endif  // !HAVE_SSE2
+  }
+
+#if CRCUTIL_USE_MM_CRC32 && (HAVE_I386 || HAVE_AMD64)
+  if (use_sse4_2 &&
+      degree == Crc32cSSE4::FixedDegree() &&
+      poly_lo == Crc32cSSE4::FixedGeneratingPolynomial() &&
+      poly_hi == 0) {
+      if (roll_start_value_hi != 0 || (roll_start_value_lo >> 32) != 0) {
+        return NULL;
+      }
+    return Implementation<Crc32cSSE4, RollingCrc32cSSE4>::Create(
+        static_cast<size_t>(poly_lo),
+        degree,
+        canonical,
+        static_cast<size_t>(roll_start_value_lo),
+        static_cast<size_t>(roll_length),
+        allocated_memory);
+  }
+#endif  // CRCUTIL_USE_MM_CRC32 && (HAVE_I386 || HAVE_AMD64)
+
+  if (poly_hi != 0 || (degree != 64 && (poly_lo >> degree) != 0)) {
+    return NULL;
+  }
+  if (roll_start_value_hi != 0 ||
+      (degree != 64 && (roll_start_value_lo >> degree) != 0)) {
+    return NULL;
+  }
+  typedef GenericCrc<crcutil::uint64, crcutil::uint64, crcutil::uint64, 4>
+      Crc64;
+  return Implementation<Crc64, RollingCrc<Crc64> >::Create(
+      poly_lo,
+      degree,
+      canonical,
+      roll_start_value_lo,
+      roll_length,
+      allocated_memory);
+}
+
+}  // namespace crcutil_interface
diff --git a/contrib/libs/crcutil/interface.h b/contrib/libs/crcutil/interface.h
index 2c43f95ba9..2b3e2ee939 100644
--- a/contrib/libs/crcutil/interface.h
+++ b/contrib/libs/crcutil/interface.h
@@ -1,204 +1,204 @@
-// Copyright 2010 Google Inc.  All rights reserved. 
-// 
-// Licensed under the Apache License, Version 2.0 (the "License"); 
-// you may not use this file except in compliance with the License. 
-// You may obtain a copy of the License at 
-// 
-//      http://www.apache.org/licenses/LICENSE-2.0 
-// 
-// Unless required by applicable law or agreed to in writing, software 
-// distributed under the License is distributed on an "AS IS" BASIS, 
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-// See the License for the specific language governing permissions and 
-// limitations under the License. 
- 
-// Example how to use CRC implementation via the interface which 
-// hides details of implementation. 
-// 
-// The raw implementation is not indended to be used in a project 
-// directly because: 
-// - Implementation lives in the header files because that is the 
-//   only way to use templates efficiently. 
-// - Header files are quite "dirty" -- they define and use a 
-//   lot of macros. Bringing these macros to all files in 
-//   a project is not particularly good idea. 
-// - The code takes forever to compile with GCC (e.g. GCC 
-//   4.4.3 and 4.5.0 compile the unittest for about 30 seconds). 
-// 
-// Solution: 
-// - Create your own, clean interface. 
-// - Do not expose interface internals in a header file. 
-// - Proxy all calls to your interface to CRC implementation. 
-// - Keep only one copy of actual implementation. 
- 
-#ifndef CRCUTIL_INTERFACE_H_ 
-#define CRCUTIL_INTERFACE_H_ 
- 
-#include "std_headers.h"    // size_t 
- 
-namespace crcutil_interface { 
- 
-// Many projects define their own uint64. Do it here. 
-typedef unsigned long long UINT64; 
- 
-class CRC { 
- public: 
-  // Creates new instance of CRC class. 
-  // If arguments are illegal (e.g. provided generating polynomial 
-  // has more bits than provided degree), returns NULL. 
-  // 
-  // poly_* - generating polynomial (reversed bit format). 
-  // degree - degree of generating polynomial. 
-  // canonical - if true, input CRC value will be XOR'ed with 
-  //             (inverted) before and after CRC computation. 
-  // roll_start_value - starting value of rolling CRC. 
-  // roll_window_bytes - length of rolling CRC window in bytes. 
-  //                     If roll_length is 0, roll_start_value 
-  //                     shall be 0. 
-  // use_sse4_2 - if true, use SSE4.2 crc32 instruction to compute 
-  //              CRC when generating polynomial is CRC32C (Castagnoli) 
-  // allocated_memory - optional (may be NULL) address of a variable 
-  //                    to store the address of actually allocated memory. 
-  static CRC *Create(UINT64 poly_lo, 
-                     UINT64 poly_hi, 
-                     size_t degree, 
-                     bool canonical, 
-                     UINT64 roll_start_value_lo, 
-                     UINT64 roll_start_value_hi, 
-                     size_t roll_window_bytes, 
-                     bool use_sse4_2, 
-                     const void **allocated_memory); 
- 
-  // Deletes the instance of CRC class. 
-  virtual void Delete() = 0; 
- 
-  // Returns true if SSE4.2 is available. 
-  static bool IsSSE42Available(); 
- 
-  // Returns generating polynomial. 
-  virtual void GeneratingPolynomial(/* OUT */ UINT64 *lo, 
-                                    /* OUT */ UINT64 *hi = NULL) const = 0; 
- 
-  // Returns degree of generating polynomial. 
-  virtual size_t Degree() const = 0; 
- 
-  // Returns canonization constant used to XOR crc value 
-  // before and after CRC computation. 
-  virtual void CanonizeValue(/* OUT */ UINT64 *lo, 
-                             /* OUT */ UINT64 *hi = NULL) const = 0; 
- 
-  // Returns rolling CRC starting value. 
-  virtual void RollStartValue(/* OUT */ UINT64 *lo, 
-                              /* OUT */ UINT64 *hi = NULL) const = 0; 
- 
-  // Returns length of rolling CRC window. 
-  virtual size_t RollWindowBytes() const = 0; 
- 
-  // Returns CRC of CRC tables to enable verification 
-  // of integrity of CRC function itself by comparing 
-  // the result with pre-computed value. 
-  virtual void SelfCheckValue(/* OUT */ UINT64 *lo, 
-                              /* OUT */ UINT64 *hi = NULL) const = 0; 
- 
-  // Given CRC value of previous chunk of data, 
-  // extends it to new chunk, retuning the result in-place. 
-  // 
-  // If degree of CRC polynomial is 64 or less, 
-  // (*hi) will not be touched. 
-  virtual void Compute(const void *data, 
-                       size_t bytes, 
-                       /* INOUT */ UINT64 *lo, 
-                       /* INOUT */ UINT64 *hi = NULL) const = 0; 
- 
-  // Starts rolling CRC by computing CRC of first 
-  // "roll_length" bytes of "data", using "roll_start_value" 
-  // as starting value (see Create()). 
-  // Should not be called if the value of "roll_value" was 0. 
-  virtual void RollStart(const void *data, 
-                         /* OUT */ UINT64 *lo, 
-                         /* OUT */ UINT64 *hi = NULL) const = 0; 
- 
-  // Rolls CRC by 1 byte, given the bytes leaving and 
-  // entering the window of "roll_length" bytes. 
-  // RollStart() should be called before "Roll". 
-  // Should not be called if the value of "roll_value" was 0. 
-  virtual void Roll(size_t byte_out, 
-                    size_t byte_in, 
-                    /* INOUT */ UINT64 *lo, 
-                    /* INOUT */ UINT64 *hi = NULL) const = 0; 
- 
-  // Computes CRC of sequence of zeroes -- without touching the data. 
-  virtual void CrcOfZeroes(UINT64 bytes, 
-                           /* INOUT */ UINT64 *lo, 
-                           /* INOUT */ UINT64 *hi = NULL) const = 0; 
- 
-  // Computes value of CRC(A, bytes, start_new) given known 
-  // crc=CRC(A, bytes, start_old) -- without touching the data. 
-  virtual void ChangeStartValue( 
-      UINT64 start_old_lo, UINT64 start_old_hi, 
-      UINT64 start_new_lo, UINT64 start_new_hi, 
-      UINT64 bytes, 
-      /* INOUT */ UINT64 *lo, 
-      /* INOUT */ UINT64 *hi = NULL) const = 0; 
- 
-  // Returns CRC of concatenation of blocks A and B when CRCs 
-  // of blocks A and B are known -- without touching the data. 
-  // 
-  // To be precise, given CRC(A, |A|, startA) and CRC(B, |B|, 0), 
-  // returns CRC(AB, |AB|, startA). 
-  virtual void Concatenate(UINT64 crcB_lo, UINT64 crcB_hi, 
-                           UINT64 bytes_B, 
-                           /* INOUT */ UINT64* crcA_lo, 
-                           /* INOUT */ UINT64* crcA_hi = NULL) const = 0; 
- 
-  // Given CRC of a message, stores extra (degree + 7)/8 bytes after 
-  // the message so that CRC(message+extra, start) = result. 
-  // Does not change CRC start value (use ChangeStartValue for that). 
-  // Returns number of stored bytes. 
-  virtual size_t StoreComplementaryCrc( 
-      void *dst, 
-      UINT64 message_crc_lo, UINT64 message_crc_hi, 
-      UINT64 result_crc_lo, UINT64 result_crc_hi = 0) const = 0; 
- 
-  // Stores given CRC of a message as (degree + 7)/8 bytes filled 
-  // with 0s to the right. Returns number of stored bytes. 
-  // CRC of the message and stored CRC is a constant value returned 
-  // by CrcOfCrc() -- it does not depend on contents of the message. 
-  virtual size_t StoreCrc(/* OUT */ void *dst, 
-                          UINT64 lo, 
-                          UINT64 hi = 0) const = 0; 
- 
-  // Computes expected CRC value of CRC(Message,CRC(Message)) 
-  // when CRC is stored after the message. This value is fixed 
-  // and does not depend on the message or CRC start value. 
-  virtual void CrcOfCrc(/* OUT */ UINT64 *lo, 
-                        /* OUT */ UINT64 *hi = NULL) const = 0; 
- 
- protected: 
-  // CRC instance should be created only once (most of the time): 
-  // - Creation and initializion is relatively expensive. 
-  // - CRC is fully defined by its generating polynomials 
-  //   (well, and few more parameters). 
-  // - CRC instances are pure constants. There is no 
-  //   reason to have 2 instances of the same CRC. 
-  // - There are not too many generating polynomials that are 
-  //   used on practice. It is hard to imagine a project 
-  //   which uses 50 different generating polynomials. 
-  //   Thus, a handful of CRC instances is sufficient 
-  //   to cover the needs of even very large project. 
-  // - Finally and most importantly, CRC tables should be 
-  //   aligned properly. No, the instances of CRC class 
-  //   are not created by blind "new" -- they use placement 
-  //   "new" and, in absense of placement "delete", 
-  //   should be deleted by calling explicit Delete() method. 
-  virtual ~CRC(); 
- 
-  // Cannot instantiate the class -- instances may be created 
-  // by CRC::Create() only. 
-  CRC(); 
-}; 
- 
-}  // namespace crcutil_interface 
- 
- 
-#endif  // CRCUTIL_INTERFACE_H_ 
+// Copyright 2010 Google Inc.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Example how to use CRC implementation via the interface which
+// hides details of implementation.
+//
+// The raw implementation is not indended to be used in a project
+// directly because:
+// - Implementation lives in the header files because that is the
+//   only way to use templates efficiently.
+// - Header files are quite "dirty" -- they define and use a
+//   lot of macros. Bringing these macros to all files in
+//   a project is not particularly good idea.
+// - The code takes forever to compile with GCC (e.g. GCC
+//   4.4.3 and 4.5.0 compile the unittest for about 30 seconds).
+//
+// Solution:
+// - Create your own, clean interface.
+// - Do not expose interface internals in a header file.
+// - Proxy all calls to your interface to CRC implementation.
+// - Keep only one copy of actual implementation.
+
+#ifndef CRCUTIL_INTERFACE_H_
+#define CRCUTIL_INTERFACE_H_
+
+#include "std_headers.h"    // size_t
+
+namespace crcutil_interface {
+
+// Many projects define their own uint64. Do it here.
+typedef unsigned long long UINT64;
+
+class CRC {
+ public:
+  // Creates new instance of CRC class.
+  // If arguments are illegal (e.g. provided generating polynomial
+  // has more bits than provided degree), returns NULL.
+  //
+  // poly_* - generating polynomial (reversed bit format).
+  // degree - degree of generating polynomial.
+  // canonical - if true, input CRC value will be XOR'ed with
+  //             (inverted) before and after CRC computation.
+  // roll_start_value - starting value of rolling CRC.
+  // roll_window_bytes - length of rolling CRC window in bytes.
+  //                     If roll_length is 0, roll_start_value
+  //                     shall be 0.
+  // use_sse4_2 - if true, use SSE4.2 crc32 instruction to compute
+  //              CRC when generating polynomial is CRC32C (Castagnoli)
+  // allocated_memory - optional (may be NULL) address of a variable
+  //                    to store the address of actually allocated memory.
+  static CRC *Create(UINT64 poly_lo,
+                     UINT64 poly_hi,
+                     size_t degree,
+                     bool canonical,
+                     UINT64 roll_start_value_lo,
+                     UINT64 roll_start_value_hi,
+                     size_t roll_window_bytes,
+                     bool use_sse4_2,
+                     const void **allocated_memory);
+
+  // Deletes the instance of CRC class.
+  virtual void Delete() = 0;
+
+  // Returns true if SSE4.2 is available.
+  static bool IsSSE42Available();
+
+  // Returns generating polynomial.
+  virtual void GeneratingPolynomial(/* OUT */ UINT64 *lo,
+                                    /* OUT */ UINT64 *hi = NULL) const = 0;
+
+  // Returns degree of generating polynomial.
+  virtual size_t Degree() const = 0;
+
+  // Returns canonization constant used to XOR crc value
+  // before and after CRC computation.
+  virtual void CanonizeValue(/* OUT */ UINT64 *lo,
+                             /* OUT */ UINT64 *hi = NULL) const = 0;
+
+  // Returns rolling CRC starting value.
+  virtual void RollStartValue(/* OUT */ UINT64 *lo,
+                              /* OUT */ UINT64 *hi = NULL) const = 0;
+
+  // Returns length of rolling CRC window.
+  virtual size_t RollWindowBytes() const = 0;
+
+  // Returns CRC of CRC tables to enable verification
+  // of integrity of CRC function itself by comparing
+  // the result with pre-computed value.
+  virtual void SelfCheckValue(/* OUT */ UINT64 *lo,
+                              /* OUT */ UINT64 *hi = NULL) const = 0;
+
+  // Given CRC value of previous chunk of data,
+  // extends it to new chunk, retuning the result in-place.
+  //
+  // If degree of CRC polynomial is 64 or less,
+  // (*hi) will not be touched.
+  virtual void Compute(const void *data,
+                       size_t bytes,
+                       /* INOUT */ UINT64 *lo,
+                       /* INOUT */ UINT64 *hi = NULL) const = 0;
+
+  // Starts rolling CRC by computing CRC of first
+  // "roll_length" bytes of "data", using "roll_start_value"
+  // as starting value (see Create()).
+  // Should not be called if the value of "roll_value" was 0.
+  virtual void RollStart(const void *data,
+                         /* OUT */ UINT64 *lo,
+                         /* OUT */ UINT64 *hi = NULL) const = 0;
+
+  // Rolls CRC by 1 byte, given the bytes leaving and
+  // entering the window of "roll_length" bytes.
+  // RollStart() should be called before "Roll".
+  // Should not be called if the value of "roll_value" was 0.
+  virtual void Roll(size_t byte_out,
+                    size_t byte_in,
+                    /* INOUT */ UINT64 *lo,
+                    /* INOUT */ UINT64 *hi = NULL) const = 0;
+
+  // Computes CRC of sequence of zeroes -- without touching the data.
+  virtual void CrcOfZeroes(UINT64 bytes,
+                           /* INOUT */ UINT64 *lo,
+                           /* INOUT */ UINT64 *hi = NULL) const = 0;
+
+  // Computes value of CRC(A, bytes, start_new) given known
+  // crc=CRC(A, bytes, start_old) -- without touching the data.
+  virtual void ChangeStartValue(
+      UINT64 start_old_lo, UINT64 start_old_hi,
+      UINT64 start_new_lo, UINT64 start_new_hi,
+      UINT64 bytes,
+      /* INOUT */ UINT64 *lo,
+      /* INOUT */ UINT64 *hi = NULL) const = 0;
+
+  // Returns CRC of concatenation of blocks A and B when CRCs
+  // of blocks A and B are known -- without touching the data.
+  //
+  // To be precise, given CRC(A, |A|, startA) and CRC(B, |B|, 0),
+  // returns CRC(AB, |AB|, startA).
+  virtual void Concatenate(UINT64 crcB_lo, UINT64 crcB_hi,
+                           UINT64 bytes_B,
+                           /* INOUT */ UINT64* crcA_lo,
+                           /* INOUT */ UINT64* crcA_hi = NULL) const = 0;
+
+  // Given CRC of a message, stores extra (degree + 7)/8 bytes after
+  // the message so that CRC(message+extra, start) = result.
+  // Does not change CRC start value (use ChangeStartValue for that).
+  // Returns number of stored bytes.
+  virtual size_t StoreComplementaryCrc(
+      void *dst,
+      UINT64 message_crc_lo, UINT64 message_crc_hi,
+      UINT64 result_crc_lo, UINT64 result_crc_hi = 0) const = 0;
+
+  // Stores given CRC of a message as (degree + 7)/8 bytes filled
+  // with 0s to the right. Returns number of stored bytes.
+  // CRC of the message and stored CRC is a constant value returned
+  // by CrcOfCrc() -- it does not depend on contents of the message.
+  virtual size_t StoreCrc(/* OUT */ void *dst,
+                          UINT64 lo,
+                          UINT64 hi = 0) const = 0;
+
+  // Computes expected CRC value of CRC(Message,CRC(Message))
+  // when CRC is stored after the message. This value is fixed
+  // and does not depend on the message or CRC start value.
+  virtual void CrcOfCrc(/* OUT */ UINT64 *lo,
+                        /* OUT */ UINT64 *hi = NULL) const = 0;
+
+ protected:
+  // CRC instance should be created only once (most of the time):
+  // - Creation and initializion is relatively expensive.
+  // - CRC is fully defined by its generating polynomials
+  //   (well, and few more parameters).
+  // - CRC instances are pure constants. There is no
+  //   reason to have 2 instances of the same CRC.
+  // - There are not too many generating polynomials that are
+  //   used on practice. It is hard to imagine a project
+  //   which uses 50 different generating polynomials.
+  //   Thus, a handful of CRC instances is sufficient
+  //   to cover the needs of even very large project.
+  // - Finally and most importantly, CRC tables should be
+  //   aligned properly. No, the instances of CRC class
+  //   are not created by blind "new" -- they use placement
+  //   "new" and, in absense of placement "delete",
+  //   should be deleted by calling explicit Delete() method.
+  virtual ~CRC();
+
+  // Cannot instantiate the class -- instances may be created
+  // by CRC::Create() only.
+  CRC();
+};
+
+}  // namespace crcutil_interface
+
+
+#endif  // CRCUTIL_INTERFACE_H_
diff --git a/contrib/libs/crcutil/multiword_128_64_gcc_amd64_sse2.cc b/contrib/libs/crcutil/multiword_128_64_gcc_amd64_sse2.cc
index 92713cabd5..f94fd1fa36 100644
--- a/contrib/libs/crcutil/multiword_128_64_gcc_amd64_sse2.cc
+++ b/contrib/libs/crcutil/multiword_128_64_gcc_amd64_sse2.cc
@@ -1,291 +1,291 @@
-// Copyright 2010 Google Inc.  All rights reserved. 
-// 
-// Licensed under the Apache License, Version 2.0 (the "License"); 
-// you may not use this file except in compliance with the License. 
-// You may obtain a copy of the License at 
-// 
-//      http://www.apache.org/licenses/LICENSE-2.0 
-// 
-// Unless required by applicable law or agreed to in writing, software 
-// distributed under the License is distributed on an "AS IS" BASIS, 
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-// See the License for the specific language governing permissions and 
-// limitations under the License. 
- 
-// Implements multiword CRC for GCC on i386. 
-// 
-// Small comment: the trick described in 
-// http://software.intel.com/en-us/articles/fast-simd-integer-move-for-the-intel-pentiumr-4-processor 
-// (replace "movdqa dst, src" with "pshufd $0xE4, src, dst") 
-// did not work: execution time increased from 
-// 1.8 CPU cycles/byte to 2.1 CPU cycles/byte. 
-// So it may be good idea on P4 but it's not on newer CPUs. 
-// 
-// movaps/xorps vs. movdqa/pxor did not make any difference. 
- 
-#include "generic_crc.h" 
-#include "uint128_sse2.h" 
- 
-#if defined(__GNUC__) && CRCUTIL_USE_ASM && HAVE_AMD64 && HAVE_SSE2 
- 
-namespace crcutil { 
- 
-template<> uint128_sse2 
-GenericCrc<uint128_sse2, uint128_sse2, uint64, 4>::CrcMultiwordGccAmd64Sse2( 
-    const uint8 *src, const uint8 *end, const uint128_sse2 &start) const; 
- 
-template<> 
-uint128_sse2 GenericCrc<uint128_sse2, uint128_sse2, uint64, 4>::CrcMultiword( 
-    const void *data, size_t bytes, const uint128_sse2 &start) const { 
-  const uint8 *src = static_cast<const uint8 *>(data); 
-  uint128_sse2 crc = start ^ this->Base().Canonize(); 
-  const uint8 *end = src + bytes; 
-  if (bytes <= 7) { 
-    for (; src < end; ++src) { 
-      CRC_BYTE(this, crc, *src); 
-    } 
-    return (crc ^ this->Base().Canonize()); 
-  } 
- 
-  ALIGN_ON_WORD_BOUNDARY_IF_NEEDED(bytes, this, src, end, crc, uint64); 
-  if (src >= end) { 
-    return (crc ^ this->Base().Canonize()); 
-  } 
- 
-  return CrcMultiwordGccAmd64Sse2(src, end, crc); 
-} 
- 
-#define CRC_WORD_ASM() \ 
-    SSE2_MOVQ " %[crc0], %[tmp0]\n" \ 
-    "xorq %[tmp0], %[buf0]\n" \ 
-    "psrldq $8, %[crc0]\n" \ 
-    "movzbq %b[buf0], %[tmp0]\n" \ 
-    "shrq $8, %[buf0]\n" \ 
-    "addq %[tmp0], %[tmp0]\n" \ 
-    "pxor (%[table_word], %[tmp0], 8), %[crc0]\n" \ 
-    "movzbq %b[buf0], %[tmp1]\n" \ 
-    "shrq $8, %[buf0]\n" \ 
-    "addq %[tmp1], %[tmp1]\n" \ 
-    "pxor 1*256*16(%[table_word], %[tmp1], 8), %[crc0]\n" \ 
-    "movzbq %b[buf0], %[tmp0]\n" \ 
-    "shrq $8, %[buf0]\n" \ 
-    "addq %[tmp0], %[tmp0]\n" \ 
-    "pxor 2*256*16(%[table_word], %[tmp0], 8), %[crc0]\n" \ 
-    "movzbq %b[buf0], %[tmp1]\n" \ 
-    "shrq $8, %[buf0]\n" \ 
-    "addq %[tmp1], %[tmp1]\n" \ 
-    "pxor 3*256*16(%[table_word], %[tmp1], 8), %[crc0]\n" \ 
-    "movzbq %b[buf0], %[tmp0]\n" \ 
-    "shrq $8, %[buf0]\n" \ 
-    "addq %[tmp0], %[tmp0]\n" \ 
-    "pxor 4*256*16(%[table_word], %[tmp0], 8), %[crc0]\n" \ 
-    "movzbq %b[buf0], %[tmp1]\n" \ 
-    "shrq $8, %[buf0]\n" \ 
-    "addq %[tmp1], %[tmp1]\n" \ 
-    "pxor 5*256*16(%[table_word], %[tmp1], 8), %[crc0]\n" \ 
-    "movzbq %b[buf0], %[tmp0]\n" \ 
-    "shrq $8, %[buf0]\n" \ 
-    "addq %[tmp0], %[tmp0]\n" \ 
-    "pxor 6*256*16(%[table_word], %[tmp0], 8), %[crc0]\n" \ 
-    "addq %[buf0], %[buf0]\n" \ 
-    "pxor 7*256*16(%[table_word], %[buf0], 8), %[crc0]\n" 
- 
-template<> uint128_sse2 
-GenericCrc<uint128_sse2, uint128_sse2, uint64, 4>::CrcMultiwordGccAmd64Sse2( 
-    const uint8 *src, const uint8 *end, const uint128_sse2 &start) const { 
-  __m128i crc0 = start; 
-  __m128i crc1; 
-  __m128i crc2; 
-  __m128i crc3; 
-  __m128i crc_carryover; 
- 
-  uint64 buf0; 
-  uint64 buf1; 
-  uint64 buf2; 
-  uint64 buf3; 
- 
-  uint64 tmp0; 
-  uint64 tmp1; 
- 
-  asm( 
-    "sub $2*4*8 - 1, %[end]\n" 
-    "cmpq  %[src], %[end]\n" 
-    "jbe 2f\n" 
- 
-    "pxor %[crc1], %[crc1]\n" 
-    "pxor %[crc2], %[crc2]\n" 
-    "pxor %[crc3], %[crc3]\n" 
-    "pxor %[crc_carryover], %[crc_carryover]\n" 
-    "movq (%[src]), %[buf0]\n" 
-    "movq 1*8(%[src]), %[buf1]\n" 
-    "movq 2*8(%[src]), %[buf2]\n" 
-    "movq 3*8(%[src]), %[buf3]\n" 
- 
-    "1:\n" 
-#if HAVE_SSE && CRCUTIL_PREFETCH_WIDTH > 0 
-    "prefetcht0 " TO_STRING(CRCUTIL_PREFETCH_WIDTH) "(%[src])\n" 
-#endif 
-#if GCC_VERSION_AVAILABLE(4, 5) 
-    // Bug in GCC 4.2.4? 
-    "add $4*8, %[src]\n" 
-#else 
-    "lea 4*8(%[src]), %[src]\n" 
-#endif 
-    "pxor %[crc_carryover], %[crc0]\n" 
- 
-    SSE2_MOVQ " %[crc0], %[tmp0]\n" 
-    "psrldq $8, %[crc0]\n" 
-    "xorq %[tmp0], %[buf0]\n" 
-    "movzbq %b[buf0], %[tmp0]\n" 
-    "pxor %[crc0], %[crc1]\n" 
-    "addq %[tmp0], %[tmp0]\n" 
-    "shrq $8, %[buf0]\n" 
-    "movdqa (%[table], %[tmp0], 8), %[crc0]\n" 
- 
-    SSE2_MOVQ " %[crc1], %[tmp1]\n" 
-    "psrldq $8, %[crc1]\n" 
-    "xorq %[tmp1], %[buf1]\n" 
-    "movzbq %b[buf1], %[tmp1]\n" 
-    "pxor %[crc1], %[crc2]\n" 
-    "addq %[tmp1], %[tmp1]\n" 
-    "shrq $8, %[buf1]\n" 
-    "movdqa (%[table], %[tmp1], 8), %[crc1]\n" 
- 
-    SSE2_MOVQ " %[crc2], %[tmp0]\n" 
-    "psrldq $8, %[crc2]\n" 
-    "xorq %[tmp0], %[buf2]\n" 
-    "movzbq %b[buf2], %[tmp0]\n" 
-    "pxor %[crc2], %[crc3]\n" 
-    "addq %[tmp0], %[tmp0]\n" 
-    "shrq $8, %[buf2]\n" 
-    "movdqa (%[table], %[tmp0], 8), %[crc2]\n" 
- 
-    SSE2_MOVQ " %[crc3], %[tmp1]\n" 
-    "psrldq $8, %[crc3]\n" 
-    "xorq %[tmp1], %[buf3]\n" 
-    "movzbq %b[buf3], %[tmp1]\n" 
-    "movdqa %[crc3], %[crc_carryover]\n" 
-    "addq %[tmp1], %[tmp1]\n" 
-    "shrq $8, %[buf3]\n" 
-    "movdqa (%[table], %[tmp1], 8), %[crc3]\n" 
- 
-#define XOR(byte) \ 
-    "movzbq %b[buf0], %[tmp0]\n" \ 
-    "shrq $8, %[buf0]\n" \ 
-    "addq %[tmp0], %[tmp0]\n" \ 
-    "pxor " #byte "*256*16(%[table], %[tmp0], 8), %[crc0]\n" \ 
-    "movzbq %b[buf1], %[tmp1]\n" \ 
-    "shrq $8, %[buf1]\n" \ 
-    "addq %[tmp1], %[tmp1]\n" \ 
-    "pxor " #byte "*256*16(%[table], %[tmp1], 8), %[crc1]\n" \ 
-    "movzbq %b[buf2], %[tmp0]\n" \ 
-    "shrq $8, %[buf2]\n" \ 
-    "addq %[tmp0], %[tmp0]\n" \ 
-    "pxor " #byte "*256*16(%[table], %[tmp0], 8), %[crc2]\n" \ 
-    "movzbq %b[buf3], %[tmp1]\n" \ 
-    "shrq $8, %[buf3]\n" \ 
-    "addq %[tmp1], %[tmp1]\n" \ 
-    "pxor " #byte "*256*16(%[table], %[tmp1], 8), %[crc3]\n" 
- 
-    XOR(1) 
-    XOR(2) 
-    XOR(3) 
-    XOR(4) 
-    XOR(5) 
-    XOR(6) 
-#undef XOR 
- 
-    "addq %[buf0], %[buf0]\n" 
-    "pxor 7*256*16(%[table], %[buf0], 8), %[crc0]\n" 
-    "movq (%[src]), %[buf0]\n" 
- 
-    "addq %[buf1], %[buf1]\n" 
-    "pxor 7*256*16(%[table], %[buf1], 8), %[crc1]\n" 
-    "movq 1*8(%[src]), %[buf1]\n" 
- 
-    "addq %[buf2], %[buf2]\n" 
-    "pxor 7*256*16(%[table], %[buf2], 8), %[crc2]\n" 
-    "movq 2*8(%[src]), %[buf2]\n" 
- 
-    "addq %[buf3], %[buf3]\n" 
-    "pxor 7*256*16(%[table], %[buf3], 8), %[crc3]\n" 
-    "movq 3*8(%[src]), %[buf3]\n" 
- 
-    "cmpq %[src], %[end]\n" 
-    "ja 1b\n" 
- 
-    "pxor %[crc_carryover], %[crc0]\n" 
-    CRC_WORD_ASM() 
- 
-    "pxor %[crc1], %[crc0]\n" 
-    "movq %[buf1], %[buf0]\n" 
-    CRC_WORD_ASM() 
- 
-    "pxor %[crc2], %[crc0]\n" 
-    "movq %[buf2], %[buf0]\n" 
-    CRC_WORD_ASM() 
- 
-    "pxor %[crc3], %[crc0]\n" 
-    "movq %[buf3], %[buf0]\n" 
-    CRC_WORD_ASM() 
- 
-    "add $4*8, %[src]\n" 
-    "2:\n" 
- 
-    "add $2*4*8 - 8, %[end]\n" 
- 
-    "cmpq %[src], %[end]\n" 
-    "jbe 4f\n" 
-    "3:\n" 
-    "movq (%[src]), %[buf0]\n" 
-    "addq $8, %[src]\n" 
-    CRC_WORD_ASM() 
-    "cmpq %[src], %[end]\n" 
-    "ja 3b\n" 
- 
-    "4:\n" 
-    "add $7, %[end]\n" 
- 
-    "cmpq %[src], %[end]\n" 
-    "jbe 6f\n" 
- 
-    "5:\n" 
-    "movzbq (%[src]), %[buf0]\n" 
-    "add $1, %[src]\n" 
-    SSE2_MOVQ " %[crc0], %[tmp0]\n" 
-    "movzx %b[tmp0], %[tmp0]\n" 
-    "psrldq $1, %[crc0]\n" 
-    "xor %[buf0], %[tmp0]\n" 
-    "addq %[tmp0], %[tmp0]\n" 
-    "pxor 7*256*16(%[table_word], %[tmp0], 8), %[crc0]\n" 
- 
-    "cmpq %[src], %[end]\n" 
-    "ja 5b\n" 
- 
-    "6:\n" 
- 
-    :   // outputs 
-      [src] "+r" (src), 
-      [end] "+r" (end), 
-      [crc0] "+x" (crc0), 
-      [crc1] "=&x" (crc1), 
-      [crc2] "=&x" (crc2), 
-      [crc3] "=&x" (crc3), 
-      [crc_carryover] "=&x" (crc_carryover), 
-      [buf0] "=&r" (buf0), 
-      [buf1] "=&r" (buf1), 
-      [buf2] "=&r" (buf2), 
-      [buf3] "=&r" (buf3), 
-      [tmp0] "=&r" (tmp0), 
-      [tmp1] "=&r" (tmp1) 
- 
-    :   // inputs 
-      [table_word] "r" (this->crc_word_), 
-      [table] "r" (this->crc_word_interleaved_)); 
- 
-  return (this->Base().Canonize() ^ crc0); 
-} 
- 
-}  // namespace crcutil 
- 
-#endif  // defined(__GNUC__) && CRCUTIL_USE_ASM && HAVE_AMD64 && HAVE_SSE2 
+// Copyright 2010 Google Inc.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Implements multiword CRC for GCC on i386.
+//
+// Small comment: the trick described in
+// http://software.intel.com/en-us/articles/fast-simd-integer-move-for-the-intel-pentiumr-4-processor
+// (replace "movdqa dst, src" with "pshufd $0xE4, src, dst")
+// did not work: execution time increased from
+// 1.8 CPU cycles/byte to 2.1 CPU cycles/byte.
+// So it may be good idea on P4 but it's not on newer CPUs.
+//
+// movaps/xorps vs. movdqa/pxor did not make any difference.
+
+#include "generic_crc.h"
+#include "uint128_sse2.h"
+
+#if defined(__GNUC__) && CRCUTIL_USE_ASM && HAVE_AMD64 && HAVE_SSE2
+
+namespace crcutil {
+
+template<> uint128_sse2
+GenericCrc<uint128_sse2, uint128_sse2, uint64, 4>::CrcMultiwordGccAmd64Sse2(
+    const uint8 *src, const uint8 *end, const uint128_sse2 &start) const;
+
+template<>
+uint128_sse2 GenericCrc<uint128_sse2, uint128_sse2, uint64, 4>::CrcMultiword(
+    const void *data, size_t bytes, const uint128_sse2 &start) const {
+  const uint8 *src = static_cast<const uint8 *>(data);
+  uint128_sse2 crc = start ^ this->Base().Canonize();
+  const uint8 *end = src + bytes;
+  if (bytes <= 7) {
+    for (; src < end; ++src) {
+      CRC_BYTE(this, crc, *src);
+    }
+    return (crc ^ this->Base().Canonize());
+  }
+
+  ALIGN_ON_WORD_BOUNDARY_IF_NEEDED(bytes, this, src, end, crc, uint64);
+  if (src >= end) {
+    return (crc ^ this->Base().Canonize());
+  }
+
+  return CrcMultiwordGccAmd64Sse2(src, end, crc);
+}
+
+#define CRC_WORD_ASM() \
+    SSE2_MOVQ " %[crc0], %[tmp0]\n" \
+    "xorq %[tmp0], %[buf0]\n" \
+    "psrldq $8, %[crc0]\n" \
+    "movzbq %b[buf0], %[tmp0]\n" \
+    "shrq $8, %[buf0]\n" \
+    "addq %[tmp0], %[tmp0]\n" \
+    "pxor (%[table_word], %[tmp0], 8), %[crc0]\n" \
+    "movzbq %b[buf0], %[tmp1]\n" \
+    "shrq $8, %[buf0]\n" \
+    "addq %[tmp1], %[tmp1]\n" \
+    "pxor 1*256*16(%[table_word], %[tmp1], 8), %[crc0]\n" \
+    "movzbq %b[buf0], %[tmp0]\n" \
+    "shrq $8, %[buf0]\n" \
+    "addq %[tmp0], %[tmp0]\n" \
+    "pxor 2*256*16(%[table_word], %[tmp0], 8), %[crc0]\n" \
+    "movzbq %b[buf0], %[tmp1]\n" \
+    "shrq $8, %[buf0]\n" \
+    "addq %[tmp1], %[tmp1]\n" \
+    "pxor 3*256*16(%[table_word], %[tmp1], 8), %[crc0]\n" \
+    "movzbq %b[buf0], %[tmp0]\n" \
+    "shrq $8, %[buf0]\n" \
+    "addq %[tmp0], %[tmp0]\n" \
+    "pxor 4*256*16(%[table_word], %[tmp0], 8), %[crc0]\n" \
+    "movzbq %b[buf0], %[tmp1]\n" \
+    "shrq $8, %[buf0]\n" \
+    "addq %[tmp1], %[tmp1]\n" \
+    "pxor 5*256*16(%[table_word], %[tmp1], 8), %[crc0]\n" \
+    "movzbq %b[buf0], %[tmp0]\n" \
+    "shrq $8, %[buf0]\n" \
+    "addq %[tmp0], %[tmp0]\n" \
+    "pxor 6*256*16(%[table_word], %[tmp0], 8), %[crc0]\n" \
+    "addq %[buf0], %[buf0]\n" \
+    "pxor 7*256*16(%[table_word], %[buf0], 8), %[crc0]\n"
+
+template<> uint128_sse2
+GenericCrc<uint128_sse2, uint128_sse2, uint64, 4>::CrcMultiwordGccAmd64Sse2(
+    const uint8 *src, const uint8 *end, const uint128_sse2 &start) const {
+  __m128i crc0 = start;
+  __m128i crc1;
+  __m128i crc2;
+  __m128i crc3;
+  __m128i crc_carryover;
+
+  uint64 buf0;
+  uint64 buf1;
+  uint64 buf2;
+  uint64 buf3;
+
+  uint64 tmp0;
+  uint64 tmp1;
+
+  asm(
+    "sub $2*4*8 - 1, %[end]\n"
+    "cmpq  %[src], %[end]\n"
+    "jbe 2f\n"
+
+    "pxor %[crc1], %[crc1]\n"
+    "pxor %[crc2], %[crc2]\n"
+    "pxor %[crc3], %[crc3]\n"
+    "pxor %[crc_carryover], %[crc_carryover]\n"
+    "movq (%[src]), %[buf0]\n"
+    "movq 1*8(%[src]), %[buf1]\n"
+    "movq 2*8(%[src]), %[buf2]\n"
+    "movq 3*8(%[src]), %[buf3]\n"
+
+    "1:\n"
+#if HAVE_SSE && CRCUTIL_PREFETCH_WIDTH > 0
+    "prefetcht0 " TO_STRING(CRCUTIL_PREFETCH_WIDTH) "(%[src])\n"
+#endif
+#if GCC_VERSION_AVAILABLE(4, 5)
+    // Bug in GCC 4.2.4?
+    "add $4*8, %[src]\n"
+#else
+    "lea 4*8(%[src]), %[src]\n"
+#endif
+    "pxor %[crc_carryover], %[crc0]\n"
+
+    SSE2_MOVQ " %[crc0], %[tmp0]\n"
+    "psrldq $8, %[crc0]\n"
+    "xorq %[tmp0], %[buf0]\n"
+    "movzbq %b[buf0], %[tmp0]\n"
+    "pxor %[crc0], %[crc1]\n"
+    "addq %[tmp0], %[tmp0]\n"
+    "shrq $8, %[buf0]\n"
+    "movdqa (%[table], %[tmp0], 8), %[crc0]\n"
+
+    SSE2_MOVQ " %[crc1], %[tmp1]\n"
+    "psrldq $8, %[crc1]\n"
+    "xorq %[tmp1], %[buf1]\n"
+    "movzbq %b[buf1], %[tmp1]\n"
+    "pxor %[crc1], %[crc2]\n"
+    "addq %[tmp1], %[tmp1]\n"
+    "shrq $8, %[buf1]\n"
+    "movdqa (%[table], %[tmp1], 8), %[crc1]\n"
+
+    SSE2_MOVQ " %[crc2], %[tmp0]\n"
+    "psrldq $8, %[crc2]\n"
+    "xorq %[tmp0], %[buf2]\n"
+    "movzbq %b[buf2], %[tmp0]\n"
+    "pxor %[crc2], %[crc3]\n"
+    "addq %[tmp0], %[tmp0]\n"
+    "shrq $8, %[buf2]\n"
+    "movdqa (%[table], %[tmp0], 8), %[crc2]\n"
+
+    SSE2_MOVQ " %[crc3], %[tmp1]\n"
+    "psrldq $8, %[crc3]\n"
+    "xorq %[tmp1], %[buf3]\n"
+    "movzbq %b[buf3], %[tmp1]\n"
+    "movdqa %[crc3], %[crc_carryover]\n"
+    "addq %[tmp1], %[tmp1]\n"
+    "shrq $8, %[buf3]\n"
+    "movdqa (%[table], %[tmp1], 8), %[crc3]\n"
+
+#define XOR(byte) \
+    "movzbq %b[buf0], %[tmp0]\n" \
+    "shrq $8, %[buf0]\n" \
+    "addq %[tmp0], %[tmp0]\n" \
+    "pxor " #byte "*256*16(%[table], %[tmp0], 8), %[crc0]\n" \
+    "movzbq %b[buf1], %[tmp1]\n" \
+    "shrq $8, %[buf1]\n" \
+    "addq %[tmp1], %[tmp1]\n" \
+    "pxor " #byte "*256*16(%[table], %[tmp1], 8), %[crc1]\n" \
+    "movzbq %b[buf2], %[tmp0]\n" \
+    "shrq $8, %[buf2]\n" \
+    "addq %[tmp0], %[tmp0]\n" \
+    "pxor " #byte "*256*16(%[table], %[tmp0], 8), %[crc2]\n" \
+    "movzbq %b[buf3], %[tmp1]\n" \
+    "shrq $8, %[buf3]\n" \
+    "addq %[tmp1], %[tmp1]\n" \
+    "pxor " #byte "*256*16(%[table], %[tmp1], 8), %[crc3]\n"
+
+    XOR(1)
+    XOR(2)
+    XOR(3)
+    XOR(4)
+    XOR(5)
+    XOR(6)
+#undef XOR
+
+    "addq %[buf0], %[buf0]\n"
+    "pxor 7*256*16(%[table], %[buf0], 8), %[crc0]\n"
+    "movq (%[src]), %[buf0]\n"
+
+    "addq %[buf1], %[buf1]\n"
+    "pxor 7*256*16(%[table], %[buf1], 8), %[crc1]\n"
+    "movq 1*8(%[src]), %[buf1]\n"
+
+    "addq %[buf2], %[buf2]\n"
+    "pxor 7*256*16(%[table], %[buf2], 8), %[crc2]\n"
+    "movq 2*8(%[src]), %[buf2]\n"
+
+    "addq %[buf3], %[buf3]\n"
+    "pxor 7*256*16(%[table], %[buf3], 8), %[crc3]\n"
+    "movq 3*8(%[src]), %[buf3]\n"
+
+    "cmpq %[src], %[end]\n"
+    "ja 1b\n"
+
+    "pxor %[crc_carryover], %[crc0]\n"
+    CRC_WORD_ASM()
+
+    "pxor %[crc1], %[crc0]\n"
+    "movq %[buf1], %[buf0]\n"
+    CRC_WORD_ASM()
+
+    "pxor %[crc2], %[crc0]\n"
+    "movq %[buf2], %[buf0]\n"
+    CRC_WORD_ASM()
+
+    "pxor %[crc3], %[crc0]\n"
+    "movq %[buf3], %[buf0]\n"
+    CRC_WORD_ASM()
+
+    "add $4*8, %[src]\n"
+    "2:\n"
+
+    "add $2*4*8 - 8, %[end]\n"
+
+    "cmpq %[src], %[end]\n"
+    "jbe 4f\n"
+    "3:\n"
+    "movq (%[src]), %[buf0]\n"
+    "addq $8, %[src]\n"
+    CRC_WORD_ASM()
+    "cmpq %[src], %[end]\n"
+    "ja 3b\n"
+
+    "4:\n"
+    "add $7, %[end]\n"
+
+    "cmpq %[src], %[end]\n"
+    "jbe 6f\n"
+
+    "5:\n"
+    "movzbq (%[src]), %[buf0]\n"
+    "add $1, %[src]\n"
+    SSE2_MOVQ " %[crc0], %[tmp0]\n"
+    "movzx %b[tmp0], %[tmp0]\n"
+    "psrldq $1, %[crc0]\n"
+    "xor %[buf0], %[tmp0]\n"
+    "addq %[tmp0], %[tmp0]\n"
+    "pxor 7*256*16(%[table_word], %[tmp0], 8), %[crc0]\n"
+
+    "cmpq %[src], %[end]\n"
+    "ja 5b\n"
+
+    "6:\n"
+
+    :   // outputs
+      [src] "+r" (src),
+      [end] "+r" (end),
+      [crc0] "+x" (crc0),
+      [crc1] "=&x" (crc1),
+      [crc2] "=&x" (crc2),
+      [crc3] "=&x" (crc3),
+      [crc_carryover] "=&x" (crc_carryover),
+      [buf0] "=&r" (buf0),
+      [buf1] "=&r" (buf1),
+      [buf2] "=&r" (buf2),
+      [buf3] "=&r" (buf3),
+      [tmp0] "=&r" (tmp0),
+      [tmp1] "=&r" (tmp1)
+
+    :   // inputs
+      [table_word] "r" (this->crc_word_),
+      [table] "r" (this->crc_word_interleaved_));
+
+  return (this->Base().Canonize() ^ crc0);
+}
+
+}  // namespace crcutil
+
+#endif  // defined(__GNUC__) && CRCUTIL_USE_ASM && HAVE_AMD64 && HAVE_SSE2
diff --git a/contrib/libs/crcutil/multiword_64_64_cl_i386_mmx.cc b/contrib/libs/crcutil/multiword_64_64_cl_i386_mmx.cc
index 4706d9c005..af7352aa46 100644
--- a/contrib/libs/crcutil/multiword_64_64_cl_i386_mmx.cc
+++ b/contrib/libs/crcutil/multiword_64_64_cl_i386_mmx.cc
@@ -1,304 +1,304 @@
-// Copyright 2010 Google Inc.  All rights reserved. 
-// 
-// Licensed under the Apache License, Version 2.0 (the "License"); 
-// you may not use this file except in compliance with the License. 
-// You may obtain a copy of the License at 
-// 
-//      http://www.apache.org/licenses/LICENSE-2.0 
-// 
-// Unless required by applicable law or agreed to in writing, software 
-// distributed under the License is distributed on an "AS IS" BASIS, 
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-// See the License for the specific language governing permissions and 
-// limitations under the License. 
- 
-// Implements 64-bit multiword CRC for Microsoft and Intel compilers 
-// using MMX instructions (i386). 
- 
-#include "generic_crc.h" 
- 
-#if CRCUTIL_USE_ASM && HAVE_I386 && HAVE_MMX && defined(_MSC_VER) 
- 
-namespace crcutil { 
- 
-#define CRC_WORD_MMX() \ 
-    __asm   pxor  BUF0, CRC0 \ 
-    __asm   movd  TMP0, BUF0 \ 
-    __asm   psrlq BUF0, 32 \ 
-    __asm   movzx TEMP, TMP0L \ 
-    __asm   shr   TMP0, 8 \ 
-    __asm   movq  CRC0, [TABLE + TEMP * 8] \ 
-    __asm   movzx TEMP, TMP0L \ 
-    __asm   shr   TMP0, 8 \ 
-    __asm   pxor  CRC0, [TABLE + TEMP * 8 + 1 * 256 * 8] \ 
-    __asm   movzx TEMP, TMP0L \ 
-    __asm   shr   TMP0, 8 \ 
-    __asm   pxor  CRC0, [TABLE + TEMP * 8 + 2 * 256 * 8] \ 
-    __asm   pxor  CRC0, [TABLE + TMP0 * 8 + 3 * 256 * 8] \ 
-    __asm   movd  TMP0, BUF0 \ 
-    __asm   movzx TEMP, TMP0L \ 
-    __asm   shr   TMP0, 8 \ 
-    __asm   pxor  CRC0, [TABLE + TEMP * 8 + 4 * 256 * 8] \ 
-    __asm   movzx TEMP, TMP0L \ 
-    __asm   shr   TMP0, 8 \ 
-    __asm   pxor  CRC0, [TABLE + TEMP * 8 + 5 * 256 * 8] \ 
-    __asm   movzx TEMP, TMP0L \ 
-    __asm   shr   TMP0, 8 \ 
-    __asm   pxor  CRC0, [TABLE + TEMP * 8 + 6 * 256 * 8] \ 
-    __asm   pxor  CRC0, [TABLE + TMP0 * 8 + 7 * 256 * 8] 
- 
-// frame pointer register 'ebp' modified by inline assembly code 
-#pragma warning(disable: 4731) 
- 
-template<> uint64 GenericCrc<uint64, uint64, uint64, 4>::CrcMultiwordI386Mmx( 
-    const void *data, 
-    size_t bytes, 
-    const uint64 &start) const { 
-  const uint8 *src = static_cast<const uint8 *>(data); 
-  const uint8 *end = src + bytes; 
-  uint64 crc0 = start ^ this->Base().Canonize(); 
- 
-  ALIGN_ON_WORD_BOUNDARY_IF_NEEDED(bytes, this, src, end, crc0, uint64); 
-  if (src >= end) { 
-    return (crc0 ^ this->Base().Canonize()); 
-  } 
- 
-#define CRC0  mm0 
-#define CRC1  mm1 
-#define CRC2  mm2 
-#define CRC3  mm3 
-#define BUF0  mm4 
-#define BUF1  mm5 
-#define BUF2  mm6 
-#define BUF3  mm7 
-#define TMP0  eax 
-#define TMP0L  al 
-#define TMP0H  ah 
-#define TMP1  ebx 
-#define TMP1L  bl 
-#define TMP1H  bh 
-#define TMP2  ecx 
-#define TMP2L  cl 
-#define TMP2H  ch 
-#define TMP3  edx 
-#define TMP3L  dl 
-#define TMP3H  dh 
-#define TEMP  edi 
-#define SRC   esi 
-#define END   [esp] 
-#define TABLE ebp 
- 
- 
-  const uint64 *interleaved_table_address = 
-                    &this->crc_word_interleaved_[0][0]; 
-  const uint64 *word_table_address = &this->crc_word_[0][0]; 
- 
-  __asm { 
-    push  ebp 
- 
-    mov   TMP0, interleaved_table_address 
- 
-    movq  CRC0, crc0 
-    mov   SRC, src 
-    mov   TMP1, end 
-    sub   TMP1, 2*4*8 - 1 
-    cmp   SRC, TMP1 
-    mov   TABLE, word_table_address 
-    jae   end_main_loop 
- 
-    push  TABLE 
-    mov   TABLE, TMP0 
-    push  TMP1 
- 
-    pxor  CRC1, CRC1 
-    pxor  CRC2, CRC2 
-    pxor  CRC3, CRC3 
- 
-    movq  BUF0, [SRC] 
-    movq  BUF1, [SRC + 1 * 8] 
-    movq  BUF2, [SRC + 2 * 8] 
-    movq  BUF3, [SRC + 3 * 8] 
- 
- main_loop: 
-#if HAVE_SSE && CRCUTIL_PREFETCH_WIDTH > 0 
-    prefetcht0 [SRC + CRCUTIL_PREFETCH_WIDTH] 
-#endif 
-    add   SRC, 32 
-    pxor  BUF0, CRC0 
-    pxor  BUF1, CRC1 
-    pxor  BUF2, CRC2 
-    pxor  BUF3, CRC3 
- 
-    movd  TMP0, BUF0 
-    psrlq BUF0, 32 
-    movd  TMP1, BUF1 
-    psrlq BUF1, 32 
-    movd  TMP2, BUF2 
-    psrlq BUF2, 32 
-    movd  TMP3, BUF3 
-    psrlq BUF3, 32 
- 
-    movzx TEMP, TMP0L 
-    movq  CRC0, [TABLE + TEMP * 8] 
-    movzx TEMP, TMP1L 
-    movq  CRC1, [TABLE + TEMP * 8] 
-    movzx TEMP, TMP2L 
-    movq  CRC2, [TABLE + TEMP * 8] 
-    movzx TEMP, TMP3L 
-    movq  CRC3, [TABLE + TEMP * 8] 
- 
-    movzx TEMP, TMP0H 
-    shr TMP0, 16 
-    pxor CRC0, [TABLE + TEMP * 8 + 1 * 256 * 8] 
-    movzx TEMP, TMP1H 
-    shr TMP1, 16 
-    pxor CRC1, [TABLE + TEMP * 8 + 1 * 256 * 8] 
-    movzx TEMP, TMP2H 
-    shr TMP2, 16 
-    pxor CRC2, [TABLE + TEMP * 8 + 1 * 256 * 8] 
-    movzx TEMP, TMP3H 
-    shr TMP3, 16 
-    pxor CRC3, [TABLE + TEMP * 8 + 1 * 256 * 8] 
- 
-    movzx TEMP, TMP0L 
-    shr TMP0, 8 
-    pxor CRC0, [TABLE + TEMP * 8 + 2 * 256 * 8] 
-    movzx TEMP, TMP1L 
-    shr TMP1, 8 
-    pxor CRC1, [TABLE + TEMP * 8 + 2 * 256 * 8] 
-    movzx TEMP, TMP2L 
-    shr TMP2, 8 
-    pxor CRC2, [TABLE + TEMP * 8 + 2 * 256 * 8] 
-    movzx TEMP, TMP3L 
-    shr TMP3, 8 
-    pxor CRC3, [TABLE + TEMP * 8 + 2 * 256 * 8] 
- 
-    pxor  CRC0, [TABLE + TMP0 * 8 + 3 * 256 * 8] 
-    movd  TMP0, BUF0 
-    pxor  CRC1, [TABLE + TMP1 * 8 + 3 * 256 * 8] 
-    movd  TMP1, BUF1 
-    pxor  CRC2, [TABLE + TMP2 * 8 + 3 * 256 * 8] 
-    movd  TMP2, BUF2 
-    pxor  CRC3, [TABLE + TMP3 * 8 + 3 * 256 * 8] 
-    movd  TMP3, BUF3 
- 
-    movzx TEMP, TMP0L 
-    pxor CRC0, [TABLE + TEMP * 8 + 4 * 256 * 8] 
-    movzx TEMP, TMP1L 
-    pxor CRC1, [TABLE + TEMP * 8 + 4 * 256 * 8] 
-    movzx TEMP, TMP2L 
-    pxor CRC2, [TABLE + TEMP * 8 + 4 * 256 * 8] 
-    movzx TEMP, TMP3L 
-    pxor CRC3, [TABLE + TEMP * 8 + 4 * 256 * 8] 
- 
-    movzx TEMP, TMP0H 
-    shr TMP0, 16 
-    pxor CRC0, [TABLE + TEMP * 8 + 5 * 256 * 8] 
-    movzx TEMP, TMP1H 
-    shr TMP1, 16 
-    pxor CRC1, [TABLE + TEMP * 8 + 5 * 256 * 8] 
-    movzx TEMP, TMP2H 
-    shr TMP2, 16 
-    pxor CRC2, [TABLE + TEMP * 8 + 5 * 256 * 8] 
-    movzx TEMP, TMP3H 
-    shr TMP3, 16 
-    pxor CRC3, [TABLE + TEMP * 8 + 5 * 256 * 8] 
- 
-    movzx TEMP, TMP0L 
-    shr TMP0, 8 
-    pxor CRC0, [TABLE + TEMP * 8 + 6 * 256 * 8] 
-    movzx TEMP, TMP1L 
-    shr TMP1, 8 
-    pxor CRC1, [TABLE + TEMP * 8 + 6 * 256 * 8] 
-    movzx TEMP, TMP2L 
-    shr TMP2, 8 
-    pxor CRC2, [TABLE + TEMP * 8 + 6 * 256 * 8] 
-    movzx TEMP, TMP3L 
-    shr TMP3, 8 
-    pxor CRC3, [TABLE + TEMP * 8 + 6 * 256 * 8] 
- 
-    pxor  CRC0, [TABLE + TMP0 * 8 + 7 * 256 * 8] 
-    movq  BUF0, [SRC] 
-    pxor  CRC1, [TABLE + TMP1 * 8 + 7 * 256 * 8] 
-    movq  BUF1, [SRC + 1 * 8] 
-    pxor  CRC2, [TABLE + TMP2 * 8 + 7 * 256 * 8] 
-    movq  BUF2, [SRC + 2 * 8] 
-    pxor  CRC3, [TABLE + TMP3 * 8 + 7 * 256 * 8] 
-    movq  BUF3, [SRC + 3 * 8] 
- 
-    cmp   END, SRC 
-    ja    main_loop 
- 
-#undef END 
-#define END TMP1 
-    pop   END 
-    pop   TABLE 
-    add   SRC, 32 
- 
-    CRC_WORD_MMX() 
- 
-    pxor  BUF1, CRC1 
-    movq  BUF0, BUF1 
-    CRC_WORD_MMX() 
- 
-    pxor  BUF2, CRC2 
-    movq  BUF0, BUF2 
-    CRC_WORD_MMX() 
- 
-    pxor  BUF3, CRC3 
-    movq  BUF0, BUF3 
-    CRC_WORD_MMX() 
- 
- end_main_loop: 
-    add   END, 2*4*8 - 8 
-    cmp   SRC, END 
-    jae   end_word_loop 
- 
- word_loop: 
-    movq  BUF0, [SRC] 
-    add   SRC, 8 
-    CRC_WORD_MMX() 
-    cmp   END, SRC 
-    ja    word_loop 
- end_word_loop: 
- 
-#if 0   // Plain C version is faster? 
-    add   END, 7 
-    cmp   SRC, END 
-    jae   end_byte_loop 
- 
- byte_loop: 
-    movd  TMP0, CRC0 
-    movzx TEMP, byte ptr [SRC] 
-    movzx TMP0, TMP0L 
-    psrlq CRC0, 8 
-    xor   TEMP, TMP0 
-    add   SRC, 1 
-    pxor  CRC0, [TABLE + TEMP*8 + 7*256*8] 
-    cmp   END, SRC 
-    ja    byte_loop 
- end_byte_loop: 
-#endif 
- 
-    pop   ebp 
- 
-    mov   src, SRC 
-    movq  crc0, CRC0 
- 
-    emms 
-  } 
- 
-#if 1 
-  // Compute CRC of remaining bytes. 
-  for (;src < end; ++src) { 
-    CRC_BYTE(this, crc0, *src); 
-  } 
-#endif 
- 
-  return (crc0 ^ this->Base().Canonize()); 
-} 
- 
- 
-}  // namespace crcutil 
- 
-#endif  // CRCUTIL_USE_ASM && HAVE_I386 && HAVE_MMX && defined(_MSC_VER) 
+// Copyright 2010 Google Inc.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Implements 64-bit multiword CRC for Microsoft and Intel compilers
+// using MMX instructions (i386).
+
+#include "generic_crc.h"
+
+#if CRCUTIL_USE_ASM && HAVE_I386 && HAVE_MMX && defined(_MSC_VER)
+
+namespace crcutil {
+
+#define CRC_WORD_MMX() \
+    __asm   pxor  BUF0, CRC0 \
+    __asm   movd  TMP0, BUF0 \
+    __asm   psrlq BUF0, 32 \
+    __asm   movzx TEMP, TMP0L \
+    __asm   shr   TMP0, 8 \
+    __asm   movq  CRC0, [TABLE + TEMP * 8] \
+    __asm   movzx TEMP, TMP0L \
+    __asm   shr   TMP0, 8 \
+    __asm   pxor  CRC0, [TABLE + TEMP * 8 + 1 * 256 * 8] \
+    __asm   movzx TEMP, TMP0L \
+    __asm   shr   TMP0, 8 \
+    __asm   pxor  CRC0, [TABLE + TEMP * 8 + 2 * 256 * 8] \
+    __asm   pxor  CRC0, [TABLE + TMP0 * 8 + 3 * 256 * 8] \
+    __asm   movd  TMP0, BUF0 \
+    __asm   movzx TEMP, TMP0L \
+    __asm   shr   TMP0, 8 \
+    __asm   pxor  CRC0, [TABLE + TEMP * 8 + 4 * 256 * 8] \
+    __asm   movzx TEMP, TMP0L \
+    __asm   shr   TMP0, 8 \
+    __asm   pxor  CRC0, [TABLE + TEMP * 8 + 5 * 256 * 8] \
+    __asm   movzx TEMP, TMP0L \
+    __asm   shr   TMP0, 8 \
+    __asm   pxor  CRC0, [TABLE + TEMP * 8 + 6 * 256 * 8] \
+    __asm   pxor  CRC0, [TABLE + TMP0 * 8 + 7 * 256 * 8]
+
+// frame pointer register 'ebp' modified by inline assembly code
+#pragma warning(disable: 4731)
+
+template<> uint64 GenericCrc<uint64, uint64, uint64, 4>::CrcMultiwordI386Mmx(
+    const void *data,
+    size_t bytes,
+    const uint64 &start) const {
+  const uint8 *src = static_cast<const uint8 *>(data);
+  const uint8 *end = src + bytes;
+  uint64 crc0 = start ^ this->Base().Canonize();
+
+  ALIGN_ON_WORD_BOUNDARY_IF_NEEDED(bytes, this, src, end, crc0, uint64);
+  if (src >= end) {
+    return (crc0 ^ this->Base().Canonize());
+  }
+
+#define CRC0  mm0
+#define CRC1  mm1
+#define CRC2  mm2
+#define CRC3  mm3
+#define BUF0  mm4
+#define BUF1  mm5
+#define BUF2  mm6
+#define BUF3  mm7
+#define TMP0  eax
+#define TMP0L  al
+#define TMP0H  ah
+#define TMP1  ebx
+#define TMP1L  bl
+#define TMP1H  bh
+#define TMP2  ecx
+#define TMP2L  cl
+#define TMP2H  ch
+#define TMP3  edx
+#define TMP3L  dl
+#define TMP3H  dh
+#define TEMP  edi
+#define SRC   esi
+#define END   [esp]
+#define TABLE ebp
+
+
+  const uint64 *interleaved_table_address =
+                    &this->crc_word_interleaved_[0][0];
+  const uint64 *word_table_address = &this->crc_word_[0][0];
+
+  __asm {
+    push  ebp
+
+    mov   TMP0, interleaved_table_address
+
+    movq  CRC0, crc0
+    mov   SRC, src
+    mov   TMP1, end
+    sub   TMP1, 2*4*8 - 1
+    cmp   SRC, TMP1
+    mov   TABLE, word_table_address
+    jae   end_main_loop
+
+    push  TABLE
+    mov   TABLE, TMP0
+    push  TMP1
+
+    pxor  CRC1, CRC1
+    pxor  CRC2, CRC2
+    pxor  CRC3, CRC3
+
+    movq  BUF0, [SRC]
+    movq  BUF1, [SRC + 1 * 8]
+    movq  BUF2, [SRC + 2 * 8]
+    movq  BUF3, [SRC + 3 * 8]
+
+ main_loop:
+#if HAVE_SSE && CRCUTIL_PREFETCH_WIDTH > 0
+    prefetcht0 [SRC + CRCUTIL_PREFETCH_WIDTH]
+#endif
+    add   SRC, 32
+    pxor  BUF0, CRC0
+    pxor  BUF1, CRC1
+    pxor  BUF2, CRC2
+    pxor  BUF3, CRC3
+
+    movd  TMP0, BUF0
+    psrlq BUF0, 32
+    movd  TMP1, BUF1
+    psrlq BUF1, 32
+    movd  TMP2, BUF2
+    psrlq BUF2, 32
+    movd  TMP3, BUF3
+    psrlq BUF3, 32
+
+    movzx TEMP, TMP0L
+    movq  CRC0, [TABLE + TEMP * 8]
+    movzx TEMP, TMP1L
+    movq  CRC1, [TABLE + TEMP * 8]
+    movzx TEMP, TMP2L
+    movq  CRC2, [TABLE + TEMP * 8]
+    movzx TEMP, TMP3L
+    movq  CRC3, [TABLE + TEMP * 8]
+
+    movzx TEMP, TMP0H
+    shr TMP0, 16
+    pxor CRC0, [TABLE + TEMP * 8 + 1 * 256 * 8]
+    movzx TEMP, TMP1H
+    shr TMP1, 16
+    pxor CRC1, [TABLE + TEMP * 8 + 1 * 256 * 8]
+    movzx TEMP, TMP2H
+    shr TMP2, 16
+    pxor CRC2, [TABLE + TEMP * 8 + 1 * 256 * 8]
+    movzx TEMP, TMP3H
+    shr TMP3, 16
+    pxor CRC3, [TABLE + TEMP * 8 + 1 * 256 * 8]
+
+    movzx TEMP, TMP0L
+    shr TMP0, 8
+    pxor CRC0, [TABLE + TEMP * 8 + 2 * 256 * 8]
+    movzx TEMP, TMP1L
+    shr TMP1, 8
+    pxor CRC1, [TABLE + TEMP * 8 + 2 * 256 * 8]
+    movzx TEMP, TMP2L
+    shr TMP2, 8
+    pxor CRC2, [TABLE + TEMP * 8 + 2 * 256 * 8]
+    movzx TEMP, TMP3L
+    shr TMP3, 8
+    pxor CRC3, [TABLE + TEMP * 8 + 2 * 256 * 8]
+
+    pxor  CRC0, [TABLE + TMP0 * 8 + 3 * 256 * 8]
+    movd  TMP0, BUF0
+    pxor  CRC1, [TABLE + TMP1 * 8 + 3 * 256 * 8]
+    movd  TMP1, BUF1
+    pxor  CRC2, [TABLE + TMP2 * 8 + 3 * 256 * 8]
+    movd  TMP2, BUF2
+    pxor  CRC3, [TABLE + TMP3 * 8 + 3 * 256 * 8]
+    movd  TMP3, BUF3
+
+    movzx TEMP, TMP0L
+    pxor CRC0, [TABLE + TEMP * 8 + 4 * 256 * 8]
+    movzx TEMP, TMP1L
+    pxor CRC1, [TABLE + TEMP * 8 + 4 * 256 * 8]
+    movzx TEMP, TMP2L
+    pxor CRC2, [TABLE + TEMP * 8 + 4 * 256 * 8]
+    movzx TEMP, TMP3L
+    pxor CRC3, [TABLE + TEMP * 8 + 4 * 256 * 8]
+
+    movzx TEMP, TMP0H
+    shr TMP0, 16
+    pxor CRC0, [TABLE + TEMP * 8 + 5 * 256 * 8]
+    movzx TEMP, TMP1H
+    shr TMP1, 16
+    pxor CRC1, [TABLE + TEMP * 8 + 5 * 256 * 8]
+    movzx TEMP, TMP2H
+    shr TMP2, 16
+    pxor CRC2, [TABLE + TEMP * 8 + 5 * 256 * 8]
+    movzx TEMP, TMP3H
+    shr TMP3, 16
+    pxor CRC3, [TABLE + TEMP * 8 + 5 * 256 * 8]
+
+    movzx TEMP, TMP0L
+    shr TMP0, 8
+    pxor CRC0, [TABLE + TEMP * 8 + 6 * 256 * 8]
+    movzx TEMP, TMP1L
+    shr TMP1, 8
+    pxor CRC1, [TABLE + TEMP * 8 + 6 * 256 * 8]
+    movzx TEMP, TMP2L
+    shr TMP2, 8
+    pxor CRC2, [TABLE + TEMP * 8 + 6 * 256 * 8]
+    movzx TEMP, TMP3L
+    shr TMP3, 8
+    pxor CRC3, [TABLE + TEMP * 8 + 6 * 256 * 8]
+
+    pxor  CRC0, [TABLE + TMP0 * 8 + 7 * 256 * 8]
+    movq  BUF0, [SRC]
+    pxor  CRC1, [TABLE + TMP1 * 8 + 7 * 256 * 8]
+    movq  BUF1, [SRC + 1 * 8]
+    pxor  CRC2, [TABLE + TMP2 * 8 + 7 * 256 * 8]
+    movq  BUF2, [SRC + 2 * 8]
+    pxor  CRC3, [TABLE + TMP3 * 8 + 7 * 256 * 8]
+    movq  BUF3, [SRC + 3 * 8]
+
+    cmp   END, SRC
+    ja    main_loop
+
+#undef END
+#define END TMP1
+    pop   END
+    pop   TABLE
+    add   SRC, 32
+
+    CRC_WORD_MMX()
+
+    pxor  BUF1, CRC1
+    movq  BUF0, BUF1
+    CRC_WORD_MMX()
+
+    pxor  BUF2, CRC2
+    movq  BUF0, BUF2
+    CRC_WORD_MMX()
+
+    pxor  BUF3, CRC3
+    movq  BUF0, BUF3
+    CRC_WORD_MMX()
+
+ end_main_loop:
+    add   END, 2*4*8 - 8
+    cmp   SRC, END
+    jae   end_word_loop
+
+ word_loop:
+    movq  BUF0, [SRC]
+    add   SRC, 8
+    CRC_WORD_MMX()
+    cmp   END, SRC
+    ja    word_loop
+ end_word_loop:
+
+#if 0   // Plain C version is faster?
+    add   END, 7
+    cmp   SRC, END
+    jae   end_byte_loop
+
+ byte_loop:
+    movd  TMP0, CRC0
+    movzx TEMP, byte ptr [SRC]
+    movzx TMP0, TMP0L
+    psrlq CRC0, 8
+    xor   TEMP, TMP0
+    add   SRC, 1
+    pxor  CRC0, [TABLE + TEMP*8 + 7*256*8]
+    cmp   END, SRC
+    ja    byte_loop
+ end_byte_loop:
+#endif
+
+    pop   ebp
+
+    mov   src, SRC
+    movq  crc0, CRC0
+
+    emms
+  }
+
+#if 1
+  // Compute CRC of remaining bytes.
+  for (;src < end; ++src) {
+    CRC_BYTE(this, crc0, *src);
+  }
+#endif
+
+  return (crc0 ^ this->Base().Canonize());
+}
+
+
+}  // namespace crcutil
+
+#endif  // CRCUTIL_USE_ASM && HAVE_I386 && HAVE_MMX && defined(_MSC_VER)
diff --git a/contrib/libs/crcutil/multiword_64_64_gcc_amd64_asm.cc b/contrib/libs/crcutil/multiword_64_64_gcc_amd64_asm.cc
index 1a64b85c5e..36630fd1ac 100644
--- a/contrib/libs/crcutil/multiword_64_64_gcc_amd64_asm.cc
+++ b/contrib/libs/crcutil/multiword_64_64_gcc_amd64_asm.cc
@@ -1,298 +1,298 @@
-// Copyright 2010 Google Inc.  All rights reserved. 
-// 
-// Licensed under the Apache License, Version 2.0 (the "License"); 
-// you may not use this file except in compliance with the License. 
-// You may obtain a copy of the License at 
-// 
-//      http://www.apache.org/licenses/LICENSE-2.0 
-// 
-// Unless required by applicable law or agreed to in writing, software 
-// distributed under the License is distributed on an "AS IS" BASIS, 
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-// See the License for the specific language governing permissions and 
-// limitations under the License. 
- 
-// Implements multiword CRC for GCC on AMD64. 
-// 
-// Accoding to "Software Optimization Guide for AMD Family 10h Processors" 
-// http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/40546.pdf 
-// instead of 
-//     movzbq %al, %rsi 
-//     shrq $8, %rax 
-//     [use %rsi] 
-//     movzbq %al, %rsi 
-//     shrq $8, %rax 
-//     [use %rsi] 
-// it is better to use 32-bit registers 
-// (high 32 bits will be cleared on assignment), i.e. 
-//     movzbl %al, %esi 
-//     [use %rsi] 
-//     movzbl %ah, %esi 
-//     shrq $16, %rax 
-//     [use %rsi] 
-// Makes instructions shorter and removes one shift 
-// (the latter is not such a big deal as it's execution time 
-// is nicely masked by [use %rsi] instruction). 
-// 
-// Performance difference: 
-// About 10% degradation on bytes = 8 .. 16 
-// (clobbering registers that should be saved) 
-// Break even at 32 bytes. 
-// 3% improvement starting from 64 bytes. 
- 
-#include "generic_crc.h" 
- 
-#if defined(__GNUC__) && CRCUTIL_USE_ASM && HAVE_AMD64 
- 
-namespace crcutil { 
- 
-template<> uint64 GenericCrc<uint64, uint64, uint64, 4>::CrcMultiwordGccAmd64( 
-    const void *data, size_t bytes, const uint64 &start) const; 
- 
-template<> uint64 GenericCrc<uint64, uint64, uint64, 4>::CrcMultiword( 
-    const void *data, 
-    size_t bytes, 
-    const uint64 &start) const { 
-  if (bytes <= 6 * sizeof(Word) - 1) { 
-    const uint8 *src = static_cast<const uint8 *>(data); 
-    uint64 crc = start ^ this->Base().Canonize(); 
-    const uint8 *end = src + bytes; 
-#define PROCESS_ONE_WORD() do { \ 
-    Word buf = reinterpret_cast<const Word *>(src)[0]; \ 
-    CRC_WORD(this, crc, buf); \ 
-    src += sizeof(Word); \ 
-} while (0) 
-    if (bytes >= 1 * sizeof(Word)) { 
-      PROCESS_ONE_WORD(); 
-      if (bytes >= 2 * sizeof(Word)) { 
-        PROCESS_ONE_WORD(); 
-        if (bytes >= 3 * sizeof(Word)) { 
-          PROCESS_ONE_WORD(); 
-          if (bytes >= 4 * sizeof(Word)) { 
-            PROCESS_ONE_WORD(); 
-            if (bytes >= 5 * sizeof(Word)) { 
-              PROCESS_ONE_WORD(); 
-            } 
-          } 
-        } 
-      } 
-    } 
-    for (; src < end; ++src) { 
-      CRC_BYTE(this, crc, *src); 
-    } 
-    return (crc ^ this->Base().Canonize()); 
-  } 
-  return this->CrcMultiwordGccAmd64(data, bytes, start); 
-} 
- 
-#define TMP0  "%%rsi" 
-#define TMP0W "%%esi" 
- 
-#define BUF0  "%%rax" 
-#define BUF0L "%%al" 
-#define BUF0H "%%ah" 
- 
-#define BUF1  "%%rbx" 
-#define BUF1L "%%bl" 
-#define BUF1H "%%bh" 
- 
-#define BUF2  "%%rcx" 
-#define BUF2L "%%cl" 
-#define BUF2H "%%ch" 
- 
-#define BUF3  "%%rdx" 
-#define BUF3L "%%dl" 
-#define BUF3H "%%dh" 
- 
-#define CRC_WORD_ASM() \ 
-    "xorq %[crc0], " BUF0 "\n" \ 
-    "movzbq " BUF0L ", " TMP0 "\n" \ 
-    "movq (%[table_word], " TMP0 ", 8), %[crc0]\n" \ 
-    "movzbl " BUF0H ", " TMP0W "\n" \ 
-    "shrq $16, " BUF0 "\n" \ 
-    "xorq 1*256*8(%[table_word], " TMP0 ", 8), %[crc0]\n" \ 
-    "movzbq " BUF0L ", " TMP0 "\n" \ 
-    "xorq 2*256*8(%[table_word], " TMP0 ", 8), %[crc0]\n" \ 
-    "movzbl " BUF0H ", " TMP0W "\n" \ 
-    "shrq $16, " BUF0 "\n" \ 
-    "xorq 3*256*8(%[table_word], " TMP0 ", 8), %[crc0]\n" \ 
-    "movzbq " BUF0L ", " TMP0 "\n" \ 
-    "xorq 4*256*8(%[table_word], " TMP0 ", 8), %[crc0]\n" \ 
-    "movzbl " BUF0H ", " TMP0W "\n" \ 
-    "shrq $16, " BUF0 "\n" \ 
-    "xorq 5*256*8(%[table_word], " TMP0 ", 8), %[crc0]\n" \ 
-    "movzbq " BUF0L ", " TMP0 "\n" \ 
-    "xorq 6*256*8(%[table_word], " TMP0 ", 8), %[crc0]\n" \ 
-    "movzbl " BUF0H ", " TMP0W "\n" \ 
-    "xorq 7*256*8(%[table_word], " TMP0 ", 8), %[crc0]\n" 
- 
-template<> uint64 GenericCrc<uint64, uint64, uint64, 4>::CrcMultiwordGccAmd64( 
-    const void *data, size_t bytes, const uint64 &start) const { 
-  const uint8 *src = static_cast<const uint8 *>(data); 
-  const uint8 *end = src + bytes; 
-  uint64 crc0 = start ^ this->Base().Canonize(); 
- 
-  ALIGN_ON_WORD_BOUNDARY_IF_NEEDED(bytes, this, src, end, crc0, uint64); 
-  if (src >= end) { 
-    return (crc0 ^ this->Base().Canonize()); 
-  } 
- 
-  uint64 crc1; 
-  uint64 crc2; 
-  uint64 crc3; 
- 
-  asm( 
-    "sub $2*4*8 - 1, %[end]\n" 
-    "cmpq  %[src], %[end]\n" 
-    "jbe 2f\n" 
-    "xorq %[crc1], %[crc1]\n" 
-    "movq (%[src]), " BUF0 "\n" 
-    "movq 1*8(%[src]), " BUF1 "\n" 
-    "movq 2*8(%[src]), " BUF2 "\n" 
-    "movq 3*8(%[src]), " BUF3 "\n" 
-    "movq %[crc1], %[crc2]\n" 
-    "movq %[crc1], %[crc3]\n" 
- 
-    "1:\n" 
-#if HAVE_SSE && CRCUTIL_PREFETCH_WIDTH > 0 
-    "prefetcht0 " TO_STRING(CRCUTIL_PREFETCH_WIDTH) "(%[src])\n" 
-#endif  // HAVE_SSE 
-    "add $4*8, %[src]\n" 
- 
-    // Set buffer data. 
-    "xorq %[crc0], " BUF0 "\n" 
-    "xorq %[crc1], " BUF1 "\n" 
-    "xorq %[crc2], " BUF2 "\n" 
-    "xorq %[crc3], " BUF3 "\n" 
- 
-    // LOAD crc of byte 0 and shift buffers. 
-    "movzbl " BUF0L ", " TMP0W "\n" 
-    "movq (%[table], " TMP0 ", 8), %[crc0]\n" 
-    "movzbl " BUF1L ", " TMP0W "\n" 
-    "movq (%[table], " TMP0 ", 8), %[crc1]\n" 
-    "movzbl " BUF2L ", " TMP0W "\n" 
-    "movq (%[table], " TMP0 ", 8), %[crc2]\n" 
-    "movzbl " BUF3L ", " TMP0W "\n" 
-    "movq (%[table], " TMP0 ", 8), %[crc3]\n" 
- 
-#define XOR1(byte1) \ 
-    "movzbl " BUF0L ", " TMP0W "\n" \ 
-    "xorq " #byte1 "*256*8(%[table], " TMP0 ", 8), %[crc0]\n" \ 
-    "movzbl " BUF1L ", " TMP0W "\n" \ 
-    "xorq " #byte1 "*256*8(%[table], " TMP0 ", 8), %[crc1]\n" \ 
-    "movzbl " BUF2L ", " TMP0W "\n" \ 
-    "xorq " #byte1 "*256*8(%[table], " TMP0 ", 8), %[crc2]\n" \ 
-    "movzbl " BUF3L ", " TMP0W "\n" \ 
-    "xorq " #byte1 "*256*8(%[table], " TMP0 ", 8), %[crc3]\n" 
- 
-#define XOR2(byte2) \ 
-    "movzbl " BUF0H ", " TMP0W "\n" \ 
-    "shrq $16, " BUF0 "\n" \ 
-    "xorq " #byte2 "*256*8(%[table], " TMP0 ", 8), %[crc0]\n" \ 
-    "movzbl " BUF1H ", " TMP0W "\n" \ 
-    "shrq $16, " BUF1 "\n" \ 
-    "xorq " #byte2 "*256*8(%[table], " TMP0 ", 8), %[crc1]\n" \ 
-    "movzbl " BUF2H ", " TMP0W "\n" \ 
-    "shrq $16, " BUF2 "\n" \ 
-    "xorq " #byte2 "*256*8(%[table], " TMP0 ", 8), %[crc2]\n" \ 
-    "movzbl " BUF3H ", " TMP0W "\n" \ 
-    "shrq $16, " BUF3 "\n" \ 
-    "xorq " #byte2 "*256*8(%[table], " TMP0 ", 8), %[crc3]\n" 
- 
-    XOR2(1) 
-    XOR1(2) 
-    XOR2(3) 
-    XOR1(4) 
-    XOR2(5) 
-    XOR1(6) 
- 
-    // Update CRC registers and load buffers. 
-    "movzbl " BUF0H ", " TMP0W "\n" 
-    "xorq 7*256*8(%[table], " TMP0 ", 8), %[crc0]\n" 
-    "movq (%[src]), " BUF0 "\n" 
-    "movzbl " BUF1H ", " TMP0W "\n" 
-    "xorq 7*256*8(%[table], " TMP0 ", 8), %[crc1]\n" 
-    "movq 1*8(%[src]), " BUF1 "\n" 
-    "movzbl " BUF2H ", " TMP0W "\n" 
-    "xorq 7*256*8(%[table], " TMP0 ", 8), %[crc2]\n" 
-    "movq 2*8(%[src]), " BUF2 "\n" 
-    "movzbl " BUF3H ", " TMP0W "\n" 
-    "xorq 7*256*8(%[table], " TMP0 ", 8), %[crc3]\n" 
-    "movq 3*8(%[src]), " BUF3 "\n" 
- 
-    "cmpq  %[src], %[end]\n" 
-    "ja 1b\n" 
- 
-    CRC_WORD_ASM() 
- 
-    "xorq %[crc1], " BUF1 "\n" 
-    "movq " BUF1 ", " BUF0 "\n" 
-    CRC_WORD_ASM() 
- 
-    "xorq %[crc2], " BUF2 "\n" 
-    "movq " BUF2 ", " BUF0 "\n" 
-    CRC_WORD_ASM() 
- 
-    "xorq %[crc3], " BUF3 "\n" 
-    "movq " BUF3 ", " BUF0 "\n" 
-    CRC_WORD_ASM() 
- 
-    "add $4*8, %[src]\n" 
- 
-    "2:\n" 
-    "add $2*4*8 - 8, %[end]\n" 
-    "cmpq %[src], %[end]\n" 
-    "jbe 4f\n" 
- 
-    "3:\n" 
-    "movq (%[src]), " BUF0 "\n" 
-    "add $8, %[src]\n" 
-    CRC_WORD_ASM() 
-    "cmpq %[src], %[end]\n" 
-    "ja 3b\n" 
- 
-    "4:\n" 
-    "add $7, %[end]\n" 
- 
-    "cmpq %[src], %[end]\n" 
-    "jbe 6f\n" 
- 
-    "5:\n" 
-    "movzbq (%[src]), " BUF0 "\n" 
-    "movzbq %b[crc0], " TMP0 "\n" 
-    "shrq  $8, %[crc0]\n" 
-    "xorq " BUF0 ", " TMP0 "\n" 
-    "add $1, %[src]\n" 
-    "xorq 7*256*8(%[table_word], " TMP0 ", 8), %[crc0]\n" 
-    "cmpq %[src], %[end]\n" 
-    "ja 5b\n" 
- 
-    "6:\n" 
- 
- 
-    :   // outputs 
-      [src] "+r" (src), 
-      [end] "+r" (end), 
-      [crc0] "+r" (crc0), 
-      [crc1] "=&r" (crc1), 
-      [crc2] "=&r" (crc2), 
-      [crc3] "=&r" (crc3) 
- 
-    :   // inputs 
-      [table] "r" (&this->crc_word_interleaved_[0][0]), 
-      [table_word] "r" (&this->crc_word_[0][0]) 
- 
-    :   // clobbers 
-      "%rax",   // BUF0 
-      "%rbx",   // BUF1 
-      "%rcx",   // BUF2 
-      "%rdx",   // BUF3 
-      "%rsi"    // TMP0 
-    ); 
- 
-  return (crc0 ^ this->Base().Canonize()); 
-} 
- 
-}  // namespace crcutil 
- 
-#endif  // defined(__GNUC__) && HAVE_AMD64 && CRCUTIL_USE_ASM 
+// Copyright 2010 Google Inc.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Implements multiword CRC for GCC on AMD64.
+//
+// Accoding to "Software Optimization Guide for AMD Family 10h Processors"
+// http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/40546.pdf
+// instead of
+//     movzbq %al, %rsi
+//     shrq $8, %rax
+//     [use %rsi]
+//     movzbq %al, %rsi
+//     shrq $8, %rax
+//     [use %rsi]
+// it is better to use 32-bit registers
+// (high 32 bits will be cleared on assignment), i.e.
+//     movzbl %al, %esi
+//     [use %rsi]
+//     movzbl %ah, %esi
+//     shrq $16, %rax
+//     [use %rsi]
+// Makes instructions shorter and removes one shift
+// (the latter is not such a big deal as it's execution time
+// is nicely masked by [use %rsi] instruction).
+//
+// Performance difference:
+// About 10% degradation on bytes = 8 .. 16
+// (clobbering registers that should be saved)
+// Break even at 32 bytes.
+// 3% improvement starting from 64 bytes.
+
+#include "generic_crc.h"
+
+#if defined(__GNUC__) && CRCUTIL_USE_ASM && HAVE_AMD64
+
+namespace crcutil {
+
+template<> uint64 GenericCrc<uint64, uint64, uint64, 4>::CrcMultiwordGccAmd64(
+    const void *data, size_t bytes, const uint64 &start) const;
+
+template<> uint64 GenericCrc<uint64, uint64, uint64, 4>::CrcMultiword(
+    const void *data,
+    size_t bytes,
+    const uint64 &start) const {
+  if (bytes <= 6 * sizeof(Word) - 1) {
+    const uint8 *src = static_cast<const uint8 *>(data);
+    uint64 crc = start ^ this->Base().Canonize();
+    const uint8 *end = src + bytes;
+#define PROCESS_ONE_WORD() do { \
+    Word buf = reinterpret_cast<const Word *>(src)[0]; \
+    CRC_WORD(this, crc, buf); \
+    src += sizeof(Word); \
+} while (0)
+    if (bytes >= 1 * sizeof(Word)) {
+      PROCESS_ONE_WORD();
+      if (bytes >= 2 * sizeof(Word)) {
+        PROCESS_ONE_WORD();
+        if (bytes >= 3 * sizeof(Word)) {
+          PROCESS_ONE_WORD();
+          if (bytes >= 4 * sizeof(Word)) {
+            PROCESS_ONE_WORD();
+            if (bytes >= 5 * sizeof(Word)) {
+              PROCESS_ONE_WORD();
+            }
+          }
+        }
+      }
+    }
+    for (; src < end; ++src) {
+      CRC_BYTE(this, crc, *src);
+    }
+    return (crc ^ this->Base().Canonize());
+  }
+  return this->CrcMultiwordGccAmd64(data, bytes, start);
+}
+
+#define TMP0  "%%rsi"
+#define TMP0W "%%esi"
+
+#define BUF0  "%%rax"
+#define BUF0L "%%al"
+#define BUF0H "%%ah"
+
+#define BUF1  "%%rbx"
+#define BUF1L "%%bl"
+#define BUF1H "%%bh"
+
+#define BUF2  "%%rcx"
+#define BUF2L "%%cl"
+#define BUF2H "%%ch"
+
+#define BUF3  "%%rdx"
+#define BUF3L "%%dl"
+#define BUF3H "%%dh"
+
+#define CRC_WORD_ASM() \
+    "xorq %[crc0], " BUF0 "\n" \
+    "movzbq " BUF0L ", " TMP0 "\n" \
+    "movq (%[table_word], " TMP0 ", 8), %[crc0]\n" \
+    "movzbl " BUF0H ", " TMP0W "\n" \
+    "shrq $16, " BUF0 "\n" \
+    "xorq 1*256*8(%[table_word], " TMP0 ", 8), %[crc0]\n" \
+    "movzbq " BUF0L ", " TMP0 "\n" \
+    "xorq 2*256*8(%[table_word], " TMP0 ", 8), %[crc0]\n" \
+    "movzbl " BUF0H ", " TMP0W "\n" \
+    "shrq $16, " BUF0 "\n" \
+    "xorq 3*256*8(%[table_word], " TMP0 ", 8), %[crc0]\n" \
+    "movzbq " BUF0L ", " TMP0 "\n" \
+    "xorq 4*256*8(%[table_word], " TMP0 ", 8), %[crc0]\n" \
+    "movzbl " BUF0H ", " TMP0W "\n" \
+    "shrq $16, " BUF0 "\n" \
+    "xorq 5*256*8(%[table_word], " TMP0 ", 8), %[crc0]\n" \
+    "movzbq " BUF0L ", " TMP0 "\n" \
+    "xorq 6*256*8(%[table_word], " TMP0 ", 8), %[crc0]\n" \
+    "movzbl " BUF0H ", " TMP0W "\n" \
+    "xorq 7*256*8(%[table_word], " TMP0 ", 8), %[crc0]\n"
+
+template<> uint64 GenericCrc<uint64, uint64, uint64, 4>::CrcMultiwordGccAmd64(
+    const void *data, size_t bytes, const uint64 &start) const {
+  const uint8 *src = static_cast<const uint8 *>(data);
+  const uint8 *end = src + bytes;
+  uint64 crc0 = start ^ this->Base().Canonize();
+
+  ALIGN_ON_WORD_BOUNDARY_IF_NEEDED(bytes, this, src, end, crc0, uint64);
+  if (src >= end) {
+    return (crc0 ^ this->Base().Canonize());
+  }
+
+  uint64 crc1;
+  uint64 crc2;
+  uint64 crc3;
+
+  asm(
+    "sub $2*4*8 - 1, %[end]\n"
+    "cmpq  %[src], %[end]\n"
+    "jbe 2f\n"
+    "xorq %[crc1], %[crc1]\n"
+    "movq (%[src]), " BUF0 "\n"
+    "movq 1*8(%[src]), " BUF1 "\n"
+    "movq 2*8(%[src]), " BUF2 "\n"
+    "movq 3*8(%[src]), " BUF3 "\n"
+    "movq %[crc1], %[crc2]\n"
+    "movq %[crc1], %[crc3]\n"
+
+    "1:\n"
+#if HAVE_SSE && CRCUTIL_PREFETCH_WIDTH > 0
+    "prefetcht0 " TO_STRING(CRCUTIL_PREFETCH_WIDTH) "(%[src])\n"
+#endif  // HAVE_SSE
+    "add $4*8, %[src]\n"
+
+    // Set buffer data.
+    "xorq %[crc0], " BUF0 "\n"
+    "xorq %[crc1], " BUF1 "\n"
+    "xorq %[crc2], " BUF2 "\n"
+    "xorq %[crc3], " BUF3 "\n"
+
+    // LOAD crc of byte 0 and shift buffers.
+    "movzbl " BUF0L ", " TMP0W "\n"
+    "movq (%[table], " TMP0 ", 8), %[crc0]\n"
+    "movzbl " BUF1L ", " TMP0W "\n"
+    "movq (%[table], " TMP0 ", 8), %[crc1]\n"
+    "movzbl " BUF2L ", " TMP0W "\n"
+    "movq (%[table], " TMP0 ", 8), %[crc2]\n"
+    "movzbl " BUF3L ", " TMP0W "\n"
+    "movq (%[table], " TMP0 ", 8), %[crc3]\n"
+
+#define XOR1(byte1) \
+    "movzbl " BUF0L ", " TMP0W "\n" \
+    "xorq " #byte1 "*256*8(%[table], " TMP0 ", 8), %[crc0]\n" \
+    "movzbl " BUF1L ", " TMP0W "\n" \
+    "xorq " #byte1 "*256*8(%[table], " TMP0 ", 8), %[crc1]\n" \
+    "movzbl " BUF2L ", " TMP0W "\n" \
+    "xorq " #byte1 "*256*8(%[table], " TMP0 ", 8), %[crc2]\n" \
+    "movzbl " BUF3L ", " TMP0W "\n" \
+    "xorq " #byte1 "*256*8(%[table], " TMP0 ", 8), %[crc3]\n"
+
+#define XOR2(byte2) \
+    "movzbl " BUF0H ", " TMP0W "\n" \
+    "shrq $16, " BUF0 "\n" \
+    "xorq " #byte2 "*256*8(%[table], " TMP0 ", 8), %[crc0]\n" \
+    "movzbl " BUF1H ", " TMP0W "\n" \
+    "shrq $16, " BUF1 "\n" \
+    "xorq " #byte2 "*256*8(%[table], " TMP0 ", 8), %[crc1]\n" \
+    "movzbl " BUF2H ", " TMP0W "\n" \
+    "shrq $16, " BUF2 "\n" \
+    "xorq " #byte2 "*256*8(%[table], " TMP0 ", 8), %[crc2]\n" \
+    "movzbl " BUF3H ", " TMP0W "\n" \
+    "shrq $16, " BUF3 "\n" \
+    "xorq " #byte2 "*256*8(%[table], " TMP0 ", 8), %[crc3]\n"
+
+    XOR2(1)
+    XOR1(2)
+    XOR2(3)
+    XOR1(4)
+    XOR2(5)
+    XOR1(6)
+
+    // Update CRC registers and load buffers.
+    "movzbl " BUF0H ", " TMP0W "\n"
+    "xorq 7*256*8(%[table], " TMP0 ", 8), %[crc0]\n"
+    "movq (%[src]), " BUF0 "\n"
+    "movzbl " BUF1H ", " TMP0W "\n"
+    "xorq 7*256*8(%[table], " TMP0 ", 8), %[crc1]\n"
+    "movq 1*8(%[src]), " BUF1 "\n"
+    "movzbl " BUF2H ", " TMP0W "\n"
+    "xorq 7*256*8(%[table], " TMP0 ", 8), %[crc2]\n"
+    "movq 2*8(%[src]), " BUF2 "\n"
+    "movzbl " BUF3H ", " TMP0W "\n"
+    "xorq 7*256*8(%[table], " TMP0 ", 8), %[crc3]\n"
+    "movq 3*8(%[src]), " BUF3 "\n"
+
+    "cmpq  %[src], %[end]\n"
+    "ja 1b\n"
+
+    CRC_WORD_ASM()
+
+    "xorq %[crc1], " BUF1 "\n"
+    "movq " BUF1 ", " BUF0 "\n"
+    CRC_WORD_ASM()
+
+    "xorq %[crc2], " BUF2 "\n"
+    "movq " BUF2 ", " BUF0 "\n"
+    CRC_WORD_ASM()
+
+    "xorq %[crc3], " BUF3 "\n"
+    "movq " BUF3 ", " BUF0 "\n"
+    CRC_WORD_ASM()
+
+    "add $4*8, %[src]\n"
+
+    "2:\n"
+    "add $2*4*8 - 8, %[end]\n"
+    "cmpq %[src], %[end]\n"
+    "jbe 4f\n"
+
+    "3:\n"
+    "movq (%[src]), " BUF0 "\n"
+    "add $8, %[src]\n"
+    CRC_WORD_ASM()
+    "cmpq %[src], %[end]\n"
+    "ja 3b\n"
+
+    "4:\n"
+    "add $7, %[end]\n"
+
+    "cmpq %[src], %[end]\n"
+    "jbe 6f\n"
+
+    "5:\n"
+    "movzbq (%[src]), " BUF0 "\n"
+    "movzbq %b[crc0], " TMP0 "\n"
+    "shrq  $8, %[crc0]\n"
+    "xorq " BUF0 ", " TMP0 "\n"
+    "add $1, %[src]\n"
+    "xorq 7*256*8(%[table_word], " TMP0 ", 8), %[crc0]\n"
+    "cmpq %[src], %[end]\n"
+    "ja 5b\n"
+
+    "6:\n"
+
+
+    :   // outputs
+      [src] "+r" (src),
+      [end] "+r" (end),
+      [crc0] "+r" (crc0),
+      [crc1] "=&r" (crc1),
+      [crc2] "=&r" (crc2),
+      [crc3] "=&r" (crc3)
+
+    :   // inputs
+      [table] "r" (&this->crc_word_interleaved_[0][0]),
+      [table_word] "r" (&this->crc_word_[0][0])
+
+    :   // clobbers
+      "%rax",   // BUF0
+      "%rbx",   // BUF1
+      "%rcx",   // BUF2
+      "%rdx",   // BUF3
+      "%rsi"    // TMP0
+    );
+
+  return (crc0 ^ this->Base().Canonize());
+}
+
+}  // namespace crcutil
+
+#endif  // defined(__GNUC__) && HAVE_AMD64 && CRCUTIL_USE_ASM
diff --git a/contrib/libs/crcutil/multiword_64_64_gcc_i386_mmx.cc b/contrib/libs/crcutil/multiword_64_64_gcc_i386_mmx.cc
index 2bb6e59f3b..6bd4ead5bd 100644
--- a/contrib/libs/crcutil/multiword_64_64_gcc_i386_mmx.cc
+++ b/contrib/libs/crcutil/multiword_64_64_gcc_i386_mmx.cc
@@ -1,261 +1,261 @@
-// Copyright 2010 Google Inc.  All rights reserved. 
-// 
-// Licensed under the Apache License, Version 2.0 (the "License"); 
-// you may not use this file except in compliance with the License. 
-// You may obtain a copy of the License at 
-// 
-//      http://www.apache.org/licenses/LICENSE-2.0 
-// 
-// Unless required by applicable law or agreed to in writing, software 
-// distributed under the License is distributed on an "AS IS" BASIS, 
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-// See the License for the specific language governing permissions and 
-// limitations under the License. 
- 
-// Implements multiword CRC for GCC on i386. 
- 
-#include "generic_crc.h" 
- 
-#if defined(__GNUC__) && CRCUTIL_USE_ASM && HAVE_I386 && HAVE_MMX 
- 
-namespace crcutil { 
- 
-template<> uint64 GenericCrc<uint64, uint64, uint64, 4>::CrcMultiwordI386Mmx( 
-    const void *data, size_t bytes, const uint64 &start) 
-        const GCC_OMIT_FRAME_POINTER; 
- 
-template<> uint64 GenericCrc<uint64, uint64, uint64, 4>::CrcMultiword( 
-    const void *data, size_t bytes, const uint64 &start) const { 
-  if (bytes <= 7) { 
-    const uint8 *src = static_cast<const uint8 *>(data); 
-    uint64 crc = start ^ this->Base().Canonize(); 
-    for (const uint8 *end = src + bytes; src < end; ++src) { 
-      CRC_BYTE(this, crc, *src); 
-    } 
-    return (crc ^ this->Base().Canonize()); 
-  } 
-  return CrcMultiwordI386Mmx(data, bytes, start); 
-} 
- 
-#define CRC_WORD_MMX() \ 
-    "pxor %[crc0], %[buf0]\n" \ 
-    "movd %[buf0], %[tmp0]\n" \ 
-    "psrlq $32, %[buf0]\n" \ 
-    "movzbl %b[tmp0], %[temp]\n" \ 
-    "shrl $8, %[tmp0]\n" \ 
-    "movq (%[table], %[temp], 8), %[crc0]\n" \ 
-    "movzbl %b[tmp0], %[temp]\n" \ 
-    "shrl $8, %[tmp0]\n" \ 
-    "pxor 1*256*8(%[table], %[temp], 8), %[crc0]\n" \ 
-    "movzbl %b[tmp0], %[temp]\n" \ 
-    "shrl $8, %[tmp0]\n" \ 
-    "pxor 2*256*8(%[table], %[temp], 8), %[crc0]\n" \ 
-    "pxor 3*256*8(%[table], %[tmp0], 8), %[crc0]\n" \ 
-    "movd %[buf0], %[tmp0]\n" \ 
-    "movzbl %b[tmp0], %[temp]\n" \ 
-    "shrl $8, %[tmp0]\n" \ 
-    "pxor 4*256*8(%[table], %[temp], 8), %[crc0]\n" \ 
-    "movzbl %b[tmp0], %[temp]\n" \ 
-    "shrl $8, %[tmp0]\n" \ 
-    "pxor 5*256*8(%[table], %[temp], 8), %[crc0]\n" \ 
-    "movzbl %b[tmp0], %[temp]\n" \ 
-    "shrl $8, %[tmp0]\n" \ 
-    "pxor 6*256*8(%[table], %[temp], 8), %[crc0]\n" \ 
-    "pxor 7*256*8(%[table], %[tmp0], 8), %[crc0]\n" 
- 
-template<> uint64 GenericCrc<uint64, uint64, uint64, 4>::CrcMultiwordI386Mmx( 
-    const void *data, size_t bytes, const uint64 &start) const { 
-  const uint8 *src = static_cast<const uint8 *>(data); 
-  const uint8 *end = src + bytes; 
-  uint64 crc0 = start ^ this->Base().Canonize(); 
- 
-  ALIGN_ON_WORD_BOUNDARY_IF_NEEDED(bytes, this, src, end, crc0, uint64); 
-  if (src >= end) { 
-    return (crc0 ^ this->Base().Canonize()); 
-  } 
- 
-  uint64 crc1; 
-  uint64 crc2; 
-  uint64 crc3; 
- 
-  uint64 buf0; 
-  uint64 buf1; 
-  uint64 buf2; 
-  uint64 buf3; 
- 
-  uint32 tmp0; 
-  uint32 tmp1; 
-  uint32 tmp2; 
-  uint32 tmp3; 
- 
-  uint32 temp; 
- 
-  void *table_ptr; 
-  const uint64 *table_interleaved = &this->crc_word_interleaved_[0][0]; 
-  const uint64 *table_word = &this->crc_word_[0][0]; 
- 
-  asm( 
+// Copyright 2010 Google Inc.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Implements multiword CRC for GCC on i386.
+
+#include "generic_crc.h"
+
+#if defined(__GNUC__) && CRCUTIL_USE_ASM && HAVE_I386 && HAVE_MMX
+
+namespace crcutil {
+
+template<> uint64 GenericCrc<uint64, uint64, uint64, 4>::CrcMultiwordI386Mmx(
+    const void *data, size_t bytes, const uint64 &start)
+        const GCC_OMIT_FRAME_POINTER;
+
+template<> uint64 GenericCrc<uint64, uint64, uint64, 4>::CrcMultiword(
+    const void *data, size_t bytes, const uint64 &start) const {
+  if (bytes <= 7) {
+    const uint8 *src = static_cast<const uint8 *>(data);
+    uint64 crc = start ^ this->Base().Canonize();
+    for (const uint8 *end = src + bytes; src < end; ++src) {
+      CRC_BYTE(this, crc, *src);
+    }
+    return (crc ^ this->Base().Canonize());
+  }
+  return CrcMultiwordI386Mmx(data, bytes, start);
+}
+
+#define CRC_WORD_MMX() \
+    "pxor %[crc0], %[buf0]\n" \
+    "movd %[buf0], %[tmp0]\n" \
+    "psrlq $32, %[buf0]\n" \
+    "movzbl %b[tmp0], %[temp]\n" \
+    "shrl $8, %[tmp0]\n" \
+    "movq (%[table], %[temp], 8), %[crc0]\n" \
+    "movzbl %b[tmp0], %[temp]\n" \
+    "shrl $8, %[tmp0]\n" \
+    "pxor 1*256*8(%[table], %[temp], 8), %[crc0]\n" \
+    "movzbl %b[tmp0], %[temp]\n" \
+    "shrl $8, %[tmp0]\n" \
+    "pxor 2*256*8(%[table], %[temp], 8), %[crc0]\n" \
+    "pxor 3*256*8(%[table], %[tmp0], 8), %[crc0]\n" \
+    "movd %[buf0], %[tmp0]\n" \
+    "movzbl %b[tmp0], %[temp]\n" \
+    "shrl $8, %[tmp0]\n" \
+    "pxor 4*256*8(%[table], %[temp], 8), %[crc0]\n" \
+    "movzbl %b[tmp0], %[temp]\n" \
+    "shrl $8, %[tmp0]\n" \
+    "pxor 5*256*8(%[table], %[temp], 8), %[crc0]\n" \
+    "movzbl %b[tmp0], %[temp]\n" \
+    "shrl $8, %[tmp0]\n" \
+    "pxor 6*256*8(%[table], %[temp], 8), %[crc0]\n" \
+    "pxor 7*256*8(%[table], %[tmp0], 8), %[crc0]\n"
+
+template<> uint64 GenericCrc<uint64, uint64, uint64, 4>::CrcMultiwordI386Mmx(
+    const void *data, size_t bytes, const uint64 &start) const {
+  const uint8 *src = static_cast<const uint8 *>(data);
+  const uint8 *end = src + bytes;
+  uint64 crc0 = start ^ this->Base().Canonize();
+
+  ALIGN_ON_WORD_BOUNDARY_IF_NEEDED(bytes, this, src, end, crc0, uint64);
+  if (src >= end) {
+    return (crc0 ^ this->Base().Canonize());
+  }
+
+  uint64 crc1;
+  uint64 crc2;
+  uint64 crc3;
+
+  uint64 buf0;
+  uint64 buf1;
+  uint64 buf2;
+  uint64 buf3;
+
+  uint32 tmp0;
+  uint32 tmp1;
+  uint32 tmp2;
+  uint32 tmp3;
+
+  uint32 temp;
+
+  void *table_ptr;
+  const uint64 *table_interleaved = &this->crc_word_interleaved_[0][0];
+  const uint64 *table_word = &this->crc_word_[0][0];
+
+  asm(
     "subl $2*4*8 - 1, %[end]\n"
-    "cmpl  %[src], %[end]\n" 
-    "jbe 2f\n" 
- 
-    "pxor %[crc1], %[crc1]\n" 
-    "pxor %[crc2], %[crc2]\n" 
-    "pxor %[crc3], %[crc3]\n" 
-    "movq (%[src]), %[buf0]\n" 
-    "movq 1*8(%[src]), %[buf1]\n" 
-    "movq 2*8(%[src]), %[buf2]\n" 
-    "movq 3*8(%[src]), %[buf3]\n" 
- 
-    "movl %[table_interleaved], %[table]\n" 
-    "1:\n" 
-#if HAVE_SSE && CRCUTIL_PREFETCH_WIDTH > 0 
-    "prefetcht0 " TO_STRING(CRCUTIL_PREFETCH_WIDTH) "(%[src])\n" 
-#endif 
-    "addl $0x20, %[src]\n" 
-    "pxor %[crc0], %[buf0]\n" 
-    "pxor %[crc1], %[buf1]\n" 
-    "pxor %[crc2], %[buf2]\n" 
-    "pxor %[crc3], %[buf3]\n" 
- 
-    "movd %[buf0], %[tmp0]\n" 
-    "psrlq $32, %[buf0]\n" 
-    "movd %[buf1], %[tmp1]\n" 
-    "psrlq $32, %[buf1]\n" 
-    "movd %[buf2], %[tmp2]\n" 
-    "psrlq $32, %[buf2]\n" 
-    "movd %[buf3], %[tmp3]\n" 
-    "psrlq $32, %[buf3]\n" 
- 
-    "movzbl %b[tmp0], %[temp]\n" 
-    "shrl $8, %[tmp0]\n" 
-    "movq (%[table], %[temp], 8), %[crc0]\n" 
-    "movzbl %b[tmp1], %[temp]\n" 
-    "shrl $8, %[tmp1]\n" 
-    "movq (%[table], %[temp], 8), %[crc1]\n" 
-    "movzbl %b[tmp2], %[temp]\n" 
-    "shrl $8, %[tmp2]\n" 
-    "movq (%[table], %[temp], 8), %[crc2]\n" 
-    "movzbl %b[tmp3], %[temp]\n" 
-    "shrl $8, %[tmp3]\n" 
-    "movq (%[table], %[temp], 8), %[crc3]\n" 
- 
-#define XOR(byte) \ 
-    "movzbl %b[tmp0], %[temp]\n" \ 
-    "shrl $8, %[tmp0]\n" \ 
-    "pxor " #byte "*256*8(%[table], %[temp], 8), %[crc0]\n" \ 
-    "movzbl %b[tmp1], %[temp]\n" \ 
-    "shrl $8, %[tmp1]\n" \ 
-    "pxor " #byte "*256*8(%[table], %[temp], 8), %[crc1]\n" \ 
-    "movzbl %b[tmp2], %[temp]\n" \ 
-    "shrl $8, %[tmp2]\n" \ 
-    "pxor " #byte "*256*8(%[table], %[temp], 8), %[crc2]\n" \ 
-    "movzbl %b[tmp3], %[temp]\n" \ 
-    "shrl $8, %[tmp3]\n" \ 
-    "pxor " #byte "*256*8(%[table], %[temp], 8), %[crc3]\n" 
- 
-    XOR(1) 
-    XOR(2) 
- 
-    "pxor 3*256*8(%[table], %[tmp0], 8), %[crc0]\n" 
-    "movd %[buf0], %[tmp0]\n" 
-    "pxor 3*256*8(%[table], %[tmp1], 8), %[crc1]\n" 
-    "movd %[buf1], %[tmp1]\n" 
-    "pxor 3*256*8(%[table], %[tmp2], 8), %[crc2]\n" 
-    "movd %[buf2], %[tmp2]\n" 
-    "pxor 3*256*8(%[table], %[tmp3], 8), %[crc3]\n" 
-    "movd %[buf3], %[tmp3]\n" 
- 
-    XOR(4) 
-    XOR(5) 
-    XOR(6) 
- 
-    "pxor 7*256*8(%[table], %[tmp0], 8), %[crc0]\n" 
-    "movq (%[src]), %[buf0]\n" 
-    "pxor 7*256*8(%[table], %[tmp1], 8), %[crc1]\n" 
-    "movq 1*8(%[src]), %[buf1]\n" 
-    "pxor 7*256*8(%[table], %[tmp2], 8), %[crc2]\n" 
-    "movq 2*8(%[src]), %[buf2]\n" 
-    "pxor 7*256*8(%[table], %[tmp3], 8), %[crc3]\n" 
-    "movq 3*8(%[src]), %[buf3]\n" 
-    "cmpl %[src], %[end]\n" 
-    "ja 1b\n" 
-#undef XOR 
- 
-    "movl %[table_word], %[table]\n" 
-    CRC_WORD_MMX() 
- 
-    "pxor %[crc1], %[buf1]\n" 
-    "movq %[buf1], %[buf0]\n" 
-    CRC_WORD_MMX() 
- 
-    "pxor %[crc2], %[buf2]\n" 
-    "movq %[buf2], %[buf0]\n" 
-    CRC_WORD_MMX() 
- 
-    "pxor %[crc3], %[buf3]\n" 
-    "movq %[buf3], %[buf0]\n" 
-    CRC_WORD_MMX() 
- 
-    "add $4*8, %[src]\n" 
-    "2:\n" 
-    "movl %[table_word], %[table]\n" 
- 
+    "cmpl  %[src], %[end]\n"
+    "jbe 2f\n"
+
+    "pxor %[crc1], %[crc1]\n"
+    "pxor %[crc2], %[crc2]\n"
+    "pxor %[crc3], %[crc3]\n"
+    "movq (%[src]), %[buf0]\n"
+    "movq 1*8(%[src]), %[buf1]\n"
+    "movq 2*8(%[src]), %[buf2]\n"
+    "movq 3*8(%[src]), %[buf3]\n"
+
+    "movl %[table_interleaved], %[table]\n"
+    "1:\n"
+#if HAVE_SSE && CRCUTIL_PREFETCH_WIDTH > 0
+    "prefetcht0 " TO_STRING(CRCUTIL_PREFETCH_WIDTH) "(%[src])\n"
+#endif
+    "addl $0x20, %[src]\n"
+    "pxor %[crc0], %[buf0]\n"
+    "pxor %[crc1], %[buf1]\n"
+    "pxor %[crc2], %[buf2]\n"
+    "pxor %[crc3], %[buf3]\n"
+
+    "movd %[buf0], %[tmp0]\n"
+    "psrlq $32, %[buf0]\n"
+    "movd %[buf1], %[tmp1]\n"
+    "psrlq $32, %[buf1]\n"
+    "movd %[buf2], %[tmp2]\n"
+    "psrlq $32, %[buf2]\n"
+    "movd %[buf3], %[tmp3]\n"
+    "psrlq $32, %[buf3]\n"
+
+    "movzbl %b[tmp0], %[temp]\n"
+    "shrl $8, %[tmp0]\n"
+    "movq (%[table], %[temp], 8), %[crc0]\n"
+    "movzbl %b[tmp1], %[temp]\n"
+    "shrl $8, %[tmp1]\n"
+    "movq (%[table], %[temp], 8), %[crc1]\n"
+    "movzbl %b[tmp2], %[temp]\n"
+    "shrl $8, %[tmp2]\n"
+    "movq (%[table], %[temp], 8), %[crc2]\n"
+    "movzbl %b[tmp3], %[temp]\n"
+    "shrl $8, %[tmp3]\n"
+    "movq (%[table], %[temp], 8), %[crc3]\n"
+
+#define XOR(byte) \
+    "movzbl %b[tmp0], %[temp]\n" \
+    "shrl $8, %[tmp0]\n" \
+    "pxor " #byte "*256*8(%[table], %[temp], 8), %[crc0]\n" \
+    "movzbl %b[tmp1], %[temp]\n" \
+    "shrl $8, %[tmp1]\n" \
+    "pxor " #byte "*256*8(%[table], %[temp], 8), %[crc1]\n" \
+    "movzbl %b[tmp2], %[temp]\n" \
+    "shrl $8, %[tmp2]\n" \
+    "pxor " #byte "*256*8(%[table], %[temp], 8), %[crc2]\n" \
+    "movzbl %b[tmp3], %[temp]\n" \
+    "shrl $8, %[tmp3]\n" \
+    "pxor " #byte "*256*8(%[table], %[temp], 8), %[crc3]\n"
+
+    XOR(1)
+    XOR(2)
+
+    "pxor 3*256*8(%[table], %[tmp0], 8), %[crc0]\n"
+    "movd %[buf0], %[tmp0]\n"
+    "pxor 3*256*8(%[table], %[tmp1], 8), %[crc1]\n"
+    "movd %[buf1], %[tmp1]\n"
+    "pxor 3*256*8(%[table], %[tmp2], 8), %[crc2]\n"
+    "movd %[buf2], %[tmp2]\n"
+    "pxor 3*256*8(%[table], %[tmp3], 8), %[crc3]\n"
+    "movd %[buf3], %[tmp3]\n"
+
+    XOR(4)
+    XOR(5)
+    XOR(6)
+
+    "pxor 7*256*8(%[table], %[tmp0], 8), %[crc0]\n"
+    "movq (%[src]), %[buf0]\n"
+    "pxor 7*256*8(%[table], %[tmp1], 8), %[crc1]\n"
+    "movq 1*8(%[src]), %[buf1]\n"
+    "pxor 7*256*8(%[table], %[tmp2], 8), %[crc2]\n"
+    "movq 2*8(%[src]), %[buf2]\n"
+    "pxor 7*256*8(%[table], %[tmp3], 8), %[crc3]\n"
+    "movq 3*8(%[src]), %[buf3]\n"
+    "cmpl %[src], %[end]\n"
+    "ja 1b\n"
+#undef XOR
+
+    "movl %[table_word], %[table]\n"
+    CRC_WORD_MMX()
+
+    "pxor %[crc1], %[buf1]\n"
+    "movq %[buf1], %[buf0]\n"
+    CRC_WORD_MMX()
+
+    "pxor %[crc2], %[buf2]\n"
+    "movq %[buf2], %[buf0]\n"
+    CRC_WORD_MMX()
+
+    "pxor %[crc3], %[buf3]\n"
+    "movq %[buf3], %[buf0]\n"
+    CRC_WORD_MMX()
+
+    "add $4*8, %[src]\n"
+    "2:\n"
+    "movl %[table_word], %[table]\n"
+
     "addl $2*4*8 - 8, %[end]\n"
-    "cmpl %[src], %[end]\n" 
-    "jbe 4f\n" 
-    "3:\n" 
-    "movq (%[src]), %[buf0]\n" 
-    "addl $0x8, %[src]\n" 
-    CRC_WORD_MMX() 
-    "cmpl %[src], %[end]\n" 
-    "ja 3b\n" 
-    "4:\n" 
+    "cmpl %[src], %[end]\n"
+    "jbe 4f\n"
+    "3:\n"
+    "movq (%[src]), %[buf0]\n"
+    "addl $0x8, %[src]\n"
+    CRC_WORD_MMX()
+    "cmpl %[src], %[end]\n"
+    "ja 3b\n"
+    "4:\n"
     "addl $7, %[end]\n"
- 
-    "cmpl %[src], %[end]\n" 
-    "jbe 6f\n" 
- 
-    "5:\n" 
-    "movd %[crc0], %[tmp0]\n" 
-    "movzbl (%[src]), %[temp]\n" 
-    "movzbl %b[tmp0], %[tmp0]\n" 
-    "psrlq $8, %[crc0]\n" 
-    "xorl %[tmp0], %[temp]\n" 
-    "add $1, %[src]\n" 
-    "pxor 7*256*8(%[table], %[temp], 8), %[crc0]\n" 
-    "cmpl %[src], %[end]\n" 
-    "ja 5b\n" 
- 
-    "6:\n" 
- 
-    :   // outputs 
-      [src] "+r" (src), 
-      [end] "+m" (end), 
-      [crc0] "+y" (crc0), 
-      [crc1] "=&y" (crc1), 
-      [crc2] "=&y" (crc2), 
-      [crc3] "=&y" (crc3), 
-      [buf0] "=&y" (buf0), 
-      [buf1] "=&y" (buf1), 
-      [buf2] "=&y" (buf2), 
-      [buf3] "=&y" (buf3), 
-      [tmp0] "=&q" (tmp0), 
-      [tmp1] "=&q" (tmp1), 
-      [tmp2] "=&q" (tmp2), 
-      [tmp3] "=&q" (tmp3), 
-      [temp] "=&r" (temp), 
-      [table] "=&r" (table_ptr) 
- 
-    :   // inputs 
-      [table_interleaved] "m" (table_interleaved), 
-      [table_word] "m" (table_word)); 
- 
-  asm volatile("emms"); 
- 
-  return (crc0 ^ this->Base().Canonize()); 
-} 
- 
-}  // namespace crcutil 
- 
-#endif  // defined(__GNUC__) && HAVE_AMD64 && CRCUTIL_USE_ASM 
+
+    "cmpl %[src], %[end]\n"
+    "jbe 6f\n"
+
+    "5:\n"
+    "movd %[crc0], %[tmp0]\n"
+    "movzbl (%[src]), %[temp]\n"
+    "movzbl %b[tmp0], %[tmp0]\n"
+    "psrlq $8, %[crc0]\n"
+    "xorl %[tmp0], %[temp]\n"
+    "add $1, %[src]\n"
+    "pxor 7*256*8(%[table], %[temp], 8), %[crc0]\n"
+    "cmpl %[src], %[end]\n"
+    "ja 5b\n"
+
+    "6:\n"
+
+    :   // outputs
+      [src] "+r" (src),
+      [end] "+m" (end),
+      [crc0] "+y" (crc0),
+      [crc1] "=&y" (crc1),
+      [crc2] "=&y" (crc2),
+      [crc3] "=&y" (crc3),
+      [buf0] "=&y" (buf0),
+      [buf1] "=&y" (buf1),
+      [buf2] "=&y" (buf2),
+      [buf3] "=&y" (buf3),
+      [tmp0] "=&q" (tmp0),
+      [tmp1] "=&q" (tmp1),
+      [tmp2] "=&q" (tmp2),
+      [tmp3] "=&q" (tmp3),
+      [temp] "=&r" (temp),
+      [table] "=&r" (table_ptr)
+
+    :   // inputs
+      [table_interleaved] "m" (table_interleaved),
+      [table_word] "m" (table_word));
+
+  asm volatile("emms");
+
+  return (crc0 ^ this->Base().Canonize());
+}
+
+}  // namespace crcutil
+
+#endif  // defined(__GNUC__) && HAVE_AMD64 && CRCUTIL_USE_ASM
diff --git a/contrib/libs/crcutil/multiword_64_64_intrinsic_i386_mmx.cc b/contrib/libs/crcutil/multiword_64_64_intrinsic_i386_mmx.cc
index a37d4d251b..302af5a5a4 100644
--- a/contrib/libs/crcutil/multiword_64_64_intrinsic_i386_mmx.cc
+++ b/contrib/libs/crcutil/multiword_64_64_intrinsic_i386_mmx.cc
@@ -1,243 +1,243 @@
-// Copyright 2010 Google Inc.  All rights reserved. 
-// 
-// Licensed under the Apache License, Version 2.0 (the "License"); 
-// you may not use this file except in compliance with the License. 
-// You may obtain a copy of the License at 
-// 
-//      http://www.apache.org/licenses/LICENSE-2.0 
-// 
-// Unless required by applicable law or agreed to in writing, software 
-// distributed under the License is distributed on an "AS IS" BASIS, 
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-// See the License for the specific language governing permissions and 
-// limitations under the License. 
- 
-// Implements 64-bit multiword CRC using MMX built-in functions. 
- 
-#include "generic_crc.h" 
- 
-#if CRCUTIL_USE_ASM && HAVE_I386 && HAVE_MMX 
- 
-namespace crcutil { 
- 
-template<> uint64 GenericCrc<uint64, uint64, uint64, 4>::CrcMultiwordI386Mmx( 
-    const void *data, size_t bytes, const uint64 &start) 
-        const GCC_OMIT_FRAME_POINTER; 
- 
-#if !defined(_MSC_VER) 
-template<> uint64 GenericCrc<uint64, uint64, uint64, 4>::CrcMultiword( 
-    const void *data, 
-    size_t bytes, 
-    const uint64 &start) const { 
-  if (bytes <= 7) { 
-    const uint8 *src = static_cast<const uint8 *>(data); 
-    uint64 crc = start ^ Base().Canonize(); 
-    for (const uint8 *end = src + bytes; src < end; ++src) { 
-      CRC_BYTE(this, crc, *src); 
-    } 
-    return (crc ^ Base().Canonize()); 
-  } 
-  return CrcMultiwordI386Mmx(data, bytes, start); 
-} 
-#else 
-#pragma warning(push) 
-// CL: uninitialized local variable 'crc1' used 
-// Wrong: crc1 = XOR(crc1, crc1) sets it to 0. 
-#pragma warning(disable: 4700) 
- 
-#pragma warning(disable: 4619)  // there is no warning number '592' 
- 
-// ICL: variable "crc1" is used before its value is set 
-// Wrong: crc1 = XOR(crc1, crc1) sets it to 0. 
-#pragma warning(disable: 592) 
-#endif  // !defined(_MSC_VER) 
- 
-#define MM64(adr) reinterpret_cast<const __m64 *>(adr) 
-#define MM64_TABLE(byte) MM64(crc_word_interleaved_[byte]) 
- 
-#define CRC_WORD_MMX(this, crc, buf) do { \ 
-  buf = _mm_xor_si64(buf, crc); \ 
-  uint32 tmp = static_cast<uint32>(_mm_cvtsi64_si32(buf)); \ 
-  buf = _mm_srli_si64(buf, 32); \ 
-  crc = MM64(crc_word_[0])[TO_BYTE(tmp)]; \ 
-  tmp >>= 8; \ 
-  crc = _mm_xor_si64(crc, MM64(crc_word_[1])[TO_BYTE(tmp)]); \ 
-  tmp >>= 8; \ 
-  crc = _mm_xor_si64(crc, MM64(crc_word_[2])[TO_BYTE(tmp)]); \ 
-  tmp >>= 8; \ 
-  crc = _mm_xor_si64(crc, MM64(crc_word_[3])[tmp]); \ 
-  tmp = static_cast<uint32>(_mm_cvtsi64_si32(buf)); \ 
-  crc = _mm_xor_si64(crc, MM64(crc_word_[4])[TO_BYTE(tmp)]); \ 
-  tmp >>= 8; \ 
-  crc = _mm_xor_si64(crc, MM64(crc_word_[5])[TO_BYTE(tmp)]); \ 
-  tmp >>= 8; \ 
-  crc = _mm_xor_si64(crc, MM64(crc_word_[6])[TO_BYTE(tmp)]); \ 
-  tmp >>= 8; \ 
-  crc = _mm_xor_si64(crc, MM64(crc_word_[7])[tmp]); \ 
-} while (0) 
- 
-template<> uint64 GenericCrc<uint64, uint64, uint64, 4>::CrcMultiwordI386Mmx( 
-    const void *data, size_t bytes, const uint64 &start) const { 
-  const uint8 *src = static_cast<const uint8 *>(data); 
-  const uint8 *end = src + bytes; 
-  uint64 crc = start ^ Base().Canonize(); 
- 
-  ALIGN_ON_WORD_BOUNDARY_IF_NEEDED(bytes, this, src, end, crc, uint64); 
-  if (src >= end) { 
-    return (crc ^ Base().Canonize()); 
-  } 
- 
-  // Process 4 registers of sizeof(uint64) bytes at once. 
-  bytes = static_cast<size_t>(end - src) & ~(4*8 - 1); 
-  if (bytes > 4*8) { 
-    const uint8 *stop = src + bytes - 4*8; 
-    union { 
-      __m64 m64; 
-      uint64 u64; 
-    } temp; 
-    __m64 crc0; 
-    __m64 crc1; 
-    __m64 crc2; 
-    __m64 crc3; 
-    __m64 buf0 = MM64(src)[0]; 
-    __m64 buf1 = MM64(src)[1]; 
-    __m64 buf2 = MM64(src)[2]; 
-    __m64 buf3 = MM64(src)[3]; 
- 
-    temp.u64 = crc; 
-    crc0 = temp.m64; 
-#if defined(__GNUC__) && !GCC_VERSION_AVAILABLE(4, 4) 
-    // There is no way to suppress a warning in GCC; 
-    // generate extra assignments. 
-    temp.u64 = 0; 
-    crc1 = temp.m64; 
-    crc2 = temp.m64; 
-    crc3 = temp.m64; 
-#else 
-    crc1 = _mm_xor_si64(crc1, crc1); 
-    crc2 = _mm_xor_si64(crc2, crc2); 
-    crc3 = _mm_xor_si64(crc3, crc3); 
-#endif  // defined(__GNUC__) && !GCC_VERSION_AVAILABLE(4, 4) 
- 
-    do { 
-      PREFETCH(src); 
-      src += 4*8; 
- 
-      buf0 = _mm_xor_si64(buf0, crc0); 
-      buf1 = _mm_xor_si64(buf1, crc1); 
-      buf2 = _mm_xor_si64(buf2, crc2); 
-      buf3 = _mm_xor_si64(buf3, crc3); 
- 
-      uint32 tmp0 = static_cast<uint32>(_mm_cvtsi64_si32(buf0)); 
-      uint32 tmp1 = static_cast<uint32>(_mm_cvtsi64_si32(buf1)); 
-      uint32 tmp2 = static_cast<uint32>(_mm_cvtsi64_si32(buf2)); 
-      uint32 tmp3 = static_cast<uint32>(_mm_cvtsi64_si32(buf3)); 
- 
-      buf0 = _mm_srli_si64(buf0, 32); 
-      buf1 = _mm_srli_si64(buf1, 32); 
-      buf2 = _mm_srli_si64(buf2, 32); 
-      buf3 = _mm_srli_si64(buf3, 32); 
- 
-      crc0 = MM64_TABLE(0)[TO_BYTE(tmp0)]; 
-      tmp0 >>= 8; 
-      crc1 = MM64_TABLE(0)[TO_BYTE(tmp1)]; 
-      tmp1 >>= 8; 
-      crc2 = MM64_TABLE(0)[TO_BYTE(tmp2)]; 
-      tmp2 >>= 8; 
-      crc3 = MM64_TABLE(0)[TO_BYTE(tmp3)]; 
-      tmp3 >>= 8; 
- 
-#define XOR(byte) do { \ 
-      crc0 = _mm_xor_si64(crc0, MM64_TABLE(byte)[TO_BYTE(tmp0)]); \ 
-      tmp0 >>= 8; \ 
-      crc1 = _mm_xor_si64(crc1, MM64_TABLE(byte)[TO_BYTE(tmp1)]); \ 
-      tmp1 >>= 8; \ 
-      crc2 = _mm_xor_si64(crc2, MM64_TABLE(byte)[TO_BYTE(tmp2)]); \ 
-      tmp2 >>= 8; \ 
-      crc3 = _mm_xor_si64(crc3, MM64_TABLE(byte)[TO_BYTE(tmp3)]); \ 
-      tmp3 >>= 8; \ 
-} while (0) 
- 
-      XOR(1); 
-      XOR(2); 
- 
-      crc0 = _mm_xor_si64(crc0, MM64_TABLE(3)[tmp0]); 
-      tmp0 = static_cast<uint32>(_mm_cvtsi64_si32(buf0)); 
-      crc1 = _mm_xor_si64(crc1, MM64_TABLE(3)[tmp1]); 
-      tmp1 = static_cast<uint32>(_mm_cvtsi64_si32(buf1)); 
-      crc2 = _mm_xor_si64(crc2, MM64_TABLE(3)[tmp2]); 
-      tmp2 = static_cast<uint32>(_mm_cvtsi64_si32(buf2)); 
-      crc3 = _mm_xor_si64(crc3, MM64_TABLE(3)[tmp3]); 
-      tmp3 = static_cast<uint32>(_mm_cvtsi64_si32(buf3)); 
- 
-      XOR(4); 
-      XOR(5); 
-      XOR(6); 
- 
-#undef XOR 
- 
-      crc0 = _mm_xor_si64(crc0, MM64_TABLE(sizeof(uint64) - 1)[tmp0]); 
-      buf0 = MM64(src)[0]; 
-      crc1 = _mm_xor_si64(crc1, MM64_TABLE(sizeof(uint64) - 1)[tmp1]); 
-      buf1 = MM64(src)[1]; 
-      crc2 = _mm_xor_si64(crc2, MM64_TABLE(sizeof(uint64) - 1)[tmp2]); 
-      buf2 = MM64(src)[2]; 
-      crc3 = _mm_xor_si64(crc3, MM64_TABLE(sizeof(uint64) - 1)[tmp3]); 
-      buf3 = MM64(src)[3]; 
-    } 
-    while (src < stop); 
- 
-    CRC_WORD_MMX(this, crc0, buf0); 
-    buf1 = _mm_xor_si64(buf1, crc1); 
-    CRC_WORD_MMX(this, crc0, buf1); 
-    buf2 = _mm_xor_si64(buf2, crc2); 
-    CRC_WORD_MMX(this, crc0, buf2); 
-    buf3 = _mm_xor_si64(buf3, crc3); 
-    CRC_WORD_MMX(this, crc0, buf3); 
- 
-    temp.m64 = crc0; 
-    crc = temp.u64; 
- 
-    _mm_empty(); 
- 
-    src += 4*8; 
-  } 
- 
-  // Process sizeof(uint64) bytes at once. 
-  bytes = static_cast<size_t>(end - src) & ~(sizeof(uint64) - 1); 
-  if (bytes > 0) { 
-    union { 
-      __m64 m64; 
-      uint64 u64; 
-    } temp; 
-    __m64 crc0; 
- 
-    temp.u64 = crc; 
-    crc0 = temp.m64; 
- 
-    for (const uint8 *stop = src + bytes; src < stop; src += sizeof(uint64)) { 
-      __m64 buf0 = MM64(src)[0]; 
-      CRC_WORD_MMX(this, crc0, buf0); 
-    } 
- 
-    temp.m64 = crc0; 
-    crc = temp.u64; 
- 
-    _mm_empty(); 
-  } 
- 
-  // Compute CRC of remaining bytes. 
-  for (;src < end; ++src) { 
-    CRC_BYTE(this, crc, *src); 
-  } 
- 
-  return (crc ^ Base().Canonize()); 
-} 
- 
-#if defined(_MSC_VER) 
-#pragma warning(pop) 
-#endif  // defined(_MSC_VER) 
- 
-}  // namespace crcutil 
- 
-#endif  // CRCUTIL_USE_ASM && HAVE_I386 && HAVE_MMX 
+// Copyright 2010 Google Inc.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Implements 64-bit multiword CRC using MMX built-in functions.
+
+#include "generic_crc.h"
+
+#if CRCUTIL_USE_ASM && HAVE_I386 && HAVE_MMX
+
+namespace crcutil {
+
+template<> uint64 GenericCrc<uint64, uint64, uint64, 4>::CrcMultiwordI386Mmx(
+    const void *data, size_t bytes, const uint64 &start)
+        const GCC_OMIT_FRAME_POINTER;
+
+#if !defined(_MSC_VER)
+template<> uint64 GenericCrc<uint64, uint64, uint64, 4>::CrcMultiword(
+    const void *data,
+    size_t bytes,
+    const uint64 &start) const {
+  if (bytes <= 7) {
+    const uint8 *src = static_cast<const uint8 *>(data);
+    uint64 crc = start ^ Base().Canonize();
+    for (const uint8 *end = src + bytes; src < end; ++src) {
+      CRC_BYTE(this, crc, *src);
+    }
+    return (crc ^ Base().Canonize());
+  }
+  return CrcMultiwordI386Mmx(data, bytes, start);
+}
+#else
+#pragma warning(push)
+// CL: uninitialized local variable 'crc1' used
+// Wrong: crc1 = XOR(crc1, crc1) sets it to 0.
+#pragma warning(disable: 4700)
+
+#pragma warning(disable: 4619)  // there is no warning number '592'
+
+// ICL: variable "crc1" is used before its value is set
+// Wrong: crc1 = XOR(crc1, crc1) sets it to 0.
+#pragma warning(disable: 592)
+#endif  // !defined(_MSC_VER)
+
+#define MM64(adr) reinterpret_cast<const __m64 *>(adr)
+#define MM64_TABLE(byte) MM64(crc_word_interleaved_[byte])
+
+#define CRC_WORD_MMX(this, crc, buf) do { \
+  buf = _mm_xor_si64(buf, crc); \
+  uint32 tmp = static_cast<uint32>(_mm_cvtsi64_si32(buf)); \
+  buf = _mm_srli_si64(buf, 32); \
+  crc = MM64(crc_word_[0])[TO_BYTE(tmp)]; \
+  tmp >>= 8; \
+  crc = _mm_xor_si64(crc, MM64(crc_word_[1])[TO_BYTE(tmp)]); \
+  tmp >>= 8; \
+  crc = _mm_xor_si64(crc, MM64(crc_word_[2])[TO_BYTE(tmp)]); \
+  tmp >>= 8; \
+  crc = _mm_xor_si64(crc, MM64(crc_word_[3])[tmp]); \
+  tmp = static_cast<uint32>(_mm_cvtsi64_si32(buf)); \
+  crc = _mm_xor_si64(crc, MM64(crc_word_[4])[TO_BYTE(tmp)]); \
+  tmp >>= 8; \
+  crc = _mm_xor_si64(crc, MM64(crc_word_[5])[TO_BYTE(tmp)]); \
+  tmp >>= 8; \
+  crc = _mm_xor_si64(crc, MM64(crc_word_[6])[TO_BYTE(tmp)]); \
+  tmp >>= 8; \
+  crc = _mm_xor_si64(crc, MM64(crc_word_[7])[tmp]); \
+} while (0)
+
+template<> uint64 GenericCrc<uint64, uint64, uint64, 4>::CrcMultiwordI386Mmx(
+    const void *data, size_t bytes, const uint64 &start) const {
+  const uint8 *src = static_cast<const uint8 *>(data);
+  const uint8 *end = src + bytes;
+  uint64 crc = start ^ Base().Canonize();
+
+  ALIGN_ON_WORD_BOUNDARY_IF_NEEDED(bytes, this, src, end, crc, uint64);
+  if (src >= end) {
+    return (crc ^ Base().Canonize());
+  }
+
+  // Process 4 registers of sizeof(uint64) bytes at once.
+  bytes = static_cast<size_t>(end - src) & ~(4*8 - 1);
+  if (bytes > 4*8) {
+    const uint8 *stop = src + bytes - 4*8;
+    union {
+      __m64 m64;
+      uint64 u64;
+    } temp;
+    __m64 crc0;
+    __m64 crc1;
+    __m64 crc2;
+    __m64 crc3;
+    __m64 buf0 = MM64(src)[0];
+    __m64 buf1 = MM64(src)[1];
+    __m64 buf2 = MM64(src)[2];
+    __m64 buf3 = MM64(src)[3];
+
+    temp.u64 = crc;
+    crc0 = temp.m64;
+#if defined(__GNUC__) && !GCC_VERSION_AVAILABLE(4, 4)
+    // There is no way to suppress a warning in GCC;
+    // generate extra assignments.
+    temp.u64 = 0;
+    crc1 = temp.m64;
+    crc2 = temp.m64;
+    crc3 = temp.m64;
+#else
+    crc1 = _mm_xor_si64(crc1, crc1);
+    crc2 = _mm_xor_si64(crc2, crc2);
+    crc3 = _mm_xor_si64(crc3, crc3);
+#endif  // defined(__GNUC__) && !GCC_VERSION_AVAILABLE(4, 4)
+
+    do {
+      PREFETCH(src);
+      src += 4*8;
+
+      buf0 = _mm_xor_si64(buf0, crc0);
+      buf1 = _mm_xor_si64(buf1, crc1);
+      buf2 = _mm_xor_si64(buf2, crc2);
+      buf3 = _mm_xor_si64(buf3, crc3);
+
+      uint32 tmp0 = static_cast<uint32>(_mm_cvtsi64_si32(buf0));
+      uint32 tmp1 = static_cast<uint32>(_mm_cvtsi64_si32(buf1));
+      uint32 tmp2 = static_cast<uint32>(_mm_cvtsi64_si32(buf2));
+      uint32 tmp3 = static_cast<uint32>(_mm_cvtsi64_si32(buf3));
+
+      buf0 = _mm_srli_si64(buf0, 32);
+      buf1 = _mm_srli_si64(buf1, 32);
+      buf2 = _mm_srli_si64(buf2, 32);
+      buf3 = _mm_srli_si64(buf3, 32);
+
+      crc0 = MM64_TABLE(0)[TO_BYTE(tmp0)];
+      tmp0 >>= 8;
+      crc1 = MM64_TABLE(0)[TO_BYTE(tmp1)];
+      tmp1 >>= 8;
+      crc2 = MM64_TABLE(0)[TO_BYTE(tmp2)];
+      tmp2 >>= 8;
+      crc3 = MM64_TABLE(0)[TO_BYTE(tmp3)];
+      tmp3 >>= 8;
+
+#define XOR(byte) do { \
+      crc0 = _mm_xor_si64(crc0, MM64_TABLE(byte)[TO_BYTE(tmp0)]); \
+      tmp0 >>= 8; \
+      crc1 = _mm_xor_si64(crc1, MM64_TABLE(byte)[TO_BYTE(tmp1)]); \
+      tmp1 >>= 8; \
+      crc2 = _mm_xor_si64(crc2, MM64_TABLE(byte)[TO_BYTE(tmp2)]); \
+      tmp2 >>= 8; \
+      crc3 = _mm_xor_si64(crc3, MM64_TABLE(byte)[TO_BYTE(tmp3)]); \
+      tmp3 >>= 8; \
+} while (0)
+
+      XOR(1);
+      XOR(2);
+
+      crc0 = _mm_xor_si64(crc0, MM64_TABLE(3)[tmp0]);
+      tmp0 = static_cast<uint32>(_mm_cvtsi64_si32(buf0));
+      crc1 = _mm_xor_si64(crc1, MM64_TABLE(3)[tmp1]);
+      tmp1 = static_cast<uint32>(_mm_cvtsi64_si32(buf1));
+      crc2 = _mm_xor_si64(crc2, MM64_TABLE(3)[tmp2]);
+      tmp2 = static_cast<uint32>(_mm_cvtsi64_si32(buf2));
+      crc3 = _mm_xor_si64(crc3, MM64_TABLE(3)[tmp3]);
+      tmp3 = static_cast<uint32>(_mm_cvtsi64_si32(buf3));
+
+      XOR(4);
+      XOR(5);
+      XOR(6);
+
+#undef XOR
+
+      crc0 = _mm_xor_si64(crc0, MM64_TABLE(sizeof(uint64) - 1)[tmp0]);
+      buf0 = MM64(src)[0];
+      crc1 = _mm_xor_si64(crc1, MM64_TABLE(sizeof(uint64) - 1)[tmp1]);
+      buf1 = MM64(src)[1];
+      crc2 = _mm_xor_si64(crc2, MM64_TABLE(sizeof(uint64) - 1)[tmp2]);
+      buf2 = MM64(src)[2];
+      crc3 = _mm_xor_si64(crc3, MM64_TABLE(sizeof(uint64) - 1)[tmp3]);
+      buf3 = MM64(src)[3];
+    }
+    while (src < stop);
+
+    CRC_WORD_MMX(this, crc0, buf0);
+    buf1 = _mm_xor_si64(buf1, crc1);
+    CRC_WORD_MMX(this, crc0, buf1);
+    buf2 = _mm_xor_si64(buf2, crc2);
+    CRC_WORD_MMX(this, crc0, buf2);
+    buf3 = _mm_xor_si64(buf3, crc3);
+    CRC_WORD_MMX(this, crc0, buf3);
+
+    temp.m64 = crc0;
+    crc = temp.u64;
+
+    _mm_empty();
+
+    src += 4*8;
+  }
+
+  // Process sizeof(uint64) bytes at once.
+  bytes = static_cast<size_t>(end - src) & ~(sizeof(uint64) - 1);
+  if (bytes > 0) {
+    union {
+      __m64 m64;
+      uint64 u64;
+    } temp;
+    __m64 crc0;
+
+    temp.u64 = crc;
+    crc0 = temp.m64;
+
+    for (const uint8 *stop = src + bytes; src < stop; src += sizeof(uint64)) {
+      __m64 buf0 = MM64(src)[0];
+      CRC_WORD_MMX(this, crc0, buf0);
+    }
+
+    temp.m64 = crc0;
+    crc = temp.u64;
+
+    _mm_empty();
+  }
+
+  // Compute CRC of remaining bytes.
+  for (;src < end; ++src) {
+    CRC_BYTE(this, crc, *src);
+  }
+
+  return (crc ^ Base().Canonize());
+}
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif  // defined(_MSC_VER)
+
+}  // namespace crcutil
+
+#endif  // CRCUTIL_USE_ASM && HAVE_I386 && HAVE_MMX
diff --git a/contrib/libs/crcutil/platform.h b/contrib/libs/crcutil/platform.h
index 7a19ff2679..936cf7d331 100644
--- a/contrib/libs/crcutil/platform.h
+++ b/contrib/libs/crcutil/platform.h
@@ -1,245 +1,245 @@
-// Copyright 2010 Google Inc.  All rights reserved. 
-// 
-// Licensed under the Apache License, Version 2.0 (the "License"); 
-// you may not use this file except in compliance with the License. 
-// You may obtain a copy of the License at 
-// 
-//      http://www.apache.org/licenses/LICENSE-2.0 
-// 
-// Unless required by applicable law or agreed to in writing, software 
-// distributed under the License is distributed on an "AS IS" BASIS, 
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-// See the License for the specific language governing permissions and 
-// limitations under the License. 
- 
-// Detects configuration and defines compiler-specific macros. 
-// Also, sets user-defined CRUTIL_USE_* macros to default values. 
- 
-#ifndef CRCUTIL_PLATFORM_H_ 
-#define CRCUTIL_PLATFORM_H_ 
- 
-// Permanently disable some annoying warnings generated 
-// by Microsoft CL when compiling Microsoft's headers. 
-#include "std_headers.h" 
- 
-// Use inline asm version of the code? 
-#if !defined(CRCUTIL_USE_ASM) 
-#define CRCUTIL_USE_ASM 1 
-#endif  // !defined(CRCUTIL_USE_ASM) 
- 
- 
-#if !defined(HAVE_I386) 
-#if defined(__i386__) || defined(_M_IX86) 
-#define HAVE_I386 1 
-#else 
-#define HAVE_I386 0 
-#endif  // defined(__i386__) || defined(_M_IX86) 
-#endif  // defined(HAVE_I386) 
- 
- 
-#if !defined(HAVE_AMD64) 
-#if defined(__amd64__) || defined(_M_AMD64) 
-#define HAVE_AMD64 1 
-#else 
-#define HAVE_AMD64 0 
-#endif  // defined(__amd64__) || defined(_M_AMD64) 
-#endif  // defined(HAVE_AMD64) 
- 
- 
-#if HAVE_AMD64 || HAVE_I386 
-#if defined(_MSC_VER) 
-#pragma warning(push) 
-// '_M_IX86' is not defined as a preprocessor macro 
-#pragma warning(disable: 4668) 
-#include <intrin.h> 
-#pragma warning(pop) 
-#endif  // defined(_MSC_VER) 
- 
- 
-#if !defined(HAVE_MMX) 
-#if defined(_MSC_VER) || (defined(__GNUC__) && defined(__MMX__)) 
-#define HAVE_MMX 1 
-#else 
-#define HAVE_MMX 0 
-#endif  // defined(_MSC_VER) || (defined(__GNUC__) && defined(__MMX__)) 
-#endif  // !defined(HAVE_MMX) 
- 
- 
-#if !defined(HAVE_SSE) 
-#if defined(_MSC_VER) || (defined(__GNUC__) && defined(__SSE__)) 
-#include <xmmintrin.h> 
-#define HAVE_SSE 1 
-#else 
-#define HAVE_SSE 0 
-#endif  // defined(_MSC_VER) || (defined(__GNUC__) && defined(__SSE__)) 
-#endif  // !defined(HAVE_SSE) 
- 
- 
-#if !defined(HAVE_SSE2) 
-#if defined(_MSC_VER) || (defined(__GNUC__) && defined(__SSE2__)) 
-#include <emmintrin.h> 
-#define HAVE_SSE2 1 
-#else 
-#define HAVE_SSE2 0 
-#endif  // defined(_MSC_VER) || (defined(__GNUC__) && defined(__SSE2__)) 
-#endif  // !defined(HAVE_SSE2) 
- 
-#else 
- 
-#if !defined(HAVE_MMX) 
-#define HAVE_MMX 0 
-#endif  // !defined(HAVE_MMX) 
- 
-#if !defined(HAVE_SSE) 
-#define HAVE_SSE 0 
-#endif  // !defined(HAVE_SSE) 
- 
-#if !defined(HAVE_SSE2) 
-#define HAVE_SSE2 0 
-#endif  // !defined(HAVE_SSE2) 
- 
-#endif  // HAVE_AMD64 || HAVE_I386 
- 
-// Error checking 
-#if HAVE_SSE && !HAVE_MMX 
-#error SSE is available but not MMX? 
-#endif  // HAVE_SSE && !HAVE_MMX 
- 
-#if HAVE_SSE2 && (!HAVE_SSE || !HAVE_MMX) 
-#error SSE2 is available but not SSE or MMX? 
-#endif  // HAVE_SSE2 && (!HAVE_SSE || !HAVE_MMX) 
- 
- 
-#if !defined(CRCUTIL_PREFETCH_WIDTH) 
-// On newer X5550 CPU, heavily optimized CrcMultiword is 3% faster without 
-// prefetch for inputs smaller than 8MB and less than 1% slower for 8MB and 
-// larger blocks. On older Q9650 CPU, the code is 2-3% faster for inputs 
-// smaller than 8MB, 4-5% slower when length >= 8MB. 
-// Tested with prefetch length 256, 512, and 4096. 
-// 
-// At this moment there is no compelling reason to use prefetching. 
-// 
-#define CRCUTIL_PREFETCH_WIDTH 0 
-#endif  // !defined(CRCUTIL_PREFETCH_WIDTH) 
- 
- 
-#if HAVE_SSE && CRCUTIL_PREFETCH_WIDTH > 0 
-#define PREFETCH(src) \ 
-  _mm_prefetch(reinterpret_cast<const char *>(src) + CRCUTIL_PREFETCH_WIDTH, \ 
-               _MM_HINT_T0) 
-#else 
-#define PREFETCH(src) 
-#endif  // HAVE_SSE && CRCUTIL_PREFETCH_WIDTH > 0 
- 
- 
-// If block size exceeds CRCUTIL_MIN_ALIGN_SIZE, align the data 
-// before accessing it at word boundary. See generic_crc.cc, 
-// ALIGN_ON_WORD_BOUNDARY_IF_NEEDED() macro. 
-#if !defined(CRCUTIL_MIN_ALIGN_SIZE) 
-#if HAVE_AMD64 || HAVE_I386 
-#define CRCUTIL_MIN_ALIGN_SIZE (1024) 
-#else 
-#define CRCUTIL_MIN_ALIGN_SIZE 0 
-#endif  // HAVE_AMD64 || HAVE_I386 
-#endif  // !defined(CRCUTIL_MIN_ALIGN_SIZE) 
- 
- 
-// Use _mm_crc32_u64/32/8 intrinics? 
-// If not, they will be implemented in software. 
-#if !HAVE_I386 && !HAVE_AMD64 
- 
-#undef CRCUTIL_USE_MM_CRC32 
-#define CRCUTIL_USE_MM_CRC32 0 
- 
-#else 
- 
-#if !defined(CRCUTIL_USE_MM_CRC32) 
-#if defined(_MSC_VER) || defined(__GNUC__) 
-#define CRCUTIL_USE_MM_CRC32 1 
-#else 
-#define CRCUTIL_USE_MM_CRC32 0 
-#endif  // defined(_MSC_VER) || defined(__GNUC__) 
-#endif  // !defined(CRCUTIL_USE_MM_CRC32) 
- 
-#endif  // !HAVE_I386 && !HAVE_AMD64 
- 
- 
-// Stringize -- always handy. 
-#define TO_STRING_VALUE(arg) #arg 
-#define TO_STRING(arg) TO_STRING_VALUE(arg) 
- 
- 
-// Compilers give "right shift count >= width of type" warning even 
-// though the shift happens only under appropriate "if". 
-#define SHIFT_RIGHT_NO_WARNING(value, bits) \ 
-  ((value) >> (((bits) < (8 * sizeof(value))) ? (bits) : 0)) 
-#define SHIFT_RIGHT_SAFE(value, bits) \ 
-  ((bits) < (8 * sizeof(value)) ? SHIFT_RIGHT_NO_WARNING(value, bits) : 0) 
- 
-// The same for left shifts. 
-#define SHIFT_LEFT_NO_WARNING(value, bits) \ 
-  ((value) << (((bits) < (8 * sizeof(value))) ? (bits) : 0)) 
-#define SHIFT_LEFT_SAFE(value, bits) \ 
-  ((bits) < (8 * sizeof(value)) ? SHIFT_LEFT_NO_WARNING(value, bits) : 0) 
- 
-// GCC-specific macros. 
-// 
-#define GCC_VERSION_AVAILABLE(major, minor) \ 
-    (defined(__GNUC__) && \ 
-        (__GNUC__ > (major) || \ 
-            (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))) 
- 
- 
-#if defined(__GNUC__) 
- 
-// The GenericCrc tables must be properly aligned. 
-// Penalty for misalignment? 50% performance degradation. 
-// For 128-bit SSE2, the penalty is access violation. 
-#define GCC_ALIGN_ATTRIBUTE(n) __attribute__((aligned(n))) 
- 
-#if GCC_VERSION_AVAILABLE(4, 4) 
-// If not marked as "omit frame pointer", 
-// GCC won't be able to find enough registers. 
-#define GCC_OMIT_FRAME_POINTER \ 
-    __attribute__((__optimize__(2, "omit-frame-pointer"))) 
-#endif  // GCC_VERSION_AVAILABLE(4, 4) 
- 
-#if !defined(__forceinline) 
-#define __forceinline __attribute__((__always_inline__)) inline 
-#endif  // !defined(__forceinline) 
- 
-#if defined(__APPLE_CC__) 
-// The version of GCC used by Max OS X xCode v 5664 does not understand 
-// "movq xmm, r64" instruction and requires the use of "movd" (probably 
-// because of the bug in GCC which treats "movq/movd xmm,r64 or r64,xmm" 
-// the same). 
-// 
-// Leaving common sense aside, let's peek into Intel's instruction 
-// reference manual. That's what description of MOVD command says: 
-// MOVD xmm, r/m32 (opcode 66 0F 6E /r) 
-// MOVD r/m32, xmm (opcode 66 0F 7E /r) 
-// MOVQ xmm, r/m64 (opcode 66 REX.W 0F 6E /r) 
-// MOVQ r/m64, xmm (opcode 66 REX.W 0F 7E /r) 
-#define SSE2_MOVQ "movd" 
-#else 
-#define SSE2_MOVQ "movq" 
-#endif  // defined(__APPLE_CC__) 
- 
-#endif  // defined(__GNUC__) 
- 
- 
-// Define compiler-specific macros that were not set yet. 
-#if !defined(_MSC_VER) && !defined(__forceinline) 
-#define __forceinline inline 
-#endif  // !defined(_MSC_VER) && !defined(__forceinline) 
- 
-#if !defined(GCC_OMIT_FRAME_POINTER) 
-#define GCC_OMIT_FRAME_POINTER 
-#endif  // !defined(GCC_OMIT_FRAME_POINTER) 
- 
-#if !defined(GCC_ALIGN_ATTRIBUTE) 
-#define GCC_ALIGN_ATTRIBUTE(n) 
-#endif  // !defined(GCC_ALIGN_ATTRIBUTE) 
- 
- 
-#endif  // CRCUTIL_PLATFORM_H_ 
+// Copyright 2010 Google Inc.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Detects configuration and defines compiler-specific macros.
+// Also, sets user-defined CRUTIL_USE_* macros to default values.
+
+#ifndef CRCUTIL_PLATFORM_H_
+#define CRCUTIL_PLATFORM_H_
+
+// Permanently disable some annoying warnings generated
+// by Microsoft CL when compiling Microsoft's headers.
+#include "std_headers.h"
+
+// Use inline asm version of the code?
+#if !defined(CRCUTIL_USE_ASM)
+#define CRCUTIL_USE_ASM 1
+#endif  // !defined(CRCUTIL_USE_ASM)
+
+
+#if !defined(HAVE_I386)
+#if defined(__i386__) || defined(_M_IX86)
+#define HAVE_I386 1
+#else
+#define HAVE_I386 0
+#endif  // defined(__i386__) || defined(_M_IX86)
+#endif  // defined(HAVE_I386)
+
+
+#if !defined(HAVE_AMD64)
+#if defined(__amd64__) || defined(_M_AMD64)
+#define HAVE_AMD64 1
+#else
+#define HAVE_AMD64 0
+#endif  // defined(__amd64__) || defined(_M_AMD64)
+#endif  // defined(HAVE_AMD64)
+
+
+#if HAVE_AMD64 || HAVE_I386
+#if defined(_MSC_VER)
+#pragma warning(push)
+// '_M_IX86' is not defined as a preprocessor macro
+#pragma warning(disable: 4668)
+#include <intrin.h>
+#pragma warning(pop)
+#endif  // defined(_MSC_VER)
+
+
+#if !defined(HAVE_MMX)
+#if defined(_MSC_VER) || (defined(__GNUC__) && defined(__MMX__))
+#define HAVE_MMX 1
+#else
+#define HAVE_MMX 0
+#endif  // defined(_MSC_VER) || (defined(__GNUC__) && defined(__MMX__))
+#endif  // !defined(HAVE_MMX)
+
+
+#if !defined(HAVE_SSE)
+#if defined(_MSC_VER) || (defined(__GNUC__) && defined(__SSE__))
+#include <xmmintrin.h>
+#define HAVE_SSE 1
+#else
+#define HAVE_SSE 0
+#endif  // defined(_MSC_VER) || (defined(__GNUC__) && defined(__SSE__))
+#endif  // !defined(HAVE_SSE)
+
+
+#if !defined(HAVE_SSE2)
+#if defined(_MSC_VER) || (defined(__GNUC__) && defined(__SSE2__))
+#include <emmintrin.h>
+#define HAVE_SSE2 1
+#else
+#define HAVE_SSE2 0
+#endif  // defined(_MSC_VER) || (defined(__GNUC__) && defined(__SSE2__))
+#endif  // !defined(HAVE_SSE2)
+
+#else
+
+#if !defined(HAVE_MMX)
+#define HAVE_MMX 0
+#endif  // !defined(HAVE_MMX)
+
+#if !defined(HAVE_SSE)
+#define HAVE_SSE 0
+#endif  // !defined(HAVE_SSE)
+
+#if !defined(HAVE_SSE2)
+#define HAVE_SSE2 0
+#endif  // !defined(HAVE_SSE2)
+
+#endif  // HAVE_AMD64 || HAVE_I386
+
+// Error checking
+#if HAVE_SSE && !HAVE_MMX
+#error SSE is available but not MMX?
+#endif  // HAVE_SSE && !HAVE_MMX
+
+#if HAVE_SSE2 && (!HAVE_SSE || !HAVE_MMX)
+#error SSE2 is available but not SSE or MMX?
+#endif  // HAVE_SSE2 && (!HAVE_SSE || !HAVE_MMX)
+
+
+#if !defined(CRCUTIL_PREFETCH_WIDTH)
+// On newer X5550 CPU, heavily optimized CrcMultiword is 3% faster without
+// prefetch for inputs smaller than 8MB and less than 1% slower for 8MB and
+// larger blocks. On older Q9650 CPU, the code is 2-3% faster for inputs
+// smaller than 8MB, 4-5% slower when length >= 8MB.
+// Tested with prefetch length 256, 512, and 4096.
+//
+// At this moment there is no compelling reason to use prefetching.
+//
+#define CRCUTIL_PREFETCH_WIDTH 0
+#endif  // !defined(CRCUTIL_PREFETCH_WIDTH)
+
+
+#if HAVE_SSE && CRCUTIL_PREFETCH_WIDTH > 0
+#define PREFETCH(src) \
+  _mm_prefetch(reinterpret_cast<const char *>(src) + CRCUTIL_PREFETCH_WIDTH, \
+               _MM_HINT_T0)
+#else
+#define PREFETCH(src)
+#endif  // HAVE_SSE && CRCUTIL_PREFETCH_WIDTH > 0
+
+
+// If block size exceeds CRCUTIL_MIN_ALIGN_SIZE, align the data
+// before accessing it at word boundary. See generic_crc.cc,
+// ALIGN_ON_WORD_BOUNDARY_IF_NEEDED() macro.
+#if !defined(CRCUTIL_MIN_ALIGN_SIZE)
+#if HAVE_AMD64 || HAVE_I386
+#define CRCUTIL_MIN_ALIGN_SIZE (1024)
+#else
+#define CRCUTIL_MIN_ALIGN_SIZE 0
+#endif  // HAVE_AMD64 || HAVE_I386
+#endif  // !defined(CRCUTIL_MIN_ALIGN_SIZE)
+
+
+// Use _mm_crc32_u64/32/8 intrinics?
+// If not, they will be implemented in software.
+#if !HAVE_I386 && !HAVE_AMD64
+
+#undef CRCUTIL_USE_MM_CRC32
+#define CRCUTIL_USE_MM_CRC32 0
+
+#else
+
+#if !defined(CRCUTIL_USE_MM_CRC32)
+#if defined(_MSC_VER) || defined(__GNUC__)
+#define CRCUTIL_USE_MM_CRC32 1
+#else
+#define CRCUTIL_USE_MM_CRC32 0
+#endif  // defined(_MSC_VER) || defined(__GNUC__)
+#endif  // !defined(CRCUTIL_USE_MM_CRC32)
+
+#endif  // !HAVE_I386 && !HAVE_AMD64
+
+
+// Stringize -- always handy.
+#define TO_STRING_VALUE(arg) #arg
+#define TO_STRING(arg) TO_STRING_VALUE(arg)
+
+
+// Compilers give "right shift count >= width of type" warning even
+// though the shift happens only under appropriate "if".
+#define SHIFT_RIGHT_NO_WARNING(value, bits) \
+  ((value) >> (((bits) < (8 * sizeof(value))) ? (bits) : 0))
+#define SHIFT_RIGHT_SAFE(value, bits) \
+  ((bits) < (8 * sizeof(value)) ? SHIFT_RIGHT_NO_WARNING(value, bits) : 0)
+
+// The same for left shifts.
+#define SHIFT_LEFT_NO_WARNING(value, bits) \
+  ((value) << (((bits) < (8 * sizeof(value))) ? (bits) : 0))
+#define SHIFT_LEFT_SAFE(value, bits) \
+  ((bits) < (8 * sizeof(value)) ? SHIFT_LEFT_NO_WARNING(value, bits) : 0)
+
+// GCC-specific macros.
+//
+#define GCC_VERSION_AVAILABLE(major, minor) \
+    (defined(__GNUC__) && \
+        (__GNUC__ > (major) || \
+            (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor))))
+
+
+#if defined(__GNUC__)
+
+// The GenericCrc tables must be properly aligned.
+// Penalty for misalignment? 50% performance degradation.
+// For 128-bit SSE2, the penalty is access violation.
+#define GCC_ALIGN_ATTRIBUTE(n) __attribute__((aligned(n)))
+
+#if GCC_VERSION_AVAILABLE(4, 4)
+// If not marked as "omit frame pointer",
+// GCC won't be able to find enough registers.
+#define GCC_OMIT_FRAME_POINTER \
+    __attribute__((__optimize__(2, "omit-frame-pointer")))
+#endif  // GCC_VERSION_AVAILABLE(4, 4)
+
+#if !defined(__forceinline)
+#define __forceinline __attribute__((__always_inline__)) inline
+#endif  // !defined(__forceinline)
+
+#if defined(__APPLE_CC__)
+// The version of GCC used by Max OS X xCode v 5664 does not understand
+// "movq xmm, r64" instruction and requires the use of "movd" (probably
+// because of the bug in GCC which treats "movq/movd xmm,r64 or r64,xmm"
+// the same).
+//
+// Leaving common sense aside, let's peek into Intel's instruction
+// reference manual. That's what description of MOVD command says:
+// MOVD xmm, r/m32 (opcode 66 0F 6E /r)
+// MOVD r/m32, xmm (opcode 66 0F 7E /r)
+// MOVQ xmm, r/m64 (opcode 66 REX.W 0F 6E /r)
+// MOVQ r/m64, xmm (opcode 66 REX.W 0F 7E /r)
+#define SSE2_MOVQ "movd"
+#else
+#define SSE2_MOVQ "movq"
+#endif  // defined(__APPLE_CC__)
+
+#endif  // defined(__GNUC__)
+
+
+// Define compiler-specific macros that were not set yet.
+#if !defined(_MSC_VER) && !defined(__forceinline)
+#define __forceinline inline
+#endif  // !defined(_MSC_VER) && !defined(__forceinline)
+
+#if !defined(GCC_OMIT_FRAME_POINTER)
+#define GCC_OMIT_FRAME_POINTER
+#endif  // !defined(GCC_OMIT_FRAME_POINTER)
+
+#if !defined(GCC_ALIGN_ATTRIBUTE)
+#define GCC_ALIGN_ATTRIBUTE(n)
+#endif  // !defined(GCC_ALIGN_ATTRIBUTE)
+
+
+#endif  // CRCUTIL_PLATFORM_H_
diff --git a/contrib/libs/crcutil/protected_crc.h b/contrib/libs/crcutil/protected_crc.h
index 81a7051bc8..762fceda9b 100644
--- a/contrib/libs/crcutil/protected_crc.h
+++ b/contrib/libs/crcutil/protected_crc.h
@@ -1,61 +1,61 @@
-// Copyright 2010 Google Inc.  All rights reserved. 
-// 
-// Licensed under the Apache License, Version 2.0 (the "License"); 
-// you may not use this file except in compliance with the License. 
-// You may obtain a copy of the License at 
-// 
-//      http://www.apache.org/licenses/LICENSE-2.0 
-// 
-// Unless required by applicable law or agreed to in writing, software 
-// distributed under the License is distributed on an "AS IS" BASIS, 
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-// See the License for the specific language governing permissions and 
-// limitations under the License. 
- 
-// Protects CRC tables with its own CRC. 
-// CRC tables get corrupted too, and if corruption is 
-// not caught, data poisoning becomes a reality. 
- 
-#ifndef CRCUTIL_PROTECTED_CRC_H_ 
-#define CRCUTIL_PROTECTED_CRC_H_ 
- 
-namespace crcutil { 
- 
-#pragma pack(push, 16) 
- 
-// Class CrcImplementation should not have virtual functions: 
-// vptr is stored as the very first field, vptr value is defined 
-// at runtime, so it is impossible to CRC(*this) once and 
-// guarantee that this value will not change from run to run. 
-// 
-template<typename CrcImplementation> class ProtectedCrc 
-    : public CrcImplementation { 
- public: 
-  typedef typename CrcImplementation::Crc Crc; 
- 
-  // Returns check value that the caller should compare 
-  // against pre-computed, trusted constant. 
-  // 
-  // Computing SelfCheckValue() after CRC initialization, 
-  // storing it in memory, and periodically checking against 
-  // stored value may not work: if CRC tables were initialized 
-  // incorrectly and/or had been corrupted during initialization, 
-  // CheckValue() will return garbage. Garbage in, garbage out. 
-  // Consequitive checks will not detect a problem, the application 
-  // will happily produce and save the data with corrupt CRC. 
-  // 
-  // The application should call SelfCheckValue() regularly: 
-  // 1. First and foremost, on every CRC mismatch. 
-  // 2. After CRC'ing the  data but before sending it out or writing it. 
-  // 3. Worst case, every Nth CRC'ed byte or every Nth call to CRC. 
-  // 
-  Crc SelfCheckValue() const { 
-    return CrcDefault(this, sizeof(*this), 0); 
-  } 
-} GCC_ALIGN_ATTRIBUTE(16); 
- 
-#pragma pack(pop) 
- 
-}  // namespace crcutil 
- 
-#endif  // CRCUTIL_PROTECTED_CRC_H_ 
+// Copyright 2010 Google Inc.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Protects CRC tables with its own CRC.
+// CRC tables get corrupted too, and if corruption is
+// not caught, data poisoning becomes a reality.
+
+#ifndef CRCUTIL_PROTECTED_CRC_H_
+#define CRCUTIL_PROTECTED_CRC_H_
+
+namespace crcutil {
+
+#pragma pack(push, 16)
+
+// Class CrcImplementation should not have virtual functions:
+// vptr is stored as the very first field, vptr value is defined
+// at runtime, so it is impossible to CRC(*this) once and
+// guarantee that this value will not change from run to run.
+//
+template<typename CrcImplementation> class ProtectedCrc
+    : public CrcImplementation {
+ public:
+  typedef typename CrcImplementation::Crc Crc;
+
+  // Returns check value that the caller should compare
+  // against pre-computed, trusted constant.
+  //
+  // Computing SelfCheckValue() after CRC initialization,
+  // storing it in memory, and periodically checking against
+  // stored value may not work: if CRC tables were initialized
+  // incorrectly and/or had been corrupted during initialization,
+  // CheckValue() will return garbage. Garbage in, garbage out.
+  // Consequitive checks will not detect a problem, the application
+  // will happily produce and save the data with corrupt CRC.
+  //
+  // The application should call SelfCheckValue() regularly:
+  // 1. First and foremost, on every CRC mismatch.
+  // 2. After CRC'ing the  data but before sending it out or writing it.
+  // 3. Worst case, every Nth CRC'ed byte or every Nth call to CRC.
+  //
+  Crc SelfCheckValue() const {
+    return CrcDefault(this, sizeof(*this), 0);
+  }
+} GCC_ALIGN_ATTRIBUTE(16);
+
+#pragma pack(pop)
+
+}  // namespace crcutil
+
+#endif  // CRCUTIL_PROTECTED_CRC_H_
diff --git a/contrib/libs/crcutil/rdtsc.h b/contrib/libs/crcutil/rdtsc.h
index ead586f842..57aea1f1fb 100644
--- a/contrib/libs/crcutil/rdtsc.h
+++ b/contrib/libs/crcutil/rdtsc.h
@@ -1,59 +1,59 @@
-// Copyright 2010 Google Inc.  All rights reserved. 
-// 
-// Licensed under the Apache License, Version 2.0 (the "License"); 
-// you may not use this file except in compliance with the License. 
-// You may obtain a copy of the License at 
-// 
-//      http://www.apache.org/licenses/LICENSE-2.0 
-// 
-// Unless required by applicable law or agreed to in writing, software 
-// distributed under the License is distributed on an "AS IS" BASIS, 
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-// See the License for the specific language governing permissions and 
-// limitations under the License. 
- 
-// Reads CPU cycle counter on AMD64 and I386 (for performance measurements). 
-// Thanks to __rdtsc() intrinsic, it's easy with Microsoft and Intel 
-// compilers, but real pain with GCC. 
- 
-#ifndef CRCUTIL_RDTSC_H_ 
-#define CRCUTIL_RDTSC_H_ 
- 
-#include "platform.h" 
- 
-namespace crcutil { 
- 
-struct Rdtsc { 
-  static inline uint64 Get() { 
-#if defined(_MSC_VER) && (HAVE_AMD64 || HAVE_I386) 
-    return __rdtsc(); 
-#elif defined(__GNUC__) && HAVE_AMD64 
-    int64 result; 
-    __asm__ volatile( 
-        "rdtsc\n" 
-        : "=a" (result)); 
-    return result; 
-#elif defined(__GNUC__) && HAVE_I386 
-    // If "low" and "high" are defined as "uint64" to 
-    // avoid explicit cast to uint64, GCC 4.5.0 in "-m32" mode 
-    // fails with "impossible register constraint" error 
-    // (no, it is not because one cannot use 64-bit value as argument 
-    // for 32-bit register, but because its register allocator 
-    // could not resolve a conflict under high register pressure). 
-    uint32 low; 
-    uint32 high; 
-    __asm__ volatile( 
-        "rdtsc\n" 
-        : "=a" (low), "=d" (high)); 
-    return ((static_cast<uint64>(high) << 32) | low); 
-#else 
-    // It is hard to find low overhead timer with 
-    // sub-millisecond resolution and granularity. 
-    return 0; 
-#endif 
-  } 
-}; 
- 
-}  // namespace crcutil 
- 
-#endif  // CRCUTIL_RDTSC_H_ 
+// Copyright 2010 Google Inc.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Reads CPU cycle counter on AMD64 and I386 (for performance measurements).
+// Thanks to __rdtsc() intrinsic, it's easy with Microsoft and Intel
+// compilers, but real pain with GCC.
+
+#ifndef CRCUTIL_RDTSC_H_
+#define CRCUTIL_RDTSC_H_
+
+#include "platform.h"
+
+namespace crcutil {
+
+struct Rdtsc {
+  static inline uint64 Get() {
+#if defined(_MSC_VER) && (HAVE_AMD64 || HAVE_I386)
+    return __rdtsc();
+#elif defined(__GNUC__) && HAVE_AMD64
+    int64 result;
+    __asm__ volatile(
+        "rdtsc\n"
+        : "=a" (result));
+    return result;
+#elif defined(__GNUC__) && HAVE_I386
+    // If "low" and "high" are defined as "uint64" to
+    // avoid explicit cast to uint64, GCC 4.5.0 in "-m32" mode
+    // fails with "impossible register constraint" error
+    // (no, it is not because one cannot use 64-bit value as argument
+    // for 32-bit register, but because its register allocator
+    // could not resolve a conflict under high register pressure).
+    uint32 low;
+    uint32 high;
+    __asm__ volatile(
+        "rdtsc\n"
+        : "=a" (low), "=d" (high));
+    return ((static_cast<uint64>(high) << 32) | low);
+#else
+    // It is hard to find low overhead timer with
+    // sub-millisecond resolution and granularity.
+    return 0;
+#endif
+  }
+};
+
+}  // namespace crcutil
+
+#endif  // CRCUTIL_RDTSC_H_
diff --git a/contrib/libs/crcutil/rolling_crc.h b/contrib/libs/crcutil/rolling_crc.h
index 0de69d2bd8..ad4a947e49 100644
--- a/contrib/libs/crcutil/rolling_crc.h
+++ b/contrib/libs/crcutil/rolling_crc.h
@@ -1,106 +1,106 @@
-// Copyright 2010 Google Inc.  All rights reserved. 
-// 
-// Licensed under the Apache License, Version 2.0 (the "License"); 
-// you may not use this file except in compliance with the License. 
-// You may obtain a copy of the License at 
-// 
-//      http://www.apache.org/licenses/LICENSE-2.0 
-// 
-// Unless required by applicable law or agreed to in writing, software 
-// distributed under the License is distributed on an "AS IS" BASIS, 
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-// See the License for the specific language governing permissions and 
-// limitations under the License. 
- 
-// Implements rolling CRC (e.g. for Rabin fingerprinting). 
- 
-#ifndef CRCUTIL_ROLLING_CRC_H_ 
-#define CRCUTIL_ROLLING_CRC_H_ 
- 
-#include "base_types.h"   // size_t, uint8 
-#include "crc_casts.h"    // TO_BYTE 
- 
-namespace crcutil { 
- 
-#pragma pack(push, 16) 
- 
-// CrcImplementation should provide: 
-// - typename Crc 
-// - typename TableEntry 
-// - typename Word 
-// - Crc CrcDefault(const void *data, size_t bytes, const Crc &start) 
-// - const GfUtil<Crc> &Base() const 
-template<typename CrcImplementation> class RollingCrc { 
- public: 
-  typedef typename CrcImplementation::Crc Crc; 
-  typedef typename CrcImplementation::TableEntry TableEntry; 
-  typedef typename CrcImplementation::Word Word; 
- 
-  RollingCrc() {} 
- 
-  // Initializes internal data structures. 
-  // Retains reference to "crc" instance -- it is used by Start(). 
-  RollingCrc(const CrcImplementation &crc, 
-             size_t roll_window_bytes, 
-             const Crc &start_value) { 
-    Init(crc, roll_window_bytes, start_value); 
-  } 
- 
-  // Computes crc of "roll_window_bytes" using 
-  // "start_value" of "crc" (see Init()). 
-  Crc Start(const void *data) const { 
-    return crc_->CrcDefault(data, roll_window_bytes_, start_value_); 
-  } 
- 
-  // Computes CRC of "roll_window_bytes" starting in next position. 
-  Crc Roll(const Crc &old_crc, size_t byte_out, size_t byte_in) const { 
-    return (old_crc >> 8) ^ in_[TO_BYTE(old_crc) ^ byte_in] ^ out_[byte_out]; 
-  } 
- 
-  // Initializes internal data structures. 
-  // Retains reference to "crc" instance -- it is used by Start(). 
-  void Init(const CrcImplementation &crc, 
-            size_t roll_window_bytes, 
-            const Crc &start_value) { 
-    crc_ = &crc; 
-    roll_window_bytes_ = roll_window_bytes; 
-    start_value_ = start_value; 
- 
-    Crc add = crc.Base().Canonize() ^ start_value; 
-    add = crc.Base().Multiply(add, crc.Base().Xpow8N(roll_window_bytes)); 
-    add ^= crc.Base().Canonize(); 
-    Crc mul = crc.Base().One() ^ crc.Base().Xpow8N(1); 
-    add = crc.Base().Multiply(add, mul); 
- 
-    mul = crc.Base().XpowN(8 * roll_window_bytes + crc.Base().Degree()); 
-    for (size_t i = 0; i < 256; ++i) { 
-      out_[i] = static_cast<TableEntry>( 
-                    crc.Base().MultiplyUnnormalized( 
-                        static_cast<Crc>(i), 8, mul) ^ add); 
-    } 
-    for (size_t i = 0; i < 256; ++i) { 
-      in_[i] = crc.crc_word_[sizeof(Word) - 1][i]; 
-    } 
-  } 
- 
-  // Returns start value. 
-  Crc StartValue() const { return start_value_; } 
- 
-  // Returns length of roll window. 
-  size_t WindowBytes() const { return roll_window_bytes_; } 
- 
- protected: 
-  TableEntry in_[256]; 
-  TableEntry out_[256]; 
- 
-  // Used only by Start(). 
-  Crc start_value_; 
-  const CrcImplementation *crc_; 
-  size_t roll_window_bytes_; 
-} GCC_ALIGN_ATTRIBUTE(16); 
- 
-#pragma pack(pop) 
- 
-}  // namespace crcutil 
- 
-#endif  // CRCUTIL_ROLLING_CRC_H_ 
+// Copyright 2010 Google Inc.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Implements rolling CRC (e.g. for Rabin fingerprinting).
+
+#ifndef CRCUTIL_ROLLING_CRC_H_
+#define CRCUTIL_ROLLING_CRC_H_
+
+#include "base_types.h"   // size_t, uint8
+#include "crc_casts.h"    // TO_BYTE
+
+namespace crcutil {
+
+#pragma pack(push, 16)
+
+// CrcImplementation should provide:
+// - typename Crc
+// - typename TableEntry
+// - typename Word
+// - Crc CrcDefault(const void *data, size_t bytes, const Crc &start)
+// - const GfUtil<Crc> &Base() const
+template<typename CrcImplementation> class RollingCrc {
+ public:
+  typedef typename CrcImplementation::Crc Crc;
+  typedef typename CrcImplementation::TableEntry TableEntry;
+  typedef typename CrcImplementation::Word Word;
+
+  RollingCrc() {}
+
+  // Initializes internal data structures.
+  // Retains reference to "crc" instance -- it is used by Start().
+  RollingCrc(const CrcImplementation &crc,
+             size_t roll_window_bytes,
+             const Crc &start_value) {
+    Init(crc, roll_window_bytes, start_value);
+  }
+
+  // Computes crc of "roll_window_bytes" using
+  // "start_value" of "crc" (see Init()).
+  Crc Start(const void *data) const {
+    return crc_->CrcDefault(data, roll_window_bytes_, start_value_);
+  }
+
+  // Computes CRC of "roll_window_bytes" starting in next position.
+  Crc Roll(const Crc &old_crc, size_t byte_out, size_t byte_in) const {
+    return (old_crc >> 8) ^ in_[TO_BYTE(old_crc) ^ byte_in] ^ out_[byte_out];
+  }
+
+  // Initializes internal data structures.
+  // Retains reference to "crc" instance -- it is used by Start().
+  void Init(const CrcImplementation &crc,
+            size_t roll_window_bytes,
+            const Crc &start_value) {
+    crc_ = &crc;
+    roll_window_bytes_ = roll_window_bytes;
+    start_value_ = start_value;
+
+    Crc add = crc.Base().Canonize() ^ start_value;
+    add = crc.Base().Multiply(add, crc.Base().Xpow8N(roll_window_bytes));
+    add ^= crc.Base().Canonize();
+    Crc mul = crc.Base().One() ^ crc.Base().Xpow8N(1);
+    add = crc.Base().Multiply(add, mul);
+
+    mul = crc.Base().XpowN(8 * roll_window_bytes + crc.Base().Degree());
+    for (size_t i = 0; i < 256; ++i) {
+      out_[i] = static_cast<TableEntry>(
+                    crc.Base().MultiplyUnnormalized(
+                        static_cast<Crc>(i), 8, mul) ^ add);
+    }
+    for (size_t i = 0; i < 256; ++i) {
+      in_[i] = crc.crc_word_[sizeof(Word) - 1][i];
+    }
+  }
+
+  // Returns start value.
+  Crc StartValue() const { return start_value_; }
+
+  // Returns length of roll window.
+  size_t WindowBytes() const { return roll_window_bytes_; }
+
+ protected:
+  TableEntry in_[256];
+  TableEntry out_[256];
+
+  // Used only by Start().
+  Crc start_value_;
+  const CrcImplementation *crc_;
+  size_t roll_window_bytes_;
+} GCC_ALIGN_ATTRIBUTE(16);
+
+#pragma pack(pop)
+
+}  // namespace crcutil
+
+#endif  // CRCUTIL_ROLLING_CRC_H_
diff --git a/contrib/libs/crcutil/std_headers.h b/contrib/libs/crcutil/std_headers.h
index 55746fb8be..0d7e4ecb56 100644
--- a/contrib/libs/crcutil/std_headers.h
+++ b/contrib/libs/crcutil/std_headers.h
@@ -1,53 +1,53 @@
-// Copyright 2010 Google Inc.  All rights reserved. 
-// 
-// Licensed under the Apache License, Version 2.0 (the "License"); 
-// you may not use this file except in compliance with the License. 
-// You may obtain a copy of the License at 
-// 
-//      http://www.apache.org/licenses/LICENSE-2.0 
-// 
-// Unless required by applicable law or agreed to in writing, software 
-// distributed under the License is distributed on an "AS IS" BASIS, 
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-// See the License for the specific language governing permissions and 
-// limitations under the License. 
- 
-// Includes some standard C headers for size_t, memset, etc. 
-// 
-// Also, permanently disables a number of warnings produced 
-// by Microsoft's compiler when it includes standard headers 
-// (surprisingly, also by Microsoft). 
- 
-#ifndef CRCUTIL_STD_HEADERS_H_ 
-#define CRCUTIL_STD_HEADERS_H_ 
- 
-#if defined(_MSC_VER) 
-// '4' bytes padding added after data member ... 
-#pragma warning(disable:4820) 
- 
-// unreferenced inline function has been removed ... 
-#pragma warning(disable:4514) 
- 
-// conditional expression is constant 
-#pragma warning(disable: 4127) 
- 
-// function ... not inlined 
-#pragma warning(disable: 4710) 
- 
-// function ... selected for automatic inline expansion 
-#pragma warning(disable: 4711) 
- 
+// Copyright 2010 Google Inc.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Includes some standard C headers for size_t, memset, etc.
+//
+// Also, permanently disables a number of warnings produced
+// by Microsoft's compiler when it includes standard headers
+// (surprisingly, also by Microsoft).
+
+#ifndef CRCUTIL_STD_HEADERS_H_
+#define CRCUTIL_STD_HEADERS_H_
+
+#if defined(_MSC_VER)
+// '4' bytes padding added after data member ...
+#pragma warning(disable:4820)
+
+// unreferenced inline function has been removed ...
+#pragma warning(disable:4514)
+
+// conditional expression is constant
+#pragma warning(disable: 4127)
+
+// function ... not inlined
+#pragma warning(disable: 4710)
+
+// function ... selected for automatic inline expansion
+#pragma warning(disable: 4711)
+
 #ifndef _CRT_SECURE_NO_WARNINGS
-#define _CRT_SECURE_NO_WARNINGS 
+#define _CRT_SECURE_NO_WARNINGS
 #endif
- 
-#endif  // defined(_MSC_VER) 
- 
-// #define _CSTDLIB_ 
-#include <stdio.h>      // always handy 
-#include <string.h>     // memset 
-#include <stdlib.h>     // size_t, _rotl/_rotl64(MSC) 
-#include <stddef.h>     // ptrdiff_t (GNUC) 
-#include <stdarg.h>     // va_list 
- 
-#endif  // CRCUTIL_STD_HEADERS_H_ 
+
+#endif  // defined(_MSC_VER)
+
+// #define _CSTDLIB_
+#include <stdio.h>      // always handy
+#include <string.h>     // memset
+#include <stdlib.h>     // size_t, _rotl/_rotl64(MSC)
+#include <stddef.h>     // ptrdiff_t (GNUC)
+#include <stdarg.h>     // va_list
+
+#endif  // CRCUTIL_STD_HEADERS_H_
diff --git a/contrib/libs/crcutil/uint128_sse2.h b/contrib/libs/crcutil/uint128_sse2.h
index 0fcc7255ed..24b4072658 100644
--- a/contrib/libs/crcutil/uint128_sse2.h
+++ b/contrib/libs/crcutil/uint128_sse2.h
@@ -1,310 +1,310 @@
-// Copyright 2010 Google Inc.  All rights reserved. 
-// 
-// Licensed under the Apache License, Version 2.0 (the "License"); 
-// you may not use this file except in compliance with the License. 
-// You may obtain a copy of the License at 
-// 
-//      http://www.apache.org/licenses/LICENSE-2.0 
-// 
-// Unless required by applicable law or agreed to in writing, software 
-// distributed under the License is distributed on an "AS IS" BASIS, 
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-// See the License for the specific language governing permissions and 
-// limitations under the License. 
- 
-// Implements a limited set of 128-bit arithmetic operations 
-// (the ones that are used by CRC) using SSE2 intrinsics. 
- 
-#ifndef CRCUTIL_UINT128_SSE2_H_ 
-#define CRCUTIL_UINT128_SSE2_H_ 
- 
-#include "base_types.h" 
-#include "crc_casts.h"      // Downcast, CrcFromUint64, Uint64FromCrc 
-#include "platform.h" 
- 
-#if HAVE_SSE2 
- 
-namespace crcutil { 
- 
-// Specialized functions handling __m128i. 
-template<> __forceinline uint64 Downcast(const __m128i &value) { 
-#if HAVE_AMD64 && defined(__GNUC__) 
-    // GCC 4.4.x is too smart and, instead of MOVQ, generates SSE4 PEXTRQ 
-    // instruction when the code is compiled with -mmsse4. 
-    // Fixed in 4.5 which generates conversion through memory (why?). 
-    // And -- yes, it makes quite measurable difference. 
-    uint64 temp; 
-    asm(SSE2_MOVQ " %[i128], %[u64]\n" : [u64] "=r" (temp) : [i128] "x" (value)); 
-    return temp; 
-#elif HAVE_AMD64 && (!defined(_MSC_FULL_VER) || _MSC_FULL_VER > 150030729) 
-    return static_cast<uint64>(_mm_cvtsi128_si64(value)); 
-#else 
-    // 64-bit CL 15.00.30729.1 -O2 generates incorrect code (tests fail). 
-    // _mm_cvtsi128_si64() is not available on i386. 
-    uint64 temp; 
-    _mm_storel_epi64(reinterpret_cast<__m128i *>(&temp), value); 
-    return temp; 
-#endif 
-} 
- 
- 
-class uint128_sse2 { 
- public: 
-  uint128_sse2() {} 
-  ~uint128_sse2() {} 
- 
-  // Default casts to uint128_sse2 and assignment operator. 
-  __forceinline void operator =(uint64 value) { 
-#if HAVE_AMD64 && defined(__GNUC__) && !GCC_VERSION_AVAILABLE(4, 5) 
-    // Prevent generation of SSE4 pinsrq insruction when 
-    // compiling with GCC 4.4.x with -msse4 flag. 
-    asm(SSE2_MOVQ " %[u64], %[i128]\n" : [i128] "=x" (x_) : [u64] "r" (value)); 
-#elif HAVE_AMD64 
-    x_ = _mm_cvtsi64_si128(static_cast<int64>(value)); 
-#else 
-    x_ = _mm_loadl_epi64(reinterpret_cast<const __m128i *>(&value)); 
-#endif 
-  } 
-  __forceinline uint128_sse2(uint64 x) { 
-    *this = x; 
-  } 
-  __forceinline uint128_sse2(const __m128i x) : x_(x) { 
-  } 
-  __forceinline operator __m128i() const { 
-    return x_; 
-  } 
-  __forceinline void operator =(const uint128_sse2 &x) { 
-    x_ = x.x_; 
-  } 
- 
-  // Extracts 64 less significant bits. 
-  __forceinline uint64 to_uint64() const { 
-    return Downcast<__m128i, uint64>(x_); 
-  } 
- 
-  // Comparisons. 
-  __forceinline bool operator ==(const uint128_sse2 &y) const { 
-    union { 
-      __m128i i128; 
-      uint64  u64[2]; 
-    } t; 
-    t.i128 = _mm_xor_si128(x_, y.x_); 
-    return (t.u64[0] | t.u64[1]) == 0; 
-  } 
-  __forceinline bool operator ==(uint64 value) const { 
-    union { 
-      __m128i i128; 
-      uint64  u64[2]; 
-    } t; 
-    t.i128 = x_; 
-    return (t.u64[0] == value && t.u64[1] == 0); 
-  } 
-  __forceinline bool operator !=(const uint128_sse2 &y) const { 
-    union { 
-      __m128i i128; 
-      uint64  u64[2]; 
-    } t; 
-    t.i128 = _mm_xor_si128(x_, y.x_); 
-    return (t.u64[0] | t.u64[1]) != 0; 
-  } 
-  __forceinline bool operator !=(uint64 value) const { 
-    union { 
-      __m128i i128; 
-      uint64  u64[2]; 
-    } t; 
-    t.i128 = x_; 
-    return (t.u64[0] != value || t.u64[1] != 0); 
-  } 
- 
-  __forceinline bool operator <(const uint128_sse2 &y) const { 
-    union { 
-      __m128i i128; 
-      uint64  u64[2]; 
-    } xx, yy; 
-    xx.i128 = x_; 
-    yy.i128 = y.x_; 
-    return (xx.u64[0] < yy.u64[0] || 
-           (xx.u64[0] == yy.u64[0] && xx.u64[1] < yy.u64[1])); 
-  } 
- 
-  // Bitwise logic operators. 
-  __forceinline uint128_sse2 operator ^(const uint128_sse2 &y) const { 
-    return _mm_xor_si128(x_, y.x_); 
-  } 
-  __forceinline uint128_sse2 operator &(const uint128_sse2 &y) const { 
-    return _mm_and_si128(x_, y.x_); 
-  } 
-  __forceinline uint128_sse2 operator |(const uint128_sse2 &y) const { 
-    return _mm_or_si128(x_, y.x_); 
-  } 
- 
-  __forceinline void operator ^=(const uint128_sse2 &y) { 
-    *this = *this ^ y.x_; 
-  } 
-  __forceinline void operator &=(const uint128_sse2 &y) { 
-    *this = *this & y.x_; 
-  } 
-  __forceinline void operator |=(const uint128_sse2 &y) { 
-    *this = *this | y.x_; 
-  } 
- 
-  // Arithmetic operators. 
-  __forceinline uint128_sse2 operator +(uint64 y) const { 
-    union { 
-      __m128i i128; 
-      uint64  u64[2]; 
-    } temp; 
-    temp.i128 = x_; 
-    // a + b >= 2**64 iff 
-    // a + b > (2**64 - 1) iff 
-    // a > (2**64 - 1) - b iff 
-    // a > ~b 
-    if (temp.u64[0] > ~y) { 
-      temp.u64[1] += 1; 
-    } 
-    temp.u64[0] += y; 
-    return temp.i128; 
-  } 
-  __forceinline void operator +=(uint64 x) { 
-    *this = *this + x; 
-  } 
-  __forceinline uint128_sse2 operator -(uint64 y) const { 
-    union { 
-      __m128i i128; 
-      uint64  u64[2]; 
-    } temp; 
-    temp.i128 = x_; 
-    if (temp.u64[0] < y) { 
-      temp.u64[1] -= 1; 
-    } 
-    temp.u64[0] -= y; 
-    return temp.i128; 
-  } 
-  __forceinline void operator -=(uint64 x) { 
-    *this = *this - x; 
-  } 
- 
-  // Bitwise logical shifts. 
-  __forceinline uint128_sse2 operator >>(const int bits) const { 
-    if (bits == 8) { 
-      return _mm_srli_si128(x_, 1); 
-    } else if (bits == 16) { 
-      return _mm_srli_si128(x_, 2); 
-    } else if (bits == 32) { 
-      return _mm_srli_si128(x_, 4); 
-    } else if (bits == 64) { 
-      return _mm_srli_si128(x_, 8); 
-    } else { 
-      return long_shift_right(bits); 
-    } 
-  } 
-  __forceinline uint128_sse2 operator >>(const size_t bits) const { 
-    return *this >> static_cast<int>(bits); 
-  } 
-  __forceinline void operator >>=(const int bits) { 
-    *this = *this >> bits; 
-  } 
-  __forceinline void operator >>=(const size_t bits) { 
-    *this = *this >> static_cast<int>(bits); 
-  } 
- 
-  __forceinline uint128_sse2 operator <<(int bits) const { 
-    if (bits == 8) { 
-      return _mm_slli_si128(x_, 1); 
-    } else if (bits == 16) { 
-      return _mm_slli_si128(x_, 2); 
-    } else if (bits == 32) { 
-      return _mm_slli_si128(x_, 4); 
-    } else if (bits == 64) { 
-      return _mm_slli_si128(x_, 8); 
-    } else { 
-      return long_shift_left(bits); 
-    } 
-  } 
-  __forceinline uint128_sse2 operator <<(size_t bits) const { 
-    return *this << static_cast<int>(bits); 
-  } 
-  __forceinline void operator <<=(int bits) { 
-    *this = *this << bits; 
-  } 
-  __forceinline void operator <<=(size_t bits) { 
-    *this = *this << static_cast<int>(bits); 
-  } 
- 
- protected: 
-  __forceinline uint128_sse2 long_shift_right(int bits) const { 
-    union { 
-      __m128i i128; 
-      uint64 u64[2]; 
-    } x; 
-    x.i128 = x_; 
-    for (; bits > 0; --bits) { 
-      x.u64[0] >>= 1; 
-      if (x.u64[1] & 1) { 
-        x.u64[0] |= static_cast<uint64>(1) << 63; 
-      } 
-      x.u64[1] >>= 1; 
-    } 
-    return x.i128; 
-  } 
- 
-  __forceinline uint128_sse2 long_shift_left(int bits) const { 
-    union { 
-      __m128i i128; 
-      int64   i64[2]; 
-    } x; 
-    x.i128 = x_; 
-    for (; bits > 0; --bits) { 
-      x.i64[1] <<= 1; 
-      if (x.i64[0] < 0) { 
-        x.i64[1] |= 1; 
-      } 
-      x.i64[0] <<= 1; 
-    } 
-    return x.i128; 
-  } 
- 
-  __m128i x_; 
-} GCC_ALIGN_ATTRIBUTE(16); 
- 
- 
-// Specialized versions. 
-template<> __forceinline uint64 Downcast(const uint128_sse2 &x) { 
-  return x.to_uint64(); 
-} 
-template<> __forceinline uint32 Downcast(const uint128_sse2 &x) { 
-  return static_cast<uint32>(x.to_uint64()); 
-} 
-template<> __forceinline uint16 Downcast(const uint128_sse2 &x) { 
-  return static_cast<uint16>(x.to_uint64()); 
-} 
-template<> __forceinline uint8 Downcast(const uint128_sse2 &x) { 
-  return static_cast<uint8>(x.to_uint64()); 
-} 
- 
-template<> __forceinline uint128_sse2 CrcFromUint64(uint64 lo, uint64 hi) { 
-  union { 
-    __m128i i128; 
-    uint64  u64[2]; 
-  } temp; 
-  temp.u64[0] = lo; 
-  temp.u64[1] = hi; 
-  return temp.i128; 
-} 
- 
-template<> __forceinline void Uint64FromCrc(const uint128_sse2 &crc, 
-                              uint64 *lo, uint64 *hi) { 
-  union { 
-    __m128i i128; 
-    uint64  u64[2]; 
-  } temp; 
-  temp.i128 = crc; 
-  *lo = temp.u64[0]; 
-  *hi = temp.u64[1]; 
-} 
- 
-}  // namespace crcutil 
- 
-#endif  // HAVE_SSE2 
- 
-#endif  // CRCUTIL_UINT128_SSE2_H_ 
+// Copyright 2010 Google Inc.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Implements a limited set of 128-bit arithmetic operations
+// (the ones that are used by CRC) using SSE2 intrinsics.
+
+#ifndef CRCUTIL_UINT128_SSE2_H_
+#define CRCUTIL_UINT128_SSE2_H_
+
+#include "base_types.h"
+#include "crc_casts.h"      // Downcast, CrcFromUint64, Uint64FromCrc
+#include "platform.h"
+
+#if HAVE_SSE2
+
+namespace crcutil {
+
+// Specialized functions handling __m128i.
+template<> __forceinline uint64 Downcast(const __m128i &value) {
+#if HAVE_AMD64 && defined(__GNUC__)
+    // GCC 4.4.x is too smart and, instead of MOVQ, generates SSE4 PEXTRQ
+    // instruction when the code is compiled with -mmsse4.
+    // Fixed in 4.5 which generates conversion through memory (why?).
+    // And -- yes, it makes quite measurable difference.
+    uint64 temp;
+    asm(SSE2_MOVQ " %[i128], %[u64]\n" : [u64] "=r" (temp) : [i128] "x" (value));
+    return temp;
+#elif HAVE_AMD64 && (!defined(_MSC_FULL_VER) || _MSC_FULL_VER > 150030729)
+    return static_cast<uint64>(_mm_cvtsi128_si64(value));
+#else
+    // 64-bit CL 15.00.30729.1 -O2 generates incorrect code (tests fail).
+    // _mm_cvtsi128_si64() is not available on i386.
+    uint64 temp;
+    _mm_storel_epi64(reinterpret_cast<__m128i *>(&temp), value);
+    return temp;
+#endif
+}
+
+
+class uint128_sse2 {
+ public:
+  uint128_sse2() {}
+  ~uint128_sse2() {}
+
+  // Default casts to uint128_sse2 and assignment operator.
+  __forceinline void operator =(uint64 value) {
+#if HAVE_AMD64 && defined(__GNUC__) && !GCC_VERSION_AVAILABLE(4, 5)
+    // Prevent generation of SSE4 pinsrq insruction when
+    // compiling with GCC 4.4.x with -msse4 flag.
+    asm(SSE2_MOVQ " %[u64], %[i128]\n" : [i128] "=x" (x_) : [u64] "r" (value));
+#elif HAVE_AMD64
+    x_ = _mm_cvtsi64_si128(static_cast<int64>(value));
+#else
+    x_ = _mm_loadl_epi64(reinterpret_cast<const __m128i *>(&value));
+#endif
+  }
+  __forceinline uint128_sse2(uint64 x) {
+    *this = x;
+  }
+  __forceinline uint128_sse2(const __m128i x) : x_(x) {
+  }
+  __forceinline operator __m128i() const {
+    return x_;
+  }
+  __forceinline void operator =(const uint128_sse2 &x) {
+    x_ = x.x_;
+  }
+
+  // Extracts 64 less significant bits.
+  __forceinline uint64 to_uint64() const {
+    return Downcast<__m128i, uint64>(x_);
+  }
+
+  // Comparisons.
+  __forceinline bool operator ==(const uint128_sse2 &y) const {
+    union {
+      __m128i i128;
+      uint64  u64[2];
+    } t;
+    t.i128 = _mm_xor_si128(x_, y.x_);
+    return (t.u64[0] | t.u64[1]) == 0;
+  }
+  __forceinline bool operator ==(uint64 value) const {
+    union {
+      __m128i i128;
+      uint64  u64[2];
+    } t;
+    t.i128 = x_;
+    return (t.u64[0] == value && t.u64[1] == 0);
+  }
+  __forceinline bool operator !=(const uint128_sse2 &y) const {
+    union {
+      __m128i i128;
+      uint64  u64[2];
+    } t;
+    t.i128 = _mm_xor_si128(x_, y.x_);
+    return (t.u64[0] | t.u64[1]) != 0;
+  }
+  __forceinline bool operator !=(uint64 value) const {
+    union {
+      __m128i i128;
+      uint64  u64[2];
+    } t;
+    t.i128 = x_;
+    return (t.u64[0] != value || t.u64[1] != 0);
+  }
+
+  __forceinline bool operator <(const uint128_sse2 &y) const {
+    union {
+      __m128i i128;
+      uint64  u64[2];
+    } xx, yy;
+    xx.i128 = x_;
+    yy.i128 = y.x_;
+    return (xx.u64[0] < yy.u64[0] ||
+           (xx.u64[0] == yy.u64[0] && xx.u64[1] < yy.u64[1]));
+  }
+
+  // Bitwise logic operators.
+  __forceinline uint128_sse2 operator ^(const uint128_sse2 &y) const {
+    return _mm_xor_si128(x_, y.x_);
+  }
+  __forceinline uint128_sse2 operator &(const uint128_sse2 &y) const {
+    return _mm_and_si128(x_, y.x_);
+  }
+  __forceinline uint128_sse2 operator |(const uint128_sse2 &y) const {
+    return _mm_or_si128(x_, y.x_);
+  }
+
+  __forceinline void operator ^=(const uint128_sse2 &y) {
+    *this = *this ^ y.x_;
+  }
+  __forceinline void operator &=(const uint128_sse2 &y) {
+    *this = *this & y.x_;
+  }
+  __forceinline void operator |=(const uint128_sse2 &y) {
+    *this = *this | y.x_;
+  }
+
+  // Arithmetic operators.
+  __forceinline uint128_sse2 operator +(uint64 y) const {
+    union {
+      __m128i i128;
+      uint64  u64[2];
+    } temp;
+    temp.i128 = x_;
+    // a + b >= 2**64 iff
+    // a + b > (2**64 - 1) iff
+    // a > (2**64 - 1) - b iff
+    // a > ~b
+    if (temp.u64[0] > ~y) {
+      temp.u64[1] += 1;
+    }
+    temp.u64[0] += y;
+    return temp.i128;
+  }
+  __forceinline void operator +=(uint64 x) {
+    *this = *this + x;
+  }
+  __forceinline uint128_sse2 operator -(uint64 y) const {
+    union {
+      __m128i i128;
+      uint64  u64[2];
+    } temp;
+    temp.i128 = x_;
+    if (temp.u64[0] < y) {
+      temp.u64[1] -= 1;
+    }
+    temp.u64[0] -= y;
+    return temp.i128;
+  }
+  __forceinline void operator -=(uint64 x) {
+    *this = *this - x;
+  }
+
+  // Bitwise logical shifts.
+  __forceinline uint128_sse2 operator >>(const int bits) const {
+    if (bits == 8) {
+      return _mm_srli_si128(x_, 1);
+    } else if (bits == 16) {
+      return _mm_srli_si128(x_, 2);
+    } else if (bits == 32) {
+      return _mm_srli_si128(x_, 4);
+    } else if (bits == 64) {
+      return _mm_srli_si128(x_, 8);
+    } else {
+      return long_shift_right(bits);
+    }
+  }
+  __forceinline uint128_sse2 operator >>(const size_t bits) const {
+    return *this >> static_cast<int>(bits);
+  }
+  __forceinline void operator >>=(const int bits) {
+    *this = *this >> bits;
+  }
+  __forceinline void operator >>=(const size_t bits) {
+    *this = *this >> static_cast<int>(bits);
+  }
+
+  __forceinline uint128_sse2 operator <<(int bits) const {
+    if (bits == 8) {
+      return _mm_slli_si128(x_, 1);
+    } else if (bits == 16) {
+      return _mm_slli_si128(x_, 2);
+    } else if (bits == 32) {
+      return _mm_slli_si128(x_, 4);
+    } else if (bits == 64) {
+      return _mm_slli_si128(x_, 8);
+    } else {
+      return long_shift_left(bits);
+    }
+  }
+  __forceinline uint128_sse2 operator <<(size_t bits) const {
+    return *this << static_cast<int>(bits);
+  }
+  __forceinline void operator <<=(int bits) {
+    *this = *this << bits;
+  }
+  __forceinline void operator <<=(size_t bits) {
+    *this = *this << static_cast<int>(bits);
+  }
+
+ protected:
+  __forceinline uint128_sse2 long_shift_right(int bits) const {
+    union {
+      __m128i i128;
+      uint64 u64[2];
+    } x;
+    x.i128 = x_;
+    for (; bits > 0; --bits) {
+      x.u64[0] >>= 1;
+      if (x.u64[1] & 1) {
+        x.u64[0] |= static_cast<uint64>(1) << 63;
+      }
+      x.u64[1] >>= 1;
+    }
+    return x.i128;
+  }
+
+  __forceinline uint128_sse2 long_shift_left(int bits) const {
+    union {
+      __m128i i128;
+      int64   i64[2];
+    } x;
+    x.i128 = x_;
+    for (; bits > 0; --bits) {
+      x.i64[1] <<= 1;
+      if (x.i64[0] < 0) {
+        x.i64[1] |= 1;
+      }
+      x.i64[0] <<= 1;
+    }
+    return x.i128;
+  }
+
+  __m128i x_;
+} GCC_ALIGN_ATTRIBUTE(16);
+
+
+// Specialized versions.
+template<> __forceinline uint64 Downcast(const uint128_sse2 &x) {
+  return x.to_uint64();
+}
+template<> __forceinline uint32 Downcast(const uint128_sse2 &x) {
+  return static_cast<uint32>(x.to_uint64());
+}
+template<> __forceinline uint16 Downcast(const uint128_sse2 &x) {
+  return static_cast<uint16>(x.to_uint64());
+}
+template<> __forceinline uint8 Downcast(const uint128_sse2 &x) {
+  return static_cast<uint8>(x.to_uint64());
+}
+
+template<> __forceinline uint128_sse2 CrcFromUint64(uint64 lo, uint64 hi) {
+  union {
+    __m128i i128;
+    uint64  u64[2];
+  } temp;
+  temp.u64[0] = lo;
+  temp.u64[1] = hi;
+  return temp.i128;
+}
+
+template<> __forceinline void Uint64FromCrc(const uint128_sse2 &crc,
+                              uint64 *lo, uint64 *hi) {
+  union {
+    __m128i i128;
+    uint64  u64[2];
+  } temp;
+  temp.i128 = crc;
+  *lo = temp.u64[0];
+  *hi = temp.u64[1];
+}
+
+}  // namespace crcutil
+
+#endif  // HAVE_SSE2
+
+#endif  // CRCUTIL_UINT128_SSE2_H_
diff --git a/contrib/libs/crcutil/ya.make b/contrib/libs/crcutil/ya.make
index 90340a33be..2da8ef940f 100644
--- a/contrib/libs/crcutil/ya.make
+++ b/contrib/libs/crcutil/ya.make
@@ -1,5 +1,5 @@
-LIBRARY() 
- 
+LIBRARY()
+
 LICENSE(Apache-2.0)
 
 VERSION(1.0)
@@ -13,10 +13,10 @@ OWNER(
 
 NO_UTIL()
 
-NO_COMPILER_WARNINGS() 
+NO_COMPILER_WARNINGS()
 
 NO_JOIN_SRC()
- 
+
 IF (GCC AND USE_LTO)
     CFLAGS(-DCRCUTIL_FORCE_ASM_CRC32C=1)
 ENDIF()
@@ -61,10 +61,10 @@ IF (ARCH_I386 OR ARCH_X86_64)
         SRC_CPP_SSE4(crc32c_sse4.cc)
     ENDIF()
 ENDIF()
- 
-SRCS( 
-    interface.cc 
-    multiword_64_64_intrinsic_i386_mmx.cc 
-) 
- 
-END() 
+
+SRCS(
+    interface.cc
+    multiword_64_64_intrinsic_i386_mmx.cc
+)
+
+END()
diff --git a/contrib/libs/ya.make b/contrib/libs/ya.make
index 52d4849414..9c4640fdcf 100644
--- a/contrib/libs/ya.make
+++ b/contrib/libs/ya.make
@@ -41,7 +41,7 @@ RECURSE(
     coturn
     courgette_bsdiff
     cppkafka
-    crcutil 
+    crcutil
     crfsuite
     croaring
     ctemplate
diff --git a/contrib/libs/zlib/ChangeLog b/contrib/libs/zlib/ChangeLog
index 7fb0646df4..30199a65a0 100644
--- a/contrib/libs/zlib/ChangeLog
+++ b/contrib/libs/zlib/ChangeLog
@@ -1,6 +1,6 @@
- 
-                ChangeLog file for zlib 
- 
+
+                ChangeLog file for zlib
+
 Changes in 1.2.11 (15 Jan 2017)
 - Fix deflate stored bug when pulling last block from window
 - Permit immediate deflateParams changes before any deflate input
@@ -44,1472 +44,1472 @@ Changes in 1.2.9 (31 Dec 2016)
 - Add crc32_z() and adler32_z() functions with size_t lengths
 - Update Visual Studio project files [AraHaan]
 
-Changes in 1.2.8 (28 Apr 2013) 
-- Update contrib/minizip/iowin32.c for Windows RT [Vollant] 
-- Do not force Z_CONST for C++ 
+Changes in 1.2.8 (28 Apr 2013)
+- Update contrib/minizip/iowin32.c for Windows RT [Vollant]
+- Do not force Z_CONST for C++
 - Clean up contrib/vstudio [Roß]
-- Correct spelling error in zlib.h 
-- Fix mixed line endings in contrib/vstudio 
- 
-Changes in 1.2.7.3 (13 Apr 2013) 
-- Fix version numbers and DLL names in contrib/vstudio/*/zlib.rc 
- 
-Changes in 1.2.7.2 (13 Apr 2013) 
-- Change check for a four-byte type back to hexadecimal 
-- Fix typo in win32/Makefile.msc 
-- Add casts in gzwrite.c for pointer differences 
- 
-Changes in 1.2.7.1 (24 Mar 2013) 
-- Replace use of unsafe string functions with snprintf if available 
-- Avoid including stddef.h on Windows for Z_SOLO compile [Niessink] 
-- Fix gzgetc undefine when Z_PREFIX set [Turk] 
-- Eliminate use of mktemp in Makefile (not always available) 
-- Fix bug in 'F' mode for gzopen() 
-- Add inflateGetDictionary() function 
-- Correct comment in deflate.h 
-- Use _snprintf for snprintf in Microsoft C 
-- On Darwin, only use /usr/bin/libtool if libtool is not Apple 
-- Delete "--version" file if created by "ar --version" [Richard G.] 
-- Fix configure check for veracity of compiler error return codes 
-- Fix CMake compilation of static lib for MSVC2010 x64 
-- Remove unused variable in infback9.c 
-- Fix argument checks in gzlog_compress() and gzlog_write() 
-- Clean up the usage of z_const and respect const usage within zlib 
-- Clean up examples/gzlog.[ch] comparisons of different types 
-- Avoid shift equal to bits in type (caused endless loop) 
+- Correct spelling error in zlib.h
+- Fix mixed line endings in contrib/vstudio
+
+Changes in 1.2.7.3 (13 Apr 2013)
+- Fix version numbers and DLL names in contrib/vstudio/*/zlib.rc
+
+Changes in 1.2.7.2 (13 Apr 2013)
+- Change check for a four-byte type back to hexadecimal
+- Fix typo in win32/Makefile.msc
+- Add casts in gzwrite.c for pointer differences
+
+Changes in 1.2.7.1 (24 Mar 2013)
+- Replace use of unsafe string functions with snprintf if available
+- Avoid including stddef.h on Windows for Z_SOLO compile [Niessink]
+- Fix gzgetc undefine when Z_PREFIX set [Turk]
+- Eliminate use of mktemp in Makefile (not always available)
+- Fix bug in 'F' mode for gzopen()
+- Add inflateGetDictionary() function
+- Correct comment in deflate.h
+- Use _snprintf for snprintf in Microsoft C
+- On Darwin, only use /usr/bin/libtool if libtool is not Apple
+- Delete "--version" file if created by "ar --version" [Richard G.]
+- Fix configure check for veracity of compiler error return codes
+- Fix CMake compilation of static lib for MSVC2010 x64
+- Remove unused variable in infback9.c
+- Fix argument checks in gzlog_compress() and gzlog_write()
+- Clean up the usage of z_const and respect const usage within zlib
+- Clean up examples/gzlog.[ch] comparisons of different types
+- Avoid shift equal to bits in type (caused endless loop)
 - Fix uninitialized value bug in gzputc() introduced by const patches
-- Fix memory allocation error in examples/zran.c [Nor] 
-- Fix bug where gzopen(), gzclose() would write an empty file 
-- Fix bug in gzclose() when gzwrite() runs out of memory 
-- Check for input buffer malloc failure in examples/gzappend.c 
-- Add note to contrib/blast to use binary mode in stdio 
-- Fix comparisons of differently signed integers in contrib/blast 
-- Check for invalid code length codes in contrib/puff 
-- Fix serious but very rare decompression bug in inftrees.c 
-- Update inflateBack() comments, since inflate() can be faster 
-- Use underscored I/O function names for WINAPI_FAMILY 
-- Add _tr_flush_bits to the external symbols prefixed by --zprefix 
-- Add contrib/vstudio/vc10 pre-build step for static only 
-- Quote --version-script argument in CMakeLists.txt 
-- Don't specify --version-script on Apple platforms in CMakeLists.txt 
-- Fix casting error in contrib/testzlib/testzlib.c 
-- Fix types in contrib/minizip to match result of get_crc_table() 
-- Simplify contrib/vstudio/vc10 with 'd' suffix 
-- Add TOP support to win32/Makefile.msc 
-- Suport i686 and amd64 assembler builds in CMakeLists.txt 
-- Fix typos in the use of _LARGEFILE64_SOURCE in zconf.h 
-- Add vc11 and vc12 build files to contrib/vstudio 
-- Add gzvprintf() as an undocumented function in zlib 
-- Fix configure for Sun shell 
-- Remove runtime check in configure for four-byte integer type 
-- Add casts and consts to ease user conversion to C++ 
-- Add man pages for minizip and miniunzip 
-- In Makefile uninstall, don't rm if preceding cd fails 
-- Do not return Z_BUF_ERROR if deflateParam() has nothing to write 
- 
-Changes in 1.2.7 (2 May 2012) 
-- Replace use of memmove() with a simple copy for portability 
-- Test for existence of strerror 
-- Restore gzgetc_ for backward compatibility with 1.2.6 
-- Fix build with non-GNU make on Solaris 
-- Require gcc 4.0 or later on Mac OS X to use the hidden attribute 
-- Include unistd.h for Watcom C 
-- Use __WATCOMC__ instead of __WATCOM__ 
-- Do not use the visibility attribute if NO_VIZ defined 
-- Improve the detection of no hidden visibility attribute 
-- Avoid using __int64 for gcc or solo compilation 
-- Cast to char * in gzprintf to avoid warnings [Zinser] 
-- Fix make_vms.com for VAX [Zinser] 
-- Don't use library or built-in byte swaps 
-- Simplify test and use of gcc hidden attribute 
-- Fix bug in gzclose_w() when gzwrite() fails to allocate memory 
-- Add "x" (O_EXCL) and "e" (O_CLOEXEC) modes support to gzopen() 
-- Fix bug in test/minigzip.c for configure --solo 
-- Fix contrib/vstudio project link errors [Mohanathas] 
-- Add ability to choose the builder in make_vms.com [Schweda] 
-- Add DESTDIR support to mingw32 win32/Makefile.gcc 
-- Fix comments in win32/Makefile.gcc for proper usage 
-- Allow overriding the default install locations for cmake 
-- Generate and install the pkg-config file with cmake 
-- Build both a static and a shared version of zlib with cmake 
-- Include version symbols for cmake builds 
-- If using cmake with MSVC, add the source directory to the includes 
-- Remove unneeded EXTRA_CFLAGS from win32/Makefile.gcc [Truta] 
-- Move obsolete emx makefile to old [Truta] 
-- Allow the use of -Wundef when compiling or using zlib 
-- Avoid the use of the -u option with mktemp 
-- Improve inflate() documentation on the use of Z_FINISH 
-- Recognize clang as gcc 
-- Add gzopen_w() in Windows for wide character path names 
-- Rename zconf.h in CMakeLists.txt to move it out of the way 
-- Add source directory in CMakeLists.txt for building examples 
-- Look in build directory for zlib.pc in CMakeLists.txt 
-- Remove gzflags from zlibvc.def in vc9 and vc10 
-- Fix contrib/minizip compilation in the MinGW environment 
-- Update ./configure for Solaris, support --64 [Mooney] 
-- Remove -R. from Solaris shared build (possible security issue) 
-- Avoid race condition for parallel make (-j) running example 
-- Fix type mismatch between get_crc_table() and crc_table 
-- Fix parsing of version with "-" in CMakeLists.txt [Snider, Ziegler] 
-- Fix the path to zlib.map in CMakeLists.txt 
-- Force the native libtool in Mac OS X to avoid GNU libtool [Beebe] 
-- Add instructions to win32/Makefile.gcc for shared install [Torri] 
- 
-Changes in 1.2.6.1 (12 Feb 2012) 
-- Avoid the use of the Objective-C reserved name "id" 
-- Include io.h in gzguts.h for Microsoft compilers 
-- Fix problem with ./configure --prefix and gzgetc macro 
-- Include gz_header definition when compiling zlib solo 
-- Put gzflags() functionality back in zutil.c 
-- Avoid library header include in crc32.c for Z_SOLO 
-- Use name in GCC_CLASSIC as C compiler for coverage testing, if set 
-- Minor cleanup in contrib/minizip/zip.c [Vollant] 
-- Update make_vms.com [Zinser] 
-- Remove unnecessary gzgetc_ function 
-- Use optimized byte swap operations for Microsoft and GNU [Snyder] 
-- Fix minor typo in zlib.h comments [Rzesniowiecki] 
- 
-Changes in 1.2.6 (29 Jan 2012) 
-- Update the Pascal interface in contrib/pascal 
-- Fix function numbers for gzgetc_ in zlibvc.def files 
-- Fix configure.ac for contrib/minizip [Schiffer] 
-- Fix large-entry detection in minizip on 64-bit systems [Schiffer] 
-- Have ./configure use the compiler return code for error indication 
-- Fix CMakeLists.txt for cross compilation [McClure] 
-- Fix contrib/minizip/zip.c for 64-bit architectures [Dalsnes] 
-- Fix compilation of contrib/minizip on FreeBSD [Marquez] 
-- Correct suggested usages in win32/Makefile.msc [Shachar, Horvath] 
-- Include io.h for Turbo C / Borland C on all platforms [Truta] 
-- Make version explicit in contrib/minizip/configure.ac [Bosmans] 
-- Avoid warning for no encryption in contrib/minizip/zip.c [Vollant] 
-- Minor cleanup up contrib/minizip/unzip.c [Vollant] 
-- Fix bug when compiling minizip with C++ [Vollant] 
-- Protect for long name and extra fields in contrib/minizip [Vollant] 
-- Avoid some warnings in contrib/minizip [Vollant] 
-- Add -I../.. -L../.. to CFLAGS for minizip and miniunzip 
-- Add missing libs to minizip linker command 
-- Add support for VPATH builds in contrib/minizip 
-- Add an --enable-demos option to contrib/minizip/configure 
-- Add the generation of configure.log by ./configure 
-- Exit when required parameters not provided to win32/Makefile.gcc 
-- Have gzputc return the character written instead of the argument 
-- Use the -m option on ldconfig for BSD systems [Tobias] 
-- Correct in zlib.map when deflateResetKeep was added 
- 
-Changes in 1.2.5.3 (15 Jan 2012) 
-- Restore gzgetc function for binary compatibility 
-- Do not use _lseeki64 under Borland C++ [Truta] 
-- Update win32/Makefile.msc to build test/*.c [Truta] 
-- Remove old/visualc6 given CMakefile and other alternatives 
-- Update AS400 build files and documentation [Monnerat] 
-- Update win32/Makefile.gcc to build test/*.c [Truta] 
-- Permit stronger flushes after Z_BLOCK flushes 
-- Avoid extraneous empty blocks when doing empty flushes 
-- Permit Z_NULL arguments to deflatePending 
-- Allow deflatePrime() to insert bits in the middle of a stream 
-- Remove second empty static block for Z_PARTIAL_FLUSH 
-- Write out all of the available bits when using Z_BLOCK 
-- Insert the first two strings in the hash table after a flush 
- 
-Changes in 1.2.5.2 (17 Dec 2011) 
-- fix ld error: unable to find version dependency 'ZLIB_1.2.5' 
-- use relative symlinks for shared libs 
-- Avoid searching past window for Z_RLE strategy 
-- Assure that high-water mark initialization is always applied in deflate 
-- Add assertions to fill_window() in deflate.c to match comments 
-- Update python link in README 
-- Correct spelling error in gzread.c 
-- Fix bug in gzgets() for a concatenated empty gzip stream 
-- Correct error in comment for gz_make() 
-- Change gzread() and related to ignore junk after gzip streams 
-- Allow gzread() and related to continue after gzclearerr() 
-- Allow gzrewind() and gzseek() after a premature end-of-file 
-- Simplify gzseek() now that raw after gzip is ignored 
-- Change gzgetc() to a macro for speed (~40% speedup in testing) 
-- Fix gzclose() to return the actual error last encountered 
-- Always add large file support for windows 
-- Include zconf.h for windows large file support 
-- Include zconf.h.cmakein for windows large file support 
-- Update zconf.h.cmakein on make distclean 
-- Merge vestigial vsnprintf determination from zutil.h to gzguts.h 
-- Clarify how gzopen() appends in zlib.h comments 
-- Correct documentation of gzdirect() since junk at end now ignored 
-- Add a transparent write mode to gzopen() when 'T' is in the mode 
-- Update python link in zlib man page 
-- Get inffixed.h and MAKEFIXED result to match 
+- Fix memory allocation error in examples/zran.c [Nor]
+- Fix bug where gzopen(), gzclose() would write an empty file
+- Fix bug in gzclose() when gzwrite() runs out of memory
+- Check for input buffer malloc failure in examples/gzappend.c
+- Add note to contrib/blast to use binary mode in stdio
+- Fix comparisons of differently signed integers in contrib/blast
+- Check for invalid code length codes in contrib/puff
+- Fix serious but very rare decompression bug in inftrees.c
+- Update inflateBack() comments, since inflate() can be faster
+- Use underscored I/O function names for WINAPI_FAMILY
+- Add _tr_flush_bits to the external symbols prefixed by --zprefix
+- Add contrib/vstudio/vc10 pre-build step for static only
+- Quote --version-script argument in CMakeLists.txt
+- Don't specify --version-script on Apple platforms in CMakeLists.txt
+- Fix casting error in contrib/testzlib/testzlib.c
+- Fix types in contrib/minizip to match result of get_crc_table()
+- Simplify contrib/vstudio/vc10 with 'd' suffix
+- Add TOP support to win32/Makefile.msc
+- Suport i686 and amd64 assembler builds in CMakeLists.txt
+- Fix typos in the use of _LARGEFILE64_SOURCE in zconf.h
+- Add vc11 and vc12 build files to contrib/vstudio
+- Add gzvprintf() as an undocumented function in zlib
+- Fix configure for Sun shell
+- Remove runtime check in configure for four-byte integer type
+- Add casts and consts to ease user conversion to C++
+- Add man pages for minizip and miniunzip
+- In Makefile uninstall, don't rm if preceding cd fails
+- Do not return Z_BUF_ERROR if deflateParam() has nothing to write
+
+Changes in 1.2.7 (2 May 2012)
+- Replace use of memmove() with a simple copy for portability
+- Test for existence of strerror
+- Restore gzgetc_ for backward compatibility with 1.2.6
+- Fix build with non-GNU make on Solaris
+- Require gcc 4.0 or later on Mac OS X to use the hidden attribute
+- Include unistd.h for Watcom C
+- Use __WATCOMC__ instead of __WATCOM__
+- Do not use the visibility attribute if NO_VIZ defined
+- Improve the detection of no hidden visibility attribute
+- Avoid using __int64 for gcc or solo compilation
+- Cast to char * in gzprintf to avoid warnings [Zinser]
+- Fix make_vms.com for VAX [Zinser]
+- Don't use library or built-in byte swaps
+- Simplify test and use of gcc hidden attribute
+- Fix bug in gzclose_w() when gzwrite() fails to allocate memory
+- Add "x" (O_EXCL) and "e" (O_CLOEXEC) modes support to gzopen()
+- Fix bug in test/minigzip.c for configure --solo
+- Fix contrib/vstudio project link errors [Mohanathas]
+- Add ability to choose the builder in make_vms.com [Schweda]
+- Add DESTDIR support to mingw32 win32/Makefile.gcc
+- Fix comments in win32/Makefile.gcc for proper usage
+- Allow overriding the default install locations for cmake
+- Generate and install the pkg-config file with cmake
+- Build both a static and a shared version of zlib with cmake
+- Include version symbols for cmake builds
+- If using cmake with MSVC, add the source directory to the includes
+- Remove unneeded EXTRA_CFLAGS from win32/Makefile.gcc [Truta]
+- Move obsolete emx makefile to old [Truta]
+- Allow the use of -Wundef when compiling or using zlib
+- Avoid the use of the -u option with mktemp
+- Improve inflate() documentation on the use of Z_FINISH
+- Recognize clang as gcc
+- Add gzopen_w() in Windows for wide character path names
+- Rename zconf.h in CMakeLists.txt to move it out of the way
+- Add source directory in CMakeLists.txt for building examples
+- Look in build directory for zlib.pc in CMakeLists.txt
+- Remove gzflags from zlibvc.def in vc9 and vc10
+- Fix contrib/minizip compilation in the MinGW environment
+- Update ./configure for Solaris, support --64 [Mooney]
+- Remove -R. from Solaris shared build (possible security issue)
+- Avoid race condition for parallel make (-j) running example
+- Fix type mismatch between get_crc_table() and crc_table
+- Fix parsing of version with "-" in CMakeLists.txt [Snider, Ziegler]
+- Fix the path to zlib.map in CMakeLists.txt
+- Force the native libtool in Mac OS X to avoid GNU libtool [Beebe]
+- Add instructions to win32/Makefile.gcc for shared install [Torri]
+
+Changes in 1.2.6.1 (12 Feb 2012)
+- Avoid the use of the Objective-C reserved name "id"
+- Include io.h in gzguts.h for Microsoft compilers
+- Fix problem with ./configure --prefix and gzgetc macro
+- Include gz_header definition when compiling zlib solo
+- Put gzflags() functionality back in zutil.c
+- Avoid library header include in crc32.c for Z_SOLO
+- Use name in GCC_CLASSIC as C compiler for coverage testing, if set
+- Minor cleanup in contrib/minizip/zip.c [Vollant]
+- Update make_vms.com [Zinser]
+- Remove unnecessary gzgetc_ function
+- Use optimized byte swap operations for Microsoft and GNU [Snyder]
+- Fix minor typo in zlib.h comments [Rzesniowiecki]
+
+Changes in 1.2.6 (29 Jan 2012)
+- Update the Pascal interface in contrib/pascal
+- Fix function numbers for gzgetc_ in zlibvc.def files
+- Fix configure.ac for contrib/minizip [Schiffer]
+- Fix large-entry detection in minizip on 64-bit systems [Schiffer]
+- Have ./configure use the compiler return code for error indication
+- Fix CMakeLists.txt for cross compilation [McClure]
+- Fix contrib/minizip/zip.c for 64-bit architectures [Dalsnes]
+- Fix compilation of contrib/minizip on FreeBSD [Marquez]
+- Correct suggested usages in win32/Makefile.msc [Shachar, Horvath]
+- Include io.h for Turbo C / Borland C on all platforms [Truta]
+- Make version explicit in contrib/minizip/configure.ac [Bosmans]
+- Avoid warning for no encryption in contrib/minizip/zip.c [Vollant]
+- Minor cleanup up contrib/minizip/unzip.c [Vollant]
+- Fix bug when compiling minizip with C++ [Vollant]
+- Protect for long name and extra fields in contrib/minizip [Vollant]
+- Avoid some warnings in contrib/minizip [Vollant]
+- Add -I../.. -L../.. to CFLAGS for minizip and miniunzip
+- Add missing libs to minizip linker command
+- Add support for VPATH builds in contrib/minizip
+- Add an --enable-demos option to contrib/minizip/configure
+- Add the generation of configure.log by ./configure
+- Exit when required parameters not provided to win32/Makefile.gcc
+- Have gzputc return the character written instead of the argument
+- Use the -m option on ldconfig for BSD systems [Tobias]
+- Correct in zlib.map when deflateResetKeep was added
+
+Changes in 1.2.5.3 (15 Jan 2012)
+- Restore gzgetc function for binary compatibility
+- Do not use _lseeki64 under Borland C++ [Truta]
+- Update win32/Makefile.msc to build test/*.c [Truta]
+- Remove old/visualc6 given CMakefile and other alternatives
+- Update AS400 build files and documentation [Monnerat]
+- Update win32/Makefile.gcc to build test/*.c [Truta]
+- Permit stronger flushes after Z_BLOCK flushes
+- Avoid extraneous empty blocks when doing empty flushes
+- Permit Z_NULL arguments to deflatePending
+- Allow deflatePrime() to insert bits in the middle of a stream
+- Remove second empty static block for Z_PARTIAL_FLUSH
+- Write out all of the available bits when using Z_BLOCK
+- Insert the first two strings in the hash table after a flush
+
+Changes in 1.2.5.2 (17 Dec 2011)
+- fix ld error: unable to find version dependency 'ZLIB_1.2.5'
+- use relative symlinks for shared libs
+- Avoid searching past window for Z_RLE strategy
+- Assure that high-water mark initialization is always applied in deflate
+- Add assertions to fill_window() in deflate.c to match comments
+- Update python link in README
+- Correct spelling error in gzread.c
+- Fix bug in gzgets() for a concatenated empty gzip stream
+- Correct error in comment for gz_make()
+- Change gzread() and related to ignore junk after gzip streams
+- Allow gzread() and related to continue after gzclearerr()
+- Allow gzrewind() and gzseek() after a premature end-of-file
+- Simplify gzseek() now that raw after gzip is ignored
+- Change gzgetc() to a macro for speed (~40% speedup in testing)
+- Fix gzclose() to return the actual error last encountered
+- Always add large file support for windows
+- Include zconf.h for windows large file support
+- Include zconf.h.cmakein for windows large file support
+- Update zconf.h.cmakein on make distclean
+- Merge vestigial vsnprintf determination from zutil.h to gzguts.h
+- Clarify how gzopen() appends in zlib.h comments
+- Correct documentation of gzdirect() since junk at end now ignored
+- Add a transparent write mode to gzopen() when 'T' is in the mode
+- Update python link in zlib man page
+- Get inffixed.h and MAKEFIXED result to match
 - Add a ./config --solo option to make zlib subset with no library use
-- Add undocumented inflateResetKeep() function for CAB file decoding 
-- Add --cover option to ./configure for gcc coverage testing 
-- Add #define ZLIB_CONST option to use const in the z_stream interface 
-- Add comment to gzdopen() in zlib.h to use dup() when using fileno() 
-- Note behavior of uncompress() to provide as much data as it can 
-- Add files in contrib/minizip to aid in building libminizip 
-- Split off AR options in Makefile.in and configure 
-- Change ON macro to Z_ARG to avoid application conflicts 
-- Facilitate compilation with Borland C++ for pragmas and vsnprintf 
-- Include io.h for Turbo C / Borland C++ 
-- Move example.c and minigzip.c to test/ 
-- Simplify incomplete code table filling in inflate_table() 
-- Remove code from inflate.c and infback.c that is impossible to execute 
-- Test the inflate code with full coverage 
-- Allow deflateSetDictionary, inflateSetDictionary at any time (in raw) 
-- Add deflateResetKeep and fix inflateResetKeep to retain dictionary 
-- Fix gzwrite.c to accommodate reduced memory zlib compilation 
-- Have inflate() with Z_FINISH avoid the allocation of a window 
-- Do not set strm->adler when doing raw inflate 
-- Fix gzeof() to behave just like feof() when read is not past end of file 
-- Fix bug in gzread.c when end-of-file is reached 
-- Avoid use of Z_BUF_ERROR in gz* functions except for premature EOF 
-- Document gzread() capability to read concurrently written files 
-- Remove hard-coding of resource compiler in CMakeLists.txt [Blammo] 
- 
-Changes in 1.2.5.1 (10 Sep 2011) 
-- Update FAQ entry on shared builds (#13) 
-- Avoid symbolic argument to chmod in Makefile.in 
-- Fix bug and add consts in contrib/puff [Oberhumer] 
-- Update contrib/puff/zeros.raw test file to have all block types 
-- Add full coverage test for puff in contrib/puff/Makefile 
-- Fix static-only-build install in Makefile.in 
-- Fix bug in unzGetCurrentFileInfo() in contrib/minizip [Kuno] 
-- Add libz.a dependency to shared in Makefile.in for parallel builds 
-- Spell out "number" (instead of "nb") in zlib.h for total_in, total_out 
-- Replace $(...) with `...` in configure for non-bash sh [Bowler] 
-- Add darwin* to Darwin* and solaris* to SunOS\ 5* in configure [Groffen] 
-- Add solaris* to Linux* in configure to allow gcc use [Groffen] 
-- Add *bsd* to Linux* case in configure [Bar-Lev] 
-- Add inffast.obj to dependencies in win32/Makefile.msc 
-- Correct spelling error in deflate.h [Kohler] 
-- Change libzdll.a again to libz.dll.a (!) in win32/Makefile.gcc 
-- Add test to configure for GNU C looking for gcc in output of $cc -v 
-- Add zlib.pc generation to win32/Makefile.gcc [Weigelt] 
-- Fix bug in zlib.h for _FILE_OFFSET_BITS set and _LARGEFILE64_SOURCE not 
-- Add comment in zlib.h that adler32_combine with len2 < 0 makes no sense 
-- Make NO_DIVIDE option in adler32.c much faster (thanks to John Reiser) 
-- Make stronger test in zconf.h to include unistd.h for LFS 
-- Apply Darwin patches for 64-bit file offsets to contrib/minizip [Slack] 
-- Fix zlib.h LFS support when Z_PREFIX used 
-- Add updated as400 support (removed from old) [Monnerat] 
-- Avoid deflate sensitivity to volatile input data 
-- Avoid division in adler32_combine for NO_DIVIDE 
-- Clarify the use of Z_FINISH with deflateBound() amount of space 
-- Set binary for output file in puff.c 
-- Use u4 type for crc_table to avoid conversion warnings 
-- Apply casts in zlib.h to avoid conversion warnings 
-- Add OF to prototypes for adler32_combine_ and crc32_combine_ [Miller] 
-- Improve inflateSync() documentation to note indeterminancy 
-- Add deflatePending() function to return the amount of pending output 
-- Correct the spelling of "specification" in FAQ [Randers-Pehrson] 
-- Add a check in configure for stdarg.h, use for gzprintf() 
-- Check that pointers fit in ints when gzprint() compiled old style 
-- Add dummy name before $(SHAREDLIBV) in Makefile [Bar-Lev, Bowler] 
-- Delete line in configure that adds -L. libz.a to LDFLAGS [Weigelt] 
-- Add debug records in assmebler code [Londer] 
-- Update RFC references to use http://tools.ietf.org/html/... [Li] 
-- Add --archs option, use of libtool to configure for Mac OS X [Borstel] 
- 
-Changes in 1.2.5 (19 Apr 2010) 
-- Disable visibility attribute in win32/Makefile.gcc [Bar-Lev] 
-- Default to libdir as sharedlibdir in configure [Nieder] 
-- Update copyright dates on modified source files 
-- Update trees.c to be able to generate modified trees.h 
-- Exit configure for MinGW, suggesting win32/Makefile.gcc 
-- Check for NULL path in gz_open [Homurlu] 
- 
-Changes in 1.2.4.5 (18 Apr 2010) 
-- Set sharedlibdir in configure [Torok] 
-- Set LDFLAGS in Makefile.in [Bar-Lev] 
-- Avoid mkdir objs race condition in Makefile.in [Bowler] 
-- Add ZLIB_INTERNAL in front of internal inter-module functions and arrays 
-- Define ZLIB_INTERNAL to hide internal functions and arrays for GNU C 
-- Don't use hidden attribute when it is a warning generator (e.g. Solaris) 
- 
-Changes in 1.2.4.4 (18 Apr 2010) 
-- Fix CROSS_PREFIX executable testing, CHOST extract, mingw* [Torok] 
-- Undefine _LARGEFILE64_SOURCE in zconf.h if it is zero, but not if empty 
-- Try to use bash or ksh regardless of functionality of /bin/sh 
-- Fix configure incompatibility with NetBSD sh 
-- Remove attempt to run under bash or ksh since have better NetBSD fix 
-- Fix win32/Makefile.gcc for MinGW [Bar-Lev] 
-- Add diagnostic messages when using CROSS_PREFIX in configure 
-- Added --sharedlibdir option to configure [Weigelt] 
-- Use hidden visibility attribute when available [Frysinger] 
- 
-Changes in 1.2.4.3 (10 Apr 2010) 
-- Only use CROSS_PREFIX in configure for ar and ranlib if they exist 
-- Use CROSS_PREFIX for nm [Bar-Lev] 
-- Assume _LARGEFILE64_SOURCE defined is equivalent to true 
-- Avoid use of undefined symbols in #if with && and || 
-- Make *64 prototypes in gzguts.h consistent with functions 
-- Add -shared load option for MinGW in configure [Bowler] 
-- Move z_off64_t to public interface, use instead of off64_t 
-- Remove ! from shell test in configure (not portable to Solaris) 
-- Change +0 macro tests to -0 for possibly increased portability 
- 
-Changes in 1.2.4.2 (9 Apr 2010) 
-- Add consistent carriage returns to readme.txt's in masmx86 and masmx64 
-- Really provide prototypes for *64 functions when building without LFS 
-- Only define unlink() in minigzip.c if unistd.h not included 
-- Update README to point to contrib/vstudio project files 
-- Move projects/vc6 to old/ and remove projects/ 
-- Include stdlib.h in minigzip.c for setmode() definition under WinCE 
-- Clean up assembler builds in win32/Makefile.msc [Rowe] 
-- Include sys/types.h for Microsoft for off_t definition 
-- Fix memory leak on error in gz_open() 
-- Symbolize nm as $NM in configure [Weigelt] 
-- Use TEST_LDSHARED instead of LDSHARED to link test programs [Weigelt] 
-- Add +0 to _FILE_OFFSET_BITS and _LFS64_LARGEFILE in case not defined 
-- Fix bug in gzeof() to take into account unused input data 
-- Avoid initialization of structures with variables in puff.c 
-- Updated win32/README-WIN32.txt [Rowe] 
- 
-Changes in 1.2.4.1 (28 Mar 2010) 
-- Remove the use of [a-z] constructs for sed in configure [gentoo 310225] 
-- Remove $(SHAREDLIB) from LIBS in Makefile.in [Creech] 
-- Restore "for debugging" comment on sprintf() in gzlib.c 
-- Remove fdopen for MVS from gzguts.h 
-- Put new README-WIN32.txt in win32 [Rowe] 
-- Add check for shell to configure and invoke another shell if needed 
-- Fix big fat stinking bug in gzseek() on uncompressed files 
-- Remove vestigial F_OPEN64 define in zutil.h 
-- Set and check the value of _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE 
-- Avoid errors on non-LFS systems when applications define LFS macros 
-- Set EXE to ".exe" in configure for MINGW [Kahle] 
-- Match crc32() in crc32.c exactly to the prototype in zlib.h [Sherrill] 
-- Add prefix for cross-compilation in win32/makefile.gcc [Bar-Lev] 
-- Add DLL install in win32/makefile.gcc [Bar-Lev] 
-- Allow Linux* or linux* from uname in configure [Bar-Lev] 
-- Allow ldconfig to be redefined in configure and Makefile.in [Bar-Lev] 
-- Add cross-compilation prefixes to configure [Bar-Lev] 
-- Match type exactly in gz_load() invocation in gzread.c 
-- Match type exactly of zcalloc() in zutil.c to zlib.h alloc_func 
-- Provide prototypes for *64 functions when building zlib without LFS 
-- Don't use -lc when linking shared library on MinGW 
-- Remove errno.h check in configure and vestigial errno code in zutil.h 
- 
-Changes in 1.2.4 (14 Mar 2010) 
-- Fix VER3 extraction in configure for no fourth subversion 
-- Update zlib.3, add docs to Makefile.in to make .pdf out of it 
-- Add zlib.3.pdf to distribution 
-- Don't set error code in gzerror() if passed pointer is NULL 
-- Apply destination directory fixes to CMakeLists.txt [Lowman] 
-- Move #cmakedefine's to a new zconf.in.cmakein 
-- Restore zconf.h for builds that don't use configure or cmake 
-- Add distclean to dummy Makefile for convenience 
-- Update and improve INDEX, README, and FAQ 
-- Update CMakeLists.txt for the return of zconf.h [Lowman] 
-- Update contrib/vstudio/vc9 and vc10 [Vollant] 
-- Change libz.dll.a back to libzdll.a in win32/Makefile.gcc 
-- Apply license and readme changes to contrib/asm686 [Raiter] 
-- Check file name lengths and add -c option in minigzip.c [Li] 
-- Update contrib/amd64 and contrib/masmx86/ [Vollant] 
-- Avoid use of "eof" parameter in trees.c to not shadow library variable 
-- Update make_vms.com for removal of zlibdefs.h [Zinser] 
-- Update assembler code and vstudio projects in contrib [Vollant] 
-- Remove outdated assembler code contrib/masm686 and contrib/asm586 
-- Remove old vc7 and vc8 from contrib/vstudio 
-- Update win32/Makefile.msc, add ZLIB_VER_SUBREVISION [Rowe] 
-- Fix memory leaks in gzclose_r() and gzclose_w(), file leak in gz_open() 
-- Add contrib/gcc_gvmat64 for longest_match and inflate_fast [Vollant] 
-- Remove *64 functions from win32/zlib.def (they're not 64-bit yet) 
-- Fix bug in void-returning vsprintf() case in gzwrite.c 
-- Fix name change from inflate.h in contrib/inflate86/inffas86.c 
-- Check if temporary file exists before removing in make_vms.com [Zinser] 
-- Fix make install and uninstall for --static option 
-- Fix usage of _MSC_VER in gzguts.h and zutil.h [Truta] 
-- Update readme.txt in contrib/masmx64 and masmx86 to assemble 
- 
-Changes in 1.2.3.9 (21 Feb 2010) 
-- Expunge gzio.c 
-- Move as400 build information to old 
-- Fix updates in contrib/minizip and contrib/vstudio 
-- Add const to vsnprintf test in configure to avoid warnings [Weigelt] 
-- Delete zconf.h (made by configure) [Weigelt] 
-- Change zconf.in.h to zconf.h.in per convention [Weigelt] 
-- Check for NULL buf in gzgets() 
-- Return empty string for gzgets() with len == 1 (like fgets()) 
-- Fix description of gzgets() in zlib.h for end-of-file, NULL return 
-- Update minizip to 1.1 [Vollant] 
-- Avoid MSVC loss of data warnings in gzread.c, gzwrite.c 
-- Note in zlib.h that gzerror() should be used to distinguish from EOF 
-- Remove use of snprintf() from gzlib.c 
-- Fix bug in gzseek() 
-- Update contrib/vstudio, adding vc9 and vc10 [Kuno, Vollant] 
-- Fix zconf.h generation in CMakeLists.txt [Lowman] 
-- Improve comments in zconf.h where modified by configure 
- 
-Changes in 1.2.3.8 (13 Feb 2010) 
-- Clean up text files (tabs, trailing whitespace, etc.) [Oberhumer] 
-- Use z_off64_t in gz_zero() and gz_skip() to match state->skip 
-- Avoid comparison problem when sizeof(int) == sizeof(z_off64_t) 
-- Revert to Makefile.in from 1.2.3.6 (live with the clutter) 
-- Fix missing error return in gzflush(), add zlib.h note 
-- Add *64 functions to zlib.map [Levin] 
-- Fix signed/unsigned comparison in gz_comp() 
-- Use SFLAGS when testing shared linking in configure 
-- Add --64 option to ./configure to use -m64 with gcc 
-- Fix ./configure --help to correctly name options 
-- Have make fail if a test fails [Levin] 
-- Avoid buffer overrun in contrib/masmx64/gvmat64.asm [Simpson] 
-- Remove assembler object files from contrib 
- 
-Changes in 1.2.3.7 (24 Jan 2010) 
-- Always gzopen() with O_LARGEFILE if available 
-- Fix gzdirect() to work immediately after gzopen() or gzdopen() 
-- Make gzdirect() more precise when the state changes while reading 
-- Improve zlib.h documentation in many places 
-- Catch memory allocation failure in gz_open() 
-- Complete close operation if seek forward in gzclose_w() fails 
-- Return Z_ERRNO from gzclose_r() if close() fails 
-- Return Z_STREAM_ERROR instead of EOF for gzclose() being passed NULL 
-- Return zero for gzwrite() errors to match zlib.h description 
-- Return -1 on gzputs() error to match zlib.h description 
-- Add zconf.in.h to allow recovery from configure modification [Weigelt] 
-- Fix static library permissions in Makefile.in [Weigelt] 
-- Avoid warnings in configure tests that hide functionality [Weigelt] 
-- Add *BSD and DragonFly to Linux case in configure [gentoo 123571] 
-- Change libzdll.a to libz.dll.a in win32/Makefile.gcc [gentoo 288212] 
-- Avoid access of uninitialized data for first inflateReset2 call [Gomes] 
-- Keep object files in subdirectories to reduce the clutter somewhat 
-- Remove default Makefile and zlibdefs.h, add dummy Makefile 
-- Add new external functions to Z_PREFIX, remove duplicates, z_z_ -> z_ 
-- Remove zlibdefs.h completely -- modify zconf.h instead 
- 
-Changes in 1.2.3.6 (17 Jan 2010) 
-- Avoid void * arithmetic in gzread.c and gzwrite.c 
-- Make compilers happier with const char * for gz_error message 
-- Avoid unused parameter warning in inflate.c 
-- Avoid signed-unsigned comparison warning in inflate.c 
-- Indent #pragma's for traditional C 
-- Fix usage of strwinerror() in glib.c, change to gz_strwinerror() 
-- Correct email address in configure for system options 
-- Update make_vms.com and add make_vms.com to contrib/minizip [Zinser] 
-- Update zlib.map [Brown] 
-- Fix Makefile.in for Solaris 10 make of example64 and minizip64 [Torok] 
-- Apply various fixes to CMakeLists.txt [Lowman] 
-- Add checks on len in gzread() and gzwrite() 
-- Add error message for no more room for gzungetc() 
-- Remove zlib version check in gzwrite() 
-- Defer compression of gzprintf() result until need to 
-- Use snprintf() in gzdopen() if available 
-- Remove USE_MMAP configuration determination (only used by minigzip) 
-- Remove examples/pigz.c (available separately) 
-- Update examples/gun.c to 1.6 
- 
-Changes in 1.2.3.5 (8 Jan 2010) 
-- Add space after #if in zutil.h for some compilers 
-- Fix relatively harmless bug in deflate_fast() [Exarevsky] 
-- Fix same problem in deflate_slow() 
-- Add $(SHAREDLIBV) to LIBS in Makefile.in [Brown] 
-- Add deflate_rle() for faster Z_RLE strategy run-length encoding 
-- Add deflate_huff() for faster Z_HUFFMAN_ONLY encoding 
-- Change name of "write" variable in inffast.c to avoid library collisions 
-- Fix premature EOF from gzread() in gzio.c [Brown] 
-- Use zlib header window size if windowBits is 0 in inflateInit2() 
-- Remove compressBound() call in deflate.c to avoid linking compress.o 
-- Replace use of errno in gz* with functions, support WinCE [Alves] 
-- Provide alternative to perror() in minigzip.c for WinCE [Alves] 
-- Don't use _vsnprintf on later versions of MSVC [Lowman] 
-- Add CMake build script and input file [Lowman] 
-- Update contrib/minizip to 1.1 [Svensson, Vollant] 
-- Moved nintendods directory from contrib to . 
-- Replace gzio.c with a new set of routines with the same functionality 
-- Add gzbuffer(), gzoffset(), gzclose_r(), gzclose_w() as part of above 
-- Update contrib/minizip to 1.1b 
-- Change gzeof() to return 0 on error instead of -1 to agree with zlib.h 
- 
-Changes in 1.2.3.4 (21 Dec 2009) 
-- Use old school .SUFFIXES in Makefile.in for FreeBSD compatibility 
-- Update comments in configure and Makefile.in for default --shared 
-- Fix test -z's in configure [Marquess] 
-- Build examplesh and minigzipsh when not testing 
-- Change NULL's to Z_NULL's in deflate.c and in comments in zlib.h 
-- Import LDFLAGS from the environment in configure 
-- Fix configure to populate SFLAGS with discovered CFLAGS options 
-- Adapt make_vms.com to the new Makefile.in [Zinser] 
-- Add zlib2ansi script for C++ compilation [Marquess] 
-- Add _FILE_OFFSET_BITS=64 test to make test (when applicable) 
-- Add AMD64 assembler code for longest match to contrib [Teterin] 
-- Include options from $SFLAGS when doing $LDSHARED 
-- Simplify 64-bit file support by introducing z_off64_t type 
-- Make shared object files in objs directory to work around old Sun cc 
-- Use only three-part version number for Darwin shared compiles 
-- Add rc option to ar in Makefile.in for when ./configure not run 
-- Add -WI,-rpath,. to LDFLAGS for OSF 1 V4* 
-- Set LD_LIBRARYN32_PATH for SGI IRIX shared compile 
-- Protect against _FILE_OFFSET_BITS being defined when compiling zlib 
-- Rename Makefile.in targets allstatic to static and allshared to shared 
-- Fix static and shared Makefile.in targets to be independent 
-- Correct error return bug in gz_open() by setting state [Brown] 
-- Put spaces before ;;'s in configure for better sh compatibility 
-- Add pigz.c (parallel implementation of gzip) to examples/ 
-- Correct constant in crc32.c to UL [Leventhal] 
-- Reject negative lengths in crc32_combine() 
-- Add inflateReset2() function to work like inflateEnd()/inflateInit2() 
-- Include sys/types.h for _LARGEFILE64_SOURCE [Brown] 
-- Correct typo in doc/algorithm.txt [Janik] 
-- Fix bug in adler32_combine() [Zhu] 
-- Catch missing-end-of-block-code error in all inflates and in puff 
-    Assures that random input to inflate eventually results in an error 
-- Added enough.c (calculation of ENOUGH for inftrees.h) to examples/ 
-- Update ENOUGH and its usage to reflect discovered bounds 
-- Fix gzerror() error report on empty input file [Brown] 
-- Add ush casts in trees.c to avoid pedantic runtime errors 
-- Fix typo in zlib.h uncompress() description [Reiss] 
-- Correct inflate() comments with regard to automatic header detection 
-- Remove deprecation comment on Z_PARTIAL_FLUSH (it stays) 
-- Put new version of gzlog (2.0) in examples with interruption recovery 
-- Add puff compile option to permit invalid distance-too-far streams 
-- Add puff TEST command options, ability to read piped input 
-- Prototype the *64 functions in zlib.h when _FILE_OFFSET_BITS == 64, but 
-  _LARGEFILE64_SOURCE not defined 
-- Fix Z_FULL_FLUSH to truly erase the past by resetting s->strstart 
-- Fix deflateSetDictionary() to use all 32K for output consistency 
-- Remove extraneous #define MIN_LOOKAHEAD in deflate.c (in deflate.h) 
-- Clear bytes after deflate lookahead to avoid use of uninitialized data 
-- Change a limit in inftrees.c to be more transparent to Coverity Prevent 
-- Update win32/zlib.def with exported symbols from zlib.h 
-- Correct spelling errors in zlib.h [Willem, Sobrado] 
-- Allow Z_BLOCK for deflate() to force a new block 
-- Allow negative bits in inflatePrime() to delete existing bit buffer 
-- Add Z_TREES flush option to inflate() to return at end of trees 
-- Add inflateMark() to return current state information for random access 
-- Add Makefile for NintendoDS to contrib [Costa] 
-- Add -w in configure compile tests to avoid spurious warnings [Beucler] 
-- Fix typos in zlib.h comments for deflateSetDictionary() 
-- Fix EOF detection in transparent gzread() [Maier] 
- 
-Changes in 1.2.3.3 (2 October 2006) 
-- Make --shared the default for configure, add a --static option 
-- Add compile option to permit invalid distance-too-far streams 
-- Add inflateUndermine() function which is required to enable above 
-- Remove use of "this" variable name for C++ compatibility [Marquess] 
-- Add testing of shared library in make test, if shared library built 
-- Use ftello() and fseeko() if available instead of ftell() and fseek() 
-- Provide two versions of all functions that use the z_off_t type for 
-  binary compatibility -- a normal version and a 64-bit offset version, 
-  per the Large File Support Extension when _LARGEFILE64_SOURCE is 
-  defined; use the 64-bit versions by default when _FILE_OFFSET_BITS 
-  is defined to be 64 
-- Add a --uname= option to configure to perhaps help with cross-compiling 
- 
-Changes in 1.2.3.2 (3 September 2006) 
-- Turn off silly Borland warnings [Hay] 
-- Use off64_t and define _LARGEFILE64_SOURCE when present 
-- Fix missing dependency on inffixed.h in Makefile.in 
-- Rig configure --shared to build both shared and static [Teredesai, Truta] 
-- Remove zconf.in.h and instead create a new zlibdefs.h file 
-- Fix contrib/minizip/unzip.c non-encrypted after encrypted [Vollant] 
-- Add treebuild.xml (see http://treebuild.metux.de/) [Weigelt] 
- 
-Changes in 1.2.3.1 (16 August 2006) 
-- Add watcom directory with OpenWatcom make files [Daniel] 
-- Remove #undef of FAR in zconf.in.h for MVS [Fedtke] 
-- Update make_vms.com [Zinser] 
-- Use -fPIC for shared build in configure [Teredesai, Nicholson] 
-- Use only major version number for libz.so on IRIX and OSF1 [Reinholdtsen] 
+- Add undocumented inflateResetKeep() function for CAB file decoding
+- Add --cover option to ./configure for gcc coverage testing
+- Add #define ZLIB_CONST option to use const in the z_stream interface
+- Add comment to gzdopen() in zlib.h to use dup() when using fileno()
+- Note behavior of uncompress() to provide as much data as it can
+- Add files in contrib/minizip to aid in building libminizip
+- Split off AR options in Makefile.in and configure
+- Change ON macro to Z_ARG to avoid application conflicts
+- Facilitate compilation with Borland C++ for pragmas and vsnprintf
+- Include io.h for Turbo C / Borland C++
+- Move example.c and minigzip.c to test/
+- Simplify incomplete code table filling in inflate_table()
+- Remove code from inflate.c and infback.c that is impossible to execute
+- Test the inflate code with full coverage
+- Allow deflateSetDictionary, inflateSetDictionary at any time (in raw)
+- Add deflateResetKeep and fix inflateResetKeep to retain dictionary
+- Fix gzwrite.c to accommodate reduced memory zlib compilation
+- Have inflate() with Z_FINISH avoid the allocation of a window
+- Do not set strm->adler when doing raw inflate
+- Fix gzeof() to behave just like feof() when read is not past end of file
+- Fix bug in gzread.c when end-of-file is reached
+- Avoid use of Z_BUF_ERROR in gz* functions except for premature EOF
+- Document gzread() capability to read concurrently written files
+- Remove hard-coding of resource compiler in CMakeLists.txt [Blammo]
+
+Changes in 1.2.5.1 (10 Sep 2011)
+- Update FAQ entry on shared builds (#13)
+- Avoid symbolic argument to chmod in Makefile.in
+- Fix bug and add consts in contrib/puff [Oberhumer]
+- Update contrib/puff/zeros.raw test file to have all block types
+- Add full coverage test for puff in contrib/puff/Makefile
+- Fix static-only-build install in Makefile.in
+- Fix bug in unzGetCurrentFileInfo() in contrib/minizip [Kuno]
+- Add libz.a dependency to shared in Makefile.in for parallel builds
+- Spell out "number" (instead of "nb") in zlib.h for total_in, total_out
+- Replace $(...) with `...` in configure for non-bash sh [Bowler]
+- Add darwin* to Darwin* and solaris* to SunOS\ 5* in configure [Groffen]
+- Add solaris* to Linux* in configure to allow gcc use [Groffen]
+- Add *bsd* to Linux* case in configure [Bar-Lev]
+- Add inffast.obj to dependencies in win32/Makefile.msc
+- Correct spelling error in deflate.h [Kohler]
+- Change libzdll.a again to libz.dll.a (!) in win32/Makefile.gcc
+- Add test to configure for GNU C looking for gcc in output of $cc -v
+- Add zlib.pc generation to win32/Makefile.gcc [Weigelt]
+- Fix bug in zlib.h for _FILE_OFFSET_BITS set and _LARGEFILE64_SOURCE not
+- Add comment in zlib.h that adler32_combine with len2 < 0 makes no sense
+- Make NO_DIVIDE option in adler32.c much faster (thanks to John Reiser)
+- Make stronger test in zconf.h to include unistd.h for LFS
+- Apply Darwin patches for 64-bit file offsets to contrib/minizip [Slack]
+- Fix zlib.h LFS support when Z_PREFIX used
+- Add updated as400 support (removed from old) [Monnerat]
+- Avoid deflate sensitivity to volatile input data
+- Avoid division in adler32_combine for NO_DIVIDE
+- Clarify the use of Z_FINISH with deflateBound() amount of space
+- Set binary for output file in puff.c
+- Use u4 type for crc_table to avoid conversion warnings
+- Apply casts in zlib.h to avoid conversion warnings
+- Add OF to prototypes for adler32_combine_ and crc32_combine_ [Miller]
+- Improve inflateSync() documentation to note indeterminancy
+- Add deflatePending() function to return the amount of pending output
+- Correct the spelling of "specification" in FAQ [Randers-Pehrson]
+- Add a check in configure for stdarg.h, use for gzprintf()
+- Check that pointers fit in ints when gzprint() compiled old style
+- Add dummy name before $(SHAREDLIBV) in Makefile [Bar-Lev, Bowler]
+- Delete line in configure that adds -L. libz.a to LDFLAGS [Weigelt]
+- Add debug records in assmebler code [Londer]
+- Update RFC references to use http://tools.ietf.org/html/... [Li]
+- Add --archs option, use of libtool to configure for Mac OS X [Borstel]
+
+Changes in 1.2.5 (19 Apr 2010)
+- Disable visibility attribute in win32/Makefile.gcc [Bar-Lev]
+- Default to libdir as sharedlibdir in configure [Nieder]
+- Update copyright dates on modified source files
+- Update trees.c to be able to generate modified trees.h
+- Exit configure for MinGW, suggesting win32/Makefile.gcc
+- Check for NULL path in gz_open [Homurlu]
+
+Changes in 1.2.4.5 (18 Apr 2010)
+- Set sharedlibdir in configure [Torok]
+- Set LDFLAGS in Makefile.in [Bar-Lev]
+- Avoid mkdir objs race condition in Makefile.in [Bowler]
+- Add ZLIB_INTERNAL in front of internal inter-module functions and arrays
+- Define ZLIB_INTERNAL to hide internal functions and arrays for GNU C
+- Don't use hidden attribute when it is a warning generator (e.g. Solaris)
+
+Changes in 1.2.4.4 (18 Apr 2010)
+- Fix CROSS_PREFIX executable testing, CHOST extract, mingw* [Torok]
+- Undefine _LARGEFILE64_SOURCE in zconf.h if it is zero, but not if empty
+- Try to use bash or ksh regardless of functionality of /bin/sh
+- Fix configure incompatibility with NetBSD sh
+- Remove attempt to run under bash or ksh since have better NetBSD fix
+- Fix win32/Makefile.gcc for MinGW [Bar-Lev]
+- Add diagnostic messages when using CROSS_PREFIX in configure
+- Added --sharedlibdir option to configure [Weigelt]
+- Use hidden visibility attribute when available [Frysinger]
+
+Changes in 1.2.4.3 (10 Apr 2010)
+- Only use CROSS_PREFIX in configure for ar and ranlib if they exist
+- Use CROSS_PREFIX for nm [Bar-Lev]
+- Assume _LARGEFILE64_SOURCE defined is equivalent to true
+- Avoid use of undefined symbols in #if with && and ||
+- Make *64 prototypes in gzguts.h consistent with functions
+- Add -shared load option for MinGW in configure [Bowler]
+- Move z_off64_t to public interface, use instead of off64_t
+- Remove ! from shell test in configure (not portable to Solaris)
+- Change +0 macro tests to -0 for possibly increased portability
+
+Changes in 1.2.4.2 (9 Apr 2010)
+- Add consistent carriage returns to readme.txt's in masmx86 and masmx64
+- Really provide prototypes for *64 functions when building without LFS
+- Only define unlink() in minigzip.c if unistd.h not included
+- Update README to point to contrib/vstudio project files
+- Move projects/vc6 to old/ and remove projects/
+- Include stdlib.h in minigzip.c for setmode() definition under WinCE
+- Clean up assembler builds in win32/Makefile.msc [Rowe]
+- Include sys/types.h for Microsoft for off_t definition
+- Fix memory leak on error in gz_open()
+- Symbolize nm as $NM in configure [Weigelt]
+- Use TEST_LDSHARED instead of LDSHARED to link test programs [Weigelt]
+- Add +0 to _FILE_OFFSET_BITS and _LFS64_LARGEFILE in case not defined
+- Fix bug in gzeof() to take into account unused input data
+- Avoid initialization of structures with variables in puff.c
+- Updated win32/README-WIN32.txt [Rowe]
+
+Changes in 1.2.4.1 (28 Mar 2010)
+- Remove the use of [a-z] constructs for sed in configure [gentoo 310225]
+- Remove $(SHAREDLIB) from LIBS in Makefile.in [Creech]
+- Restore "for debugging" comment on sprintf() in gzlib.c
+- Remove fdopen for MVS from gzguts.h
+- Put new README-WIN32.txt in win32 [Rowe]
+- Add check for shell to configure and invoke another shell if needed
+- Fix big fat stinking bug in gzseek() on uncompressed files
+- Remove vestigial F_OPEN64 define in zutil.h
+- Set and check the value of _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE
+- Avoid errors on non-LFS systems when applications define LFS macros
+- Set EXE to ".exe" in configure for MINGW [Kahle]
+- Match crc32() in crc32.c exactly to the prototype in zlib.h [Sherrill]
+- Add prefix for cross-compilation in win32/makefile.gcc [Bar-Lev]
+- Add DLL install in win32/makefile.gcc [Bar-Lev]
+- Allow Linux* or linux* from uname in configure [Bar-Lev]
+- Allow ldconfig to be redefined in configure and Makefile.in [Bar-Lev]
+- Add cross-compilation prefixes to configure [Bar-Lev]
+- Match type exactly in gz_load() invocation in gzread.c
+- Match type exactly of zcalloc() in zutil.c to zlib.h alloc_func
+- Provide prototypes for *64 functions when building zlib without LFS
+- Don't use -lc when linking shared library on MinGW
+- Remove errno.h check in configure and vestigial errno code in zutil.h
+
+Changes in 1.2.4 (14 Mar 2010)
+- Fix VER3 extraction in configure for no fourth subversion
+- Update zlib.3, add docs to Makefile.in to make .pdf out of it
+- Add zlib.3.pdf to distribution
+- Don't set error code in gzerror() if passed pointer is NULL
+- Apply destination directory fixes to CMakeLists.txt [Lowman]
+- Move #cmakedefine's to a new zconf.in.cmakein
+- Restore zconf.h for builds that don't use configure or cmake
+- Add distclean to dummy Makefile for convenience
+- Update and improve INDEX, README, and FAQ
+- Update CMakeLists.txt for the return of zconf.h [Lowman]
+- Update contrib/vstudio/vc9 and vc10 [Vollant]
+- Change libz.dll.a back to libzdll.a in win32/Makefile.gcc
+- Apply license and readme changes to contrib/asm686 [Raiter]
+- Check file name lengths and add -c option in minigzip.c [Li]
+- Update contrib/amd64 and contrib/masmx86/ [Vollant]
+- Avoid use of "eof" parameter in trees.c to not shadow library variable
+- Update make_vms.com for removal of zlibdefs.h [Zinser]
+- Update assembler code and vstudio projects in contrib [Vollant]
+- Remove outdated assembler code contrib/masm686 and contrib/asm586
+- Remove old vc7 and vc8 from contrib/vstudio
+- Update win32/Makefile.msc, add ZLIB_VER_SUBREVISION [Rowe]
+- Fix memory leaks in gzclose_r() and gzclose_w(), file leak in gz_open()
+- Add contrib/gcc_gvmat64 for longest_match and inflate_fast [Vollant]
+- Remove *64 functions from win32/zlib.def (they're not 64-bit yet)
+- Fix bug in void-returning vsprintf() case in gzwrite.c
+- Fix name change from inflate.h in contrib/inflate86/inffas86.c
+- Check if temporary file exists before removing in make_vms.com [Zinser]
+- Fix make install and uninstall for --static option
+- Fix usage of _MSC_VER in gzguts.h and zutil.h [Truta]
+- Update readme.txt in contrib/masmx64 and masmx86 to assemble
+
+Changes in 1.2.3.9 (21 Feb 2010)
+- Expunge gzio.c
+- Move as400 build information to old
+- Fix updates in contrib/minizip and contrib/vstudio
+- Add const to vsnprintf test in configure to avoid warnings [Weigelt]
+- Delete zconf.h (made by configure) [Weigelt]
+- Change zconf.in.h to zconf.h.in per convention [Weigelt]
+- Check for NULL buf in gzgets()
+- Return empty string for gzgets() with len == 1 (like fgets())
+- Fix description of gzgets() in zlib.h for end-of-file, NULL return
+- Update minizip to 1.1 [Vollant]
+- Avoid MSVC loss of data warnings in gzread.c, gzwrite.c
+- Note in zlib.h that gzerror() should be used to distinguish from EOF
+- Remove use of snprintf() from gzlib.c
+- Fix bug in gzseek()
+- Update contrib/vstudio, adding vc9 and vc10 [Kuno, Vollant]
+- Fix zconf.h generation in CMakeLists.txt [Lowman]
+- Improve comments in zconf.h where modified by configure
+
+Changes in 1.2.3.8 (13 Feb 2010)
+- Clean up text files (tabs, trailing whitespace, etc.) [Oberhumer]
+- Use z_off64_t in gz_zero() and gz_skip() to match state->skip
+- Avoid comparison problem when sizeof(int) == sizeof(z_off64_t)
+- Revert to Makefile.in from 1.2.3.6 (live with the clutter)
+- Fix missing error return in gzflush(), add zlib.h note
+- Add *64 functions to zlib.map [Levin]
+- Fix signed/unsigned comparison in gz_comp()
+- Use SFLAGS when testing shared linking in configure
+- Add --64 option to ./configure to use -m64 with gcc
+- Fix ./configure --help to correctly name options
+- Have make fail if a test fails [Levin]
+- Avoid buffer overrun in contrib/masmx64/gvmat64.asm [Simpson]
+- Remove assembler object files from contrib
+
+Changes in 1.2.3.7 (24 Jan 2010)
+- Always gzopen() with O_LARGEFILE if available
+- Fix gzdirect() to work immediately after gzopen() or gzdopen()
+- Make gzdirect() more precise when the state changes while reading
+- Improve zlib.h documentation in many places
+- Catch memory allocation failure in gz_open()
+- Complete close operation if seek forward in gzclose_w() fails
+- Return Z_ERRNO from gzclose_r() if close() fails
+- Return Z_STREAM_ERROR instead of EOF for gzclose() being passed NULL
+- Return zero for gzwrite() errors to match zlib.h description
+- Return -1 on gzputs() error to match zlib.h description
+- Add zconf.in.h to allow recovery from configure modification [Weigelt]
+- Fix static library permissions in Makefile.in [Weigelt]
+- Avoid warnings in configure tests that hide functionality [Weigelt]
+- Add *BSD and DragonFly to Linux case in configure [gentoo 123571]
+- Change libzdll.a to libz.dll.a in win32/Makefile.gcc [gentoo 288212]
+- Avoid access of uninitialized data for first inflateReset2 call [Gomes]
+- Keep object files in subdirectories to reduce the clutter somewhat
+- Remove default Makefile and zlibdefs.h, add dummy Makefile
+- Add new external functions to Z_PREFIX, remove duplicates, z_z_ -> z_
+- Remove zlibdefs.h completely -- modify zconf.h instead
+
+Changes in 1.2.3.6 (17 Jan 2010)
+- Avoid void * arithmetic in gzread.c and gzwrite.c
+- Make compilers happier with const char * for gz_error message
+- Avoid unused parameter warning in inflate.c
+- Avoid signed-unsigned comparison warning in inflate.c
+- Indent #pragma's for traditional C
+- Fix usage of strwinerror() in glib.c, change to gz_strwinerror()
+- Correct email address in configure for system options
+- Update make_vms.com and add make_vms.com to contrib/minizip [Zinser]
+- Update zlib.map [Brown]
+- Fix Makefile.in for Solaris 10 make of example64 and minizip64 [Torok]
+- Apply various fixes to CMakeLists.txt [Lowman]
+- Add checks on len in gzread() and gzwrite()
+- Add error message for no more room for gzungetc()
+- Remove zlib version check in gzwrite()
+- Defer compression of gzprintf() result until need to
+- Use snprintf() in gzdopen() if available
+- Remove USE_MMAP configuration determination (only used by minigzip)
+- Remove examples/pigz.c (available separately)
+- Update examples/gun.c to 1.6
+
+Changes in 1.2.3.5 (8 Jan 2010)
+- Add space after #if in zutil.h for some compilers
+- Fix relatively harmless bug in deflate_fast() [Exarevsky]
+- Fix same problem in deflate_slow()
+- Add $(SHAREDLIBV) to LIBS in Makefile.in [Brown]
+- Add deflate_rle() for faster Z_RLE strategy run-length encoding
+- Add deflate_huff() for faster Z_HUFFMAN_ONLY encoding
+- Change name of "write" variable in inffast.c to avoid library collisions
+- Fix premature EOF from gzread() in gzio.c [Brown]
+- Use zlib header window size if windowBits is 0 in inflateInit2()
+- Remove compressBound() call in deflate.c to avoid linking compress.o
+- Replace use of errno in gz* with functions, support WinCE [Alves]
+- Provide alternative to perror() in minigzip.c for WinCE [Alves]
+- Don't use _vsnprintf on later versions of MSVC [Lowman]
+- Add CMake build script and input file [Lowman]
+- Update contrib/minizip to 1.1 [Svensson, Vollant]
+- Moved nintendods directory from contrib to .
+- Replace gzio.c with a new set of routines with the same functionality
+- Add gzbuffer(), gzoffset(), gzclose_r(), gzclose_w() as part of above
+- Update contrib/minizip to 1.1b
+- Change gzeof() to return 0 on error instead of -1 to agree with zlib.h
+
+Changes in 1.2.3.4 (21 Dec 2009)
+- Use old school .SUFFIXES in Makefile.in for FreeBSD compatibility
+- Update comments in configure and Makefile.in for default --shared
+- Fix test -z's in configure [Marquess]
+- Build examplesh and minigzipsh when not testing
+- Change NULL's to Z_NULL's in deflate.c and in comments in zlib.h
+- Import LDFLAGS from the environment in configure
+- Fix configure to populate SFLAGS with discovered CFLAGS options
+- Adapt make_vms.com to the new Makefile.in [Zinser]
+- Add zlib2ansi script for C++ compilation [Marquess]
+- Add _FILE_OFFSET_BITS=64 test to make test (when applicable)
+- Add AMD64 assembler code for longest match to contrib [Teterin]
+- Include options from $SFLAGS when doing $LDSHARED
+- Simplify 64-bit file support by introducing z_off64_t type
+- Make shared object files in objs directory to work around old Sun cc
+- Use only three-part version number for Darwin shared compiles
+- Add rc option to ar in Makefile.in for when ./configure not run
+- Add -WI,-rpath,. to LDFLAGS for OSF 1 V4*
+- Set LD_LIBRARYN32_PATH for SGI IRIX shared compile
+- Protect against _FILE_OFFSET_BITS being defined when compiling zlib
+- Rename Makefile.in targets allstatic to static and allshared to shared
+- Fix static and shared Makefile.in targets to be independent
+- Correct error return bug in gz_open() by setting state [Brown]
+- Put spaces before ;;'s in configure for better sh compatibility
+- Add pigz.c (parallel implementation of gzip) to examples/
+- Correct constant in crc32.c to UL [Leventhal]
+- Reject negative lengths in crc32_combine()
+- Add inflateReset2() function to work like inflateEnd()/inflateInit2()
+- Include sys/types.h for _LARGEFILE64_SOURCE [Brown]
+- Correct typo in doc/algorithm.txt [Janik]
+- Fix bug in adler32_combine() [Zhu]
+- Catch missing-end-of-block-code error in all inflates and in puff
+    Assures that random input to inflate eventually results in an error
+- Added enough.c (calculation of ENOUGH for inftrees.h) to examples/
+- Update ENOUGH and its usage to reflect discovered bounds
+- Fix gzerror() error report on empty input file [Brown]
+- Add ush casts in trees.c to avoid pedantic runtime errors
+- Fix typo in zlib.h uncompress() description [Reiss]
+- Correct inflate() comments with regard to automatic header detection
+- Remove deprecation comment on Z_PARTIAL_FLUSH (it stays)
+- Put new version of gzlog (2.0) in examples with interruption recovery
+- Add puff compile option to permit invalid distance-too-far streams
+- Add puff TEST command options, ability to read piped input
+- Prototype the *64 functions in zlib.h when _FILE_OFFSET_BITS == 64, but
+  _LARGEFILE64_SOURCE not defined
+- Fix Z_FULL_FLUSH to truly erase the past by resetting s->strstart
+- Fix deflateSetDictionary() to use all 32K for output consistency
+- Remove extraneous #define MIN_LOOKAHEAD in deflate.c (in deflate.h)
+- Clear bytes after deflate lookahead to avoid use of uninitialized data
+- Change a limit in inftrees.c to be more transparent to Coverity Prevent
+- Update win32/zlib.def with exported symbols from zlib.h
+- Correct spelling errors in zlib.h [Willem, Sobrado]
+- Allow Z_BLOCK for deflate() to force a new block
+- Allow negative bits in inflatePrime() to delete existing bit buffer
+- Add Z_TREES flush option to inflate() to return at end of trees
+- Add inflateMark() to return current state information for random access
+- Add Makefile for NintendoDS to contrib [Costa]
+- Add -w in configure compile tests to avoid spurious warnings [Beucler]
+- Fix typos in zlib.h comments for deflateSetDictionary()
+- Fix EOF detection in transparent gzread() [Maier]
+
+Changes in 1.2.3.3 (2 October 2006)
+- Make --shared the default for configure, add a --static option
+- Add compile option to permit invalid distance-too-far streams
+- Add inflateUndermine() function which is required to enable above
+- Remove use of "this" variable name for C++ compatibility [Marquess]
+- Add testing of shared library in make test, if shared library built
+- Use ftello() and fseeko() if available instead of ftell() and fseek()
+- Provide two versions of all functions that use the z_off_t type for
+  binary compatibility -- a normal version and a 64-bit offset version,
+  per the Large File Support Extension when _LARGEFILE64_SOURCE is
+  defined; use the 64-bit versions by default when _FILE_OFFSET_BITS
+  is defined to be 64
+- Add a --uname= option to configure to perhaps help with cross-compiling
+
+Changes in 1.2.3.2 (3 September 2006)
+- Turn off silly Borland warnings [Hay]
+- Use off64_t and define _LARGEFILE64_SOURCE when present
+- Fix missing dependency on inffixed.h in Makefile.in
+- Rig configure --shared to build both shared and static [Teredesai, Truta]
+- Remove zconf.in.h and instead create a new zlibdefs.h file
+- Fix contrib/minizip/unzip.c non-encrypted after encrypted [Vollant]
+- Add treebuild.xml (see http://treebuild.metux.de/) [Weigelt]
+
+Changes in 1.2.3.1 (16 August 2006)
+- Add watcom directory with OpenWatcom make files [Daniel]
+- Remove #undef of FAR in zconf.in.h for MVS [Fedtke]
+- Update make_vms.com [Zinser]
+- Use -fPIC for shared build in configure [Teredesai, Nicholson]
+- Use only major version number for libz.so on IRIX and OSF1 [Reinholdtsen]
 - Use fdopen() (not _fdopen()) for Interix in zutil.h [Bäck]
-- Add some FAQ entries about the contrib directory 
-- Update the MVS question in the FAQ 
-- Avoid extraneous reads after EOF in gzio.c [Brown] 
-- Correct spelling of "successfully" in gzio.c [Randers-Pehrson] 
-- Add comments to zlib.h about gzerror() usage [Brown] 
-- Set extra flags in gzip header in gzopen() like deflate() does 
-- Make configure options more compatible with double-dash conventions 
-  [Weigelt] 
-- Clean up compilation under Solaris SunStudio cc [Rowe, Reinholdtsen] 
-- Fix uninstall target in Makefile.in [Truta] 
-- Add pkgconfig support [Weigelt] 
-- Use $(DESTDIR) macro in Makefile.in [Reinholdtsen, Weigelt] 
-- Replace set_data_type() with a more accurate detect_data_type() in 
-  trees.c, according to the txtvsbin.txt document [Truta] 
-- Swap the order of #include <stdio.h> and #include "zlib.h" in 
-  gzio.c, example.c and minigzip.c [Truta] 
-- Shut up annoying VS2005 warnings about standard C deprecation [Rowe, 
-  Truta] (where?) 
-- Fix target "clean" from win32/Makefile.bor [Truta] 
-- Create .pdb and .manifest files in win32/makefile.msc [Ziegler, Rowe] 
-- Update zlib www home address in win32/DLL_FAQ.txt [Truta] 
-- Update contrib/masmx86/inffas32.asm for VS2005 [Vollant, Van Wassenhove] 
-- Enable browse info in the "Debug" and "ASM Debug" configurations in 
-  the Visual C++ 6 project, and set (non-ASM) "Debug" as default [Truta] 
-- Add pkgconfig support [Weigelt] 
-- Add ZLIB_VER_MAJOR, ZLIB_VER_MINOR and ZLIB_VER_REVISION in zlib.h, 
-  for use in win32/zlib1.rc [Polushin, Rowe, Truta] 
-- Add a document that explains the new text detection scheme to 
-  doc/txtvsbin.txt [Truta] 
-- Add rfc1950.txt, rfc1951.txt and rfc1952.txt to doc/ [Truta] 
-- Move algorithm.txt into doc/ [Truta] 
-- Synchronize FAQ with website 
-- Fix compressBound(), was low for some pathological cases [Fearnley] 
-- Take into account wrapper variations in deflateBound() 
-- Set examples/zpipe.c input and output to binary mode for Windows 
-- Update examples/zlib_how.html with new zpipe.c (also web site) 
-- Fix some warnings in examples/gzlog.c and examples/zran.c (it seems 
-  that gcc became pickier in 4.0) 
-- Add zlib.map for Linux: "All symbols from zlib-1.1.4 remain 
-  un-versioned, the patch adds versioning only for symbols introduced in 
-  zlib-1.2.0 or later.  It also declares as local those symbols which are 
-  not designed to be exported." [Levin] 
-- Update Z_PREFIX list in zconf.in.h, add --zprefix option to configure 
-- Do not initialize global static by default in trees.c, add a response 
-  NO_INIT_GLOBAL_POINTERS to initialize them if needed [Marquess] 
-- Don't use strerror() in gzio.c under WinCE [Yakimov] 
-- Don't use errno.h in zutil.h under WinCE [Yakimov] 
-- Move arguments for AR to its usage to allow replacing ar [Marot] 
-- Add HAVE_VISIBILITY_PRAGMA in zconf.in.h for Mozilla [Randers-Pehrson] 
-- Improve inflateInit() and inflateInit2() documentation 
-- Fix structure size comment in inflate.h 
-- Change configure help option from --h* to --help [Santos] 
- 
-Changes in 1.2.3 (18 July 2005) 
-- Apply security vulnerability fixes to contrib/infback9 as well 
-- Clean up some text files (carriage returns, trailing space) 
-- Update testzlib, vstudio, masmx64, and masmx86 in contrib [Vollant] 
- 
-Changes in 1.2.2.4 (11 July 2005) 
-- Add inflatePrime() function for starting inflation at bit boundary 
-- Avoid some Visual C warnings in deflate.c 
-- Avoid more silly Visual C warnings in inflate.c and inftrees.c for 64-bit 
-  compile 
-- Fix some spelling errors in comments [Betts] 
-- Correct inflateInit2() error return documentation in zlib.h 
-- Add zran.c example of compressed data random access to examples 
-  directory, shows use of inflatePrime() 
-- Fix cast for assignments to strm->state in inflate.c and infback.c 
-- Fix zlibCompileFlags() in zutil.c to use 1L for long shifts [Oberhumer] 
-- Move declarations of gf2 functions to right place in crc32.c [Oberhumer] 
-- Add cast in trees.c t avoid a warning [Oberhumer] 
-- Avoid some warnings in fitblk.c, gun.c, gzjoin.c in examples [Oberhumer] 
-- Update make_vms.com [Zinser] 
-- Initialize state->write in inflateReset() since copied in inflate_fast() 
-- Be more strict on incomplete code sets in inflate_table() and increase 
-  ENOUGH and MAXD -- this repairs a possible security vulnerability for 
-  invalid inflate input.  Thanks to Tavis Ormandy and Markus Oberhumer for 
-  discovering the vulnerability and providing test cases. 
-- Add ia64 support to configure for HP-UX [Smith] 
-- Add error return to gzread() for format or i/o error [Levin] 
-- Use malloc.h for OS/2 [Necasek] 
- 
-Changes in 1.2.2.3 (27 May 2005) 
-- Replace 1U constants in inflate.c and inftrees.c for 64-bit compile 
-- Typecast fread() return values in gzio.c [Vollant] 
-- Remove trailing space in minigzip.c outmode (VC++ can't deal with it) 
-- Fix crc check bug in gzread() after gzungetc() [Heiner] 
-- Add the deflateTune() function to adjust internal compression parameters 
-- Add a fast gzip decompressor, gun.c, to examples (use of inflateBack) 
-- Remove an incorrect assertion in examples/zpipe.c 
-- Add C++ wrapper in infback9.h [Donais] 
-- Fix bug in inflateCopy() when decoding fixed codes 
-- Note in zlib.h how much deflateSetDictionary() actually uses 
-- Remove USE_DICT_HEAD in deflate.c (would mess up inflate if used) 
-- Add _WIN32_WCE to define WIN32 in zconf.in.h [Spencer] 
-- Don't include stderr.h or errno.h for _WIN32_WCE in zutil.h [Spencer] 
-- Add gzdirect() function to indicate transparent reads 
-- Update contrib/minizip [Vollant] 
-- Fix compilation of deflate.c when both ASMV and FASTEST [Oberhumer] 
-- Add casts in crc32.c to avoid warnings [Oberhumer] 
-- Add contrib/masmx64 [Vollant] 
-- Update contrib/asm586, asm686, masmx86, testzlib, vstudio [Vollant] 
- 
-Changes in 1.2.2.2 (30 December 2004) 
-- Replace structure assignments in deflate.c and inflate.c with zmemcpy to 
-  avoid implicit memcpy calls (portability for no-library compilation) 
-- Increase sprintf() buffer size in gzdopen() to allow for large numbers 
-- Add INFLATE_STRICT to check distances against zlib header 
-- Improve WinCE errno handling and comments [Chang] 
-- Remove comment about no gzip header processing in FAQ 
-- Add Z_FIXED strategy option to deflateInit2() to force fixed trees 
-- Add updated make_vms.com [Coghlan], update README 
-- Create a new "examples" directory, move gzappend.c there, add zpipe.c, 
-  fitblk.c, gzlog.[ch], gzjoin.c, and zlib_how.html. 
-- Add FAQ entry and comments in deflate.c on uninitialized memory access 
-- Add Solaris 9 make options in configure [Gilbert] 
-- Allow strerror() usage in gzio.c for STDC 
-- Fix DecompressBuf in contrib/delphi/ZLib.pas [ManChesTer] 
-- Update contrib/masmx86/inffas32.asm and gvmat32.asm [Vollant] 
-- Use z_off_t for adler32_combine() and crc32_combine() lengths 
-- Make adler32() much faster for small len 
-- Use OS_CODE in deflate() default gzip header 
- 
-Changes in 1.2.2.1 (31 October 2004) 
-- Allow inflateSetDictionary() call for raw inflate 
-- Fix inflate header crc check bug for file names and comments 
-- Add deflateSetHeader() and gz_header structure for custom gzip headers 
-- Add inflateGetheader() to retrieve gzip headers 
-- Add crc32_combine() and adler32_combine() functions 
-- Add alloc_func, free_func, in_func, out_func to Z_PREFIX list 
-- Use zstreamp consistently in zlib.h (inflate_back functions) 
-- Remove GUNZIP condition from definition of inflate_mode in inflate.h 
-  and in contrib/inflate86/inffast.S [Truta, Anderson] 
-- Add support for AMD64 in contrib/inflate86/inffas86.c [Anderson] 
-- Update projects/README.projects and projects/visualc6 [Truta] 
-- Update win32/DLL_FAQ.txt [Truta] 
-- Avoid warning under NO_GZCOMPRESS in gzio.c; fix typo [Truta] 
-- Deprecate Z_ASCII; use Z_TEXT instead [Truta] 
-- Use a new algorithm for setting strm->data_type in trees.c [Truta] 
-- Do not define an exit() prototype in zutil.c unless DEBUG defined 
-- Remove prototype of exit() from zutil.c, example.c, minigzip.c [Truta] 
-- Add comment in zlib.h for Z_NO_FLUSH parameter to deflate() 
-- Fix Darwin build version identification [Peterson] 
- 
-Changes in 1.2.2 (3 October 2004) 
-- Update zlib.h comments on gzip in-memory processing 
-- Set adler to 1 in inflateReset() to support Java test suite [Walles] 
-- Add contrib/dotzlib [Ravn] 
-- Update win32/DLL_FAQ.txt [Truta] 
-- Update contrib/minizip [Vollant] 
-- Move contrib/visual-basic.txt to old/ [Truta] 
-- Fix assembler builds in projects/visualc6/ [Truta] 
- 
-Changes in 1.2.1.2 (9 September 2004) 
-- Update INDEX file 
-- Fix trees.c to update strm->data_type (no one ever noticed!) 
-- Fix bug in error case in inflate.c, infback.c, and infback9.c [Brown] 
-- Add "volatile" to crc table flag declaration (for DYNAMIC_CRC_TABLE) 
-- Add limited multitasking protection to DYNAMIC_CRC_TABLE 
-- Add NO_vsnprintf for VMS in zutil.h [Mozilla] 
-- Don't declare strerror() under VMS [Mozilla] 
-- Add comment to DYNAMIC_CRC_TABLE to use get_crc_table() to initialize 
-- Update contrib/ada [Anisimkov] 
-- Update contrib/minizip [Vollant] 
-- Fix configure to not hardcode directories for Darwin [Peterson] 
-- Fix gzio.c to not return error on empty files [Brown] 
-- Fix indentation; update version in contrib/delphi/ZLib.pas and 
-  contrib/pascal/zlibpas.pas [Truta] 
-- Update mkasm.bat in contrib/masmx86 [Truta] 
-- Update contrib/untgz [Truta] 
-- Add projects/README.projects [Truta] 
-- Add project for MS Visual C++ 6.0 in projects/visualc6 [Cadieux, Truta] 
-- Update win32/DLL_FAQ.txt [Truta] 
-- Update list of Z_PREFIX symbols in zconf.h [Randers-Pehrson, Truta] 
-- Remove an unnecessary assignment to curr in inftrees.c [Truta] 
-- Add OS/2 to exe builds in configure [Poltorak] 
-- Remove err dummy parameter in zlib.h [Kientzle] 
- 
-Changes in 1.2.1.1 (9 January 2004) 
-- Update email address in README 
-- Several FAQ updates 
-- Fix a big fat bug in inftrees.c that prevented decoding valid 
-  dynamic blocks with only literals and no distance codes -- 
-  Thanks to "Hot Emu" for the bug report and sample file 
-- Add a note to puff.c on no distance codes case. 
- 
-Changes in 1.2.1 (17 November 2003) 
-- Remove a tab in contrib/gzappend/gzappend.c 
-- Update some interfaces in contrib for new zlib functions 
-- Update zlib version number in some contrib entries 
-- Add Windows CE definition for ptrdiff_t in zutil.h [Mai, Truta] 
-- Support shared libraries on Hurd and KFreeBSD [Brown] 
-- Fix error in NO_DIVIDE option of adler32.c 
- 
-Changes in 1.2.0.8 (4 November 2003) 
-- Update version in contrib/delphi/ZLib.pas and contrib/pascal/zlibpas.pas 
-- Add experimental NO_DIVIDE #define in adler32.c 
-    - Possibly faster on some processors (let me know if it is) 
-- Correct Z_BLOCK to not return on first inflate call if no wrap 
-- Fix strm->data_type on inflate() return to correctly indicate EOB 
-- Add deflatePrime() function for appending in the middle of a byte 
-- Add contrib/gzappend for an example of appending to a stream 
-- Update win32/DLL_FAQ.txt [Truta] 
-- Delete Turbo C comment in README [Truta] 
-- Improve some indentation in zconf.h [Truta] 
-- Fix infinite loop on bad input in configure script [Church] 
-- Fix gzeof() for concatenated gzip files [Johnson] 
-- Add example to contrib/visual-basic.txt [Michael B.] 
-- Add -p to mkdir's in Makefile.in [vda] 
-- Fix configure to properly detect presence or lack of printf functions 
-- Add AS400 support [Monnerat] 
-- Add a little Cygwin support [Wilson] 
- 
-Changes in 1.2.0.7 (21 September 2003) 
-- Correct some debug formats in contrib/infback9 
-- Cast a type in a debug statement in trees.c 
-- Change search and replace delimiter in configure from % to # [Beebe] 
-- Update contrib/untgz to 0.2 with various fixes [Truta] 
-- Add build support for Amiga [Nikl] 
-- Remove some directories in old that have been updated to 1.2 
-- Add dylib building for Mac OS X in configure and Makefile.in 
-- Remove old distribution stuff from Makefile 
-- Update README to point to DLL_FAQ.txt, and add comment on Mac OS X 
-- Update links in README 
- 
-Changes in 1.2.0.6 (13 September 2003) 
-- Minor FAQ updates 
-- Update contrib/minizip to 1.00 [Vollant] 
-- Remove test of gz functions in example.c when GZ_COMPRESS defined [Truta] 
-- Update POSTINC comment for 68060 [Nikl] 
-- Add contrib/infback9 with deflate64 decoding (unsupported) 
-- For MVS define NO_vsnprintf and undefine FAR [van Burik] 
-- Add pragma for fdopen on MVS [van Burik] 
- 
-Changes in 1.2.0.5 (8 September 2003) 
-- Add OF to inflateBackEnd() declaration in zlib.h 
-- Remember start when using gzdopen in the middle of a file 
-- Use internal off_t counters in gz* functions to properly handle seeks 
-- Perform more rigorous check for distance-too-far in inffast.c 
-- Add Z_BLOCK flush option to return from inflate at block boundary 
-- Set strm->data_type on return from inflate 
-    - Indicate bits unused, if at block boundary, and if in last block 
-- Replace size_t with ptrdiff_t in crc32.c, and check for correct size 
-- Add condition so old NO_DEFLATE define still works for compatibility 
-- FAQ update regarding the Windows DLL [Truta] 
-- INDEX update: add qnx entry, remove aix entry [Truta] 
-- Install zlib.3 into mandir [Wilson] 
-- Move contrib/zlib_dll_FAQ.txt to win32/DLL_FAQ.txt; update [Truta] 
-- Adapt the zlib interface to the new DLL convention guidelines [Truta] 
-- Introduce ZLIB_WINAPI macro to allow the export of functions using 
-  the WINAPI calling convention, for Visual Basic [Vollant, Truta] 
-- Update msdos and win32 scripts and makefiles [Truta] 
-- Export symbols by name, not by ordinal, in win32/zlib.def [Truta] 
-- Add contrib/ada [Anisimkov] 
-- Move asm files from contrib/vstudio/vc70_32 to contrib/asm386 [Truta] 
-- Rename contrib/asm386 to contrib/masmx86 [Truta, Vollant] 
-- Add contrib/masm686 [Truta] 
-- Fix offsets in contrib/inflate86 and contrib/masmx86/inffas32.asm 
-  [Truta, Vollant] 
-- Update contrib/delphi; rename to contrib/pascal; add example [Truta] 
-- Remove contrib/delphi2; add a new contrib/delphi [Truta] 
-- Avoid inclusion of the nonstandard <memory.h> in contrib/iostream, 
-  and fix some method prototypes [Truta] 
-- Fix the ZCR_SEED2 constant to avoid warnings in contrib/minizip 
-  [Truta] 
-- Avoid the use of backslash (\) in contrib/minizip [Vollant] 
-- Fix file time handling in contrib/untgz; update makefiles [Truta] 
-- Update contrib/vstudio/vc70_32 to comply with the new DLL guidelines 
-  [Vollant] 
-- Remove contrib/vstudio/vc15_16 [Vollant] 
-- Rename contrib/vstudio/vc70_32 to contrib/vstudio/vc7 [Truta] 
-- Update README.contrib [Truta] 
-- Invert the assignment order of match_head and s->prev[...] in 
-  INSERT_STRING [Truta] 
-- Compare TOO_FAR with 32767 instead of 32768, to avoid 16-bit warnings 
-  [Truta] 
-- Compare function pointers with 0, not with NULL or Z_NULL [Truta] 
-- Fix prototype of syncsearch in inflate.c [Truta] 
-- Introduce ASMINF macro to be enabled when using an ASM implementation 
-  of inflate_fast [Truta] 
-- Change NO_DEFLATE to NO_GZCOMPRESS [Truta] 
-- Modify test_gzio in example.c to take a single file name as a 
-  parameter [Truta] 
-- Exit the example.c program if gzopen fails [Truta] 
-- Add type casts around strlen in example.c [Truta] 
-- Remove casting to sizeof in minigzip.c; give a proper type 
-  to the variable compared with SUFFIX_LEN [Truta] 
-- Update definitions of STDC and STDC99 in zconf.h [Truta] 
-- Synchronize zconf.h with the new Windows DLL interface [Truta] 
-- Use SYS16BIT instead of __32BIT__ to distinguish between 
-  16- and 32-bit platforms [Truta] 
-- Use far memory allocators in small 16-bit memory models for 
-  Turbo C [Truta] 
-- Add info about the use of ASMV, ASMINF and ZLIB_WINAPI in 
-  zlibCompileFlags [Truta] 
-- Cygwin has vsnprintf [Wilson] 
-- In Windows16, OS_CODE is 0, as in MSDOS [Truta] 
-- In Cygwin, OS_CODE is 3 (Unix), not 11 (Windows32) [Wilson] 
- 
-Changes in 1.2.0.4 (10 August 2003) 
-- Minor FAQ updates 
-- Be more strict when checking inflateInit2's windowBits parameter 
-- Change NO_GUNZIP compile option to NO_GZIP to cover deflate as well 
-- Add gzip wrapper option to deflateInit2 using windowBits 
-- Add updated QNX rule in configure and qnx directory [Bonnefoy] 
-- Make inflate distance-too-far checks more rigorous 
-- Clean up FAR usage in inflate 
-- Add casting to sizeof() in gzio.c and minigzip.c 
- 
-Changes in 1.2.0.3 (19 July 2003) 
-- Fix silly error in gzungetc() implementation [Vollant] 
-- Update contrib/minizip and contrib/vstudio [Vollant] 
-- Fix printf format in example.c 
-- Correct cdecl support in zconf.in.h [Anisimkov] 
-- Minor FAQ updates 
- 
-Changes in 1.2.0.2 (13 July 2003) 
-- Add ZLIB_VERNUM in zlib.h for numerical preprocessor comparisons 
-- Attempt to avoid warnings in crc32.c for pointer-int conversion 
-- Add AIX to configure, remove aix directory [Bakker] 
-- Add some casts to minigzip.c 
-- Improve checking after insecure sprintf() or vsprintf() calls 
-- Remove #elif's from crc32.c 
-- Change leave label to inf_leave in inflate.c and infback.c to avoid 
-  library conflicts 
-- Remove inflate gzip decoding by default--only enable gzip decoding by 
-  special request for stricter backward compatibility 
-- Add zlibCompileFlags() function to return compilation information 
-- More typecasting in deflate.c to avoid warnings 
-- Remove leading underscore from _Capital #defines [Truta] 
-- Fix configure to link shared library when testing 
-- Add some Windows CE target adjustments [Mai] 
-- Remove #define ZLIB_DLL in zconf.h [Vollant] 
-- Add zlib.3 [Rodgers] 
-- Update RFC URL in deflate.c and algorithm.txt [Mai] 
-- Add zlib_dll_FAQ.txt to contrib [Truta] 
-- Add UL to some constants [Truta] 
-- Update minizip and vstudio [Vollant] 
-- Remove vestigial NEED_DUMMY_RETURN from zconf.in.h 
-- Expand use of NO_DUMMY_DECL to avoid all dummy structures 
-- Added iostream3 to contrib [Schwardt] 
-- Replace rewind() with fseek() for WinCE [Truta] 
-- Improve setting of zlib format compression level flags 
-    - Report 0 for huffman and rle strategies and for level == 0 or 1 
-    - Report 2 only for level == 6 
-- Only deal with 64K limit when necessary at compile time [Truta] 
-- Allow TOO_FAR check to be turned off at compile time [Truta] 
-- Add gzclearerr() function [Souza] 
-- Add gzungetc() function 
- 
-Changes in 1.2.0.1 (17 March 2003) 
-- Add Z_RLE strategy for run-length encoding [Truta] 
-    - When Z_RLE requested, restrict matches to distance one 
-    - Update zlib.h, minigzip.c, gzopen(), gzdopen() for Z_RLE 
-- Correct FASTEST compilation to allow level == 0 
-- Clean up what gets compiled for FASTEST 
-- Incorporate changes to zconf.in.h [Vollant] 
-    - Refine detection of Turbo C need for dummy returns 
-    - Refine ZLIB_DLL compilation 
-    - Include additional header file on VMS for off_t typedef 
-- Try to use _vsnprintf where it supplants vsprintf [Vollant] 
-- Add some casts in inffast.c 
-- Enchance comments in zlib.h on what happens if gzprintf() tries to 
-  write more than 4095 bytes before compression 
-- Remove unused state from inflateBackEnd() 
-- Remove exit(0) from minigzip.c, example.c 
-- Get rid of all those darn tabs 
-- Add "check" target to Makefile.in that does the same thing as "test" 
-- Add "mostlyclean" and "maintainer-clean" targets to Makefile.in 
-- Update contrib/inflate86 [Anderson] 
-- Update contrib/testzlib, contrib/vstudio, contrib/minizip [Vollant] 
-- Add msdos and win32 directories with makefiles [Truta] 
-- More additions and improvements to the FAQ 
- 
-Changes in 1.2.0 (9 March 2003) 
-- New and improved inflate code 
-    - About 20% faster 
-    - Does not allocate 32K window unless and until needed 
-    - Automatically detects and decompresses gzip streams 
-    - Raw inflate no longer needs an extra dummy byte at end 
-    - Added inflateBack functions using a callback interface--even faster 
-      than inflate, useful for file utilities (gzip, zip) 
-    - Added inflateCopy() function to record state for random access on 
-      externally generated deflate streams (e.g. in gzip files) 
-    - More readable code (I hope) 
-- New and improved crc32() 
-    - About 50% faster, thanks to suggestions from Rodney Brown 
-- Add deflateBound() and compressBound() functions 
-- Fix memory leak in deflateInit2() 
-- Permit setting dictionary for raw deflate (for parallel deflate) 
-- Fix const declaration for gzwrite() 
-- Check for some malloc() failures in gzio.c 
-- Fix bug in gzopen() on single-byte file 0x1f 
-- Fix bug in gzread() on concatenated file with 0x1f at end of buffer 
-  and next buffer doesn't start with 0x8b 
-- Fix uncompress() to return Z_DATA_ERROR on truncated input 
-- Free memory at end of example.c 
-- Remove MAX #define in trees.c (conflicted with some libraries) 
-- Fix static const's in deflate.c, gzio.c, and zutil.[ch] 
-- Declare malloc() and free() in gzio.c if STDC not defined 
-- Use malloc() instead of calloc() in zutil.c if int big enough 
-- Define STDC for AIX 
-- Add aix/ with approach for compiling shared library on AIX 
-- Add HP-UX support for shared libraries in configure 
-- Add OpenUNIX support for shared libraries in configure 
-- Use $cc instead of gcc to build shared library 
-- Make prefix directory if needed when installing 
-- Correct Macintosh avoidance of typedef Byte in zconf.h 
-- Correct Turbo C memory allocation when under Linux 
-- Use libz.a instead of -lz in Makefile (assure use of compiled library) 
-- Update configure to check for snprintf or vsnprintf functions and their 
-  return value, warn during make if using an insecure function 
-- Fix configure problem with compile-time knowledge of HAVE_UNISTD_H that 
-  is lost when library is used--resolution is to build new zconf.h 
-- Documentation improvements (in zlib.h): 
-    - Document raw deflate and inflate 
-    - Update RFCs URL 
-    - Point out that zlib and gzip formats are different 
-    - Note that Z_BUF_ERROR is not fatal 
-    - Document string limit for gzprintf() and possible buffer overflow 
-    - Note requirement on avail_out when flushing 
-    - Note permitted values of flush parameter of inflate() 
-- Add some FAQs (and even answers) to the FAQ 
-- Add contrib/inflate86/ for x86 faster inflate 
-- Add contrib/blast/ for PKWare Data Compression Library decompression 
-- Add contrib/puff/ simple inflate for deflate format description 
- 
-Changes in 1.1.4 (11 March 2002) 
-- ZFREE was repeated on same allocation on some error conditions. 
-  This creates a security problem described in 
-  http://www.zlib.org/advisory-2002-03-11.txt 
-- Returned incorrect error (Z_MEM_ERROR) on some invalid data 
-- Avoid accesses before window for invalid distances with inflate window 
-  less than 32K. 
-- force windowBits > 8 to avoid a bug in the encoder for a window size 
-  of 256 bytes. (A complete fix will be available in 1.1.5). 
- 
-Changes in 1.1.3 (9 July 1998) 
-- fix "an inflate input buffer bug that shows up on rare but persistent 
-  occasions" (Mark) 
-- fix gzread and gztell for concatenated .gz files (Didier Le Botlan) 
-- fix gzseek(..., SEEK_SET) in write mode 
-- fix crc check after a gzeek (Frank Faubert) 
-- fix miniunzip when the last entry in a zip file is itself a zip file 
-  (J Lillge) 
-- add contrib/asm586 and contrib/asm686 (Brian Raiter) 
-  See http://www.muppetlabs.com/~breadbox/software/assembly.html 
-- add support for Delphi 3 in contrib/delphi (Bob Dellaca) 
-- add support for C++Builder 3 and Delphi 3 in contrib/delphi2 (Davide Moretti) 
-- do not exit prematurely in untgz if 0 at start of block (Magnus Holmgren) 
-- use macro EXTERN instead of extern to support DLL for BeOS (Sander Stoks) 
-- added a FAQ file 
- 
-- Support gzdopen on Mac with Metrowerks (Jason Linhart) 
-- Do not redefine Byte on Mac (Brad Pettit & Jason Linhart) 
-- define SEEK_END too if SEEK_SET is not defined (Albert Chin-A-Young) 
-- avoid some warnings with Borland C (Tom Tanner) 
-- fix a problem in contrib/minizip/zip.c for 16-bit MSDOS (Gilles Vollant) 
-- emulate utime() for WIN32 in contrib/untgz  (Gilles Vollant) 
-- allow several arguments to configure (Tim Mooney, Frodo Looijaard) 
-- use libdir and includedir in Makefile.in (Tim Mooney) 
-- support shared libraries on OSF1 V4 (Tim Mooney) 
-- remove so_locations in "make clean"  (Tim Mooney) 
-- fix maketree.c compilation error (Glenn, Mark) 
-- Python interface to zlib now in Python 1.5 (Jeremy Hylton) 
-- new Makefile.riscos (Rich Walker) 
-- initialize static descriptors in trees.c for embedded targets (Nick Smith) 
-- use "foo-gz" in example.c for RISCOS and VMS (Nick Smith) 
-- add the OS/2 files in Makefile.in too (Andrew Zabolotny) 
-- fix fdopen and halloc macros for Microsoft C 6.0 (Tom Lane) 
-- fix maketree.c to allow clean compilation of inffixed.h (Mark) 
-- fix parameter check in deflateCopy (Gunther Nikl) 
-- cleanup trees.c, use compressed_len only in debug mode (Christian Spieler) 
-- Many portability patches by Christian Spieler: 
-  . zutil.c, zutil.h: added "const" for zmem* 
-  . Make_vms.com: fixed some typos 
-  . Make_vms.com: msdos/Makefile.*: removed zutil.h from some dependency lists 
-  . msdos/Makefile.msc: remove "default rtl link library" info from obj files 
-  . msdos/Makefile.*: use model-dependent name for the built zlib library 
-  . msdos/Makefile.emx, nt/Makefile.emx, nt/Makefile.gcc: 
-     new makefiles, for emx (DOS/OS2), emx&rsxnt and mingw32 (Windows 9x / NT) 
-- use define instead of typedef for Bytef also for MSC small/medium (Tom Lane) 
-- replace __far with _far for better portability (Christian Spieler, Tom Lane) 
-- fix test for errno.h in configure (Tim Newsham) 
- 
-Changes in 1.1.2 (19 March 98) 
-- added contrib/minzip, mini zip and unzip based on zlib (Gilles Vollant) 
-  See http://www.winimage.com/zLibDll/unzip.html 
-- preinitialize the inflate tables for fixed codes, to make the code 
-  completely thread safe (Mark) 
-- some simplifications and slight speed-up to the inflate code (Mark) 
-- fix gzeof on non-compressed files (Allan Schrum) 
-- add -std1 option in configure for OSF1 to fix gzprintf (Martin Mokrejs) 
-- use default value of 4K for Z_BUFSIZE for 16-bit MSDOS (Tim Wegner + Glenn) 
-- added os2/Makefile.def and os2/zlib.def (Andrew Zabolotny) 
-- add shared lib support for UNIX_SV4.2MP (MATSUURA Takanori) 
-- do not wrap extern "C" around system includes (Tom Lane) 
-- mention zlib binding for TCL in README (Andreas Kupries) 
-- added amiga/Makefile.pup for Amiga powerUP SAS/C PPC (Andreas Kleinert) 
-- allow "make install prefix=..." even after configure (Glenn Randers-Pehrson) 
-- allow "configure --prefix $HOME" (Tim Mooney) 
-- remove warnings in example.c and gzio.c (Glenn Randers-Pehrson) 
-- move Makefile.sas to amiga/Makefile.sas 
- 
-Changes in 1.1.1 (27 Feb 98) 
-- fix macros _tr_tally_* in deflate.h for debug mode  (Glenn Randers-Pehrson) 
-- remove block truncation heuristic which had very marginal effect for zlib 
-  (smaller lit_bufsize than in gzip 1.2.4) and degraded a little the 
-  compression ratio on some files. This also allows inlining _tr_tally for 
-  matches in deflate_slow. 
-- added msdos/Makefile.w32 for WIN32 Microsoft Visual C++ (Bob Frazier) 
- 
-Changes in 1.1.0 (24 Feb 98) 
-- do not return STREAM_END prematurely in inflate (John Bowler) 
-- revert to the zlib 1.0.8 inflate to avoid the gcc 2.8.0 bug (Jeremy Buhler) 
-- compile with -DFASTEST to get compression code optimized for speed only 
-- in minigzip, try mmap'ing the input file first (Miguel Albrecht) 
-- increase size of I/O buffers in minigzip.c and gzio.c (not a big gain 
-  on Sun but significant on HP) 
- 
-- add a pointer to experimental unzip library in README (Gilles Vollant) 
-- initialize variable gcc in configure (Chris Herborth) 
- 
-Changes in 1.0.9 (17 Feb 1998) 
-- added gzputs and gzgets functions 
-- do not clear eof flag in gzseek (Mark Diekhans) 
-- fix gzseek for files in transparent mode (Mark Diekhans) 
-- do not assume that vsprintf returns the number of bytes written (Jens Krinke) 
-- replace EXPORT with ZEXPORT to avoid conflict with other programs 
-- added compress2 in zconf.h, zlib.def, zlib.dnt 
-- new asm code from Gilles Vollant in contrib/asm386 
-- simplify the inflate code (Mark): 
- . Replace ZALLOC's in huft_build() with single ZALLOC in inflate_blocks_new() 
- . ZALLOC the length list in inflate_trees_fixed() instead of using stack 
- . ZALLOC the value area for huft_build() instead of using stack 
- . Simplify Z_FINISH check in inflate() 
- 
-- Avoid gcc 2.8.0 comparison bug a little differently than zlib 1.0.8 
-- in inftrees.c, avoid cc -O bug on HP (Farshid Elahi) 
-- in zconf.h move the ZLIB_DLL stuff earlier to avoid problems with 
-  the declaration of FAR (Gilles VOllant) 
-- install libz.so* with mode 755 (executable) instead of 644 (Marc Lehmann) 
-- read_buf buf parameter of type Bytef* instead of charf* 
-- zmemcpy parameters are of type Bytef*, not charf* (Joseph Strout) 
-- do not redeclare unlink in minigzip.c for WIN32 (John Bowler) 
-- fix check for presence of directories in "make install" (Ian Willis) 
- 
-Changes in 1.0.8 (27 Jan 1998) 
-- fixed offsets in contrib/asm386/gvmat32.asm (Gilles Vollant) 
-- fix gzgetc and gzputc for big endian systems (Markus Oberhumer) 
-- added compress2() to allow setting the compression level 
-- include sys/types.h to get off_t on some systems (Marc Lehmann & QingLong) 
-- use constant arrays for the static trees in trees.c instead of computing 
-  them at run time (thanks to Ken Raeburn for this suggestion). To create 
-  trees.h, compile with GEN_TREES_H and run "make test". 
-- check return code of example in "make test" and display result 
-- pass minigzip command line options to file_compress 
-- simplifying code of inflateSync to avoid gcc 2.8 bug 
- 
-- support CC="gcc -Wall" in configure -s (QingLong) 
-- avoid a flush caused by ftell in gzopen for write mode (Ken Raeburn) 
-- fix test for shared library support to avoid compiler warnings 
-- zlib.lib -> zlib.dll in msdos/zlib.rc (Gilles Vollant) 
-- check for TARGET_OS_MAC in addition to MACOS (Brad Pettit) 
-- do not use fdopen for Metrowerks on Mac (Brad Pettit)) 
-- add checks for gzputc and gzputc in example.c 
-- avoid warnings in gzio.c and deflate.c (Andreas Kleinert) 
-- use const for the CRC table (Ken Raeburn) 
-- fixed "make uninstall" for shared libraries 
-- use Tracev instead of Trace in infblock.c 
-- in example.c use correct compressed length for test_sync 
-- suppress +vnocompatwarnings in configure for HPUX (not always supported) 
- 
-Changes in 1.0.7 (20 Jan 1998) 
-- fix gzseek which was broken in write mode 
-- return error for gzseek to negative absolute position 
-- fix configure for Linux (Chun-Chung Chen) 
-- increase stack space for MSC (Tim Wegner) 
-- get_crc_table and inflateSyncPoint are EXPORTed (Gilles Vollant) 
-- define EXPORTVA for gzprintf (Gilles Vollant) 
-- added man page zlib.3 (Rick Rodgers) 
-- for contrib/untgz, fix makedir() and improve Makefile 
- 
-- check gzseek in write mode in example.c 
-- allocate extra buffer for seeks only if gzseek is actually called 
-- avoid signed/unsigned comparisons (Tim Wegner, Gilles Vollant) 
-- add inflateSyncPoint in zconf.h 
-- fix list of exported functions in nt/zlib.dnt and mdsos/zlib.def 
- 
-Changes in 1.0.6 (19 Jan 1998) 
-- add functions gzprintf, gzputc, gzgetc, gztell, gzeof, gzseek, gzrewind and 
-  gzsetparams (thanks to Roland Giersig and Kevin Ruland for some of this code) 
-- Fix a deflate bug occurring only with compression level 0 (thanks to 
-  Andy Buckler for finding this one). 
-- In minigzip, pass transparently also the first byte for .Z files. 
-- return Z_BUF_ERROR instead of Z_OK if output buffer full in uncompress() 
-- check Z_FINISH in inflate (thanks to Marc Schluper) 
-- Implement deflateCopy (thanks to Adam Costello) 
-- make static libraries by default in configure, add --shared option. 
-- move MSDOS or Windows specific files to directory msdos 
-- suppress the notion of partial flush to simplify the interface 
-  (but the symbol Z_PARTIAL_FLUSH is kept for compatibility with 1.0.4) 
-- suppress history buffer provided by application to simplify the interface 
-  (this feature was not implemented anyway in 1.0.4) 
-- next_in and avail_in must be initialized before calling inflateInit or 
-  inflateInit2 
-- add EXPORT in all exported functions (for Windows DLL) 
-- added Makefile.nt (thanks to Stephen Williams) 
-- added the unsupported "contrib" directory: 
-   contrib/asm386/ by Gilles Vollant <info@winimage.com> 
-        386 asm code replacing longest_match(). 
-   contrib/iostream/ by Kevin Ruland <kevin@rodin.wustl.edu> 
-        A C++ I/O streams interface to the zlib gz* functions 
+- Add some FAQ entries about the contrib directory
+- Update the MVS question in the FAQ
+- Avoid extraneous reads after EOF in gzio.c [Brown]
+- Correct spelling of "successfully" in gzio.c [Randers-Pehrson]
+- Add comments to zlib.h about gzerror() usage [Brown]
+- Set extra flags in gzip header in gzopen() like deflate() does
+- Make configure options more compatible with double-dash conventions
+  [Weigelt]
+- Clean up compilation under Solaris SunStudio cc [Rowe, Reinholdtsen]
+- Fix uninstall target in Makefile.in [Truta]
+- Add pkgconfig support [Weigelt]
+- Use $(DESTDIR) macro in Makefile.in [Reinholdtsen, Weigelt]
+- Replace set_data_type() with a more accurate detect_data_type() in
+  trees.c, according to the txtvsbin.txt document [Truta]
+- Swap the order of #include <stdio.h> and #include "zlib.h" in
+  gzio.c, example.c and minigzip.c [Truta]
+- Shut up annoying VS2005 warnings about standard C deprecation [Rowe,
+  Truta] (where?)
+- Fix target "clean" from win32/Makefile.bor [Truta]
+- Create .pdb and .manifest files in win32/makefile.msc [Ziegler, Rowe]
+- Update zlib www home address in win32/DLL_FAQ.txt [Truta]
+- Update contrib/masmx86/inffas32.asm for VS2005 [Vollant, Van Wassenhove]
+- Enable browse info in the "Debug" and "ASM Debug" configurations in
+  the Visual C++ 6 project, and set (non-ASM) "Debug" as default [Truta]
+- Add pkgconfig support [Weigelt]
+- Add ZLIB_VER_MAJOR, ZLIB_VER_MINOR and ZLIB_VER_REVISION in zlib.h,
+  for use in win32/zlib1.rc [Polushin, Rowe, Truta]
+- Add a document that explains the new text detection scheme to
+  doc/txtvsbin.txt [Truta]
+- Add rfc1950.txt, rfc1951.txt and rfc1952.txt to doc/ [Truta]
+- Move algorithm.txt into doc/ [Truta]
+- Synchronize FAQ with website
+- Fix compressBound(), was low for some pathological cases [Fearnley]
+- Take into account wrapper variations in deflateBound()
+- Set examples/zpipe.c input and output to binary mode for Windows
+- Update examples/zlib_how.html with new zpipe.c (also web site)
+- Fix some warnings in examples/gzlog.c and examples/zran.c (it seems
+  that gcc became pickier in 4.0)
+- Add zlib.map for Linux: "All symbols from zlib-1.1.4 remain
+  un-versioned, the patch adds versioning only for symbols introduced in
+  zlib-1.2.0 or later.  It also declares as local those symbols which are
+  not designed to be exported." [Levin]
+- Update Z_PREFIX list in zconf.in.h, add --zprefix option to configure
+- Do not initialize global static by default in trees.c, add a response
+  NO_INIT_GLOBAL_POINTERS to initialize them if needed [Marquess]
+- Don't use strerror() in gzio.c under WinCE [Yakimov]
+- Don't use errno.h in zutil.h under WinCE [Yakimov]
+- Move arguments for AR to its usage to allow replacing ar [Marot]
+- Add HAVE_VISIBILITY_PRAGMA in zconf.in.h for Mozilla [Randers-Pehrson]
+- Improve inflateInit() and inflateInit2() documentation
+- Fix structure size comment in inflate.h
+- Change configure help option from --h* to --help [Santos]
+
+Changes in 1.2.3 (18 July 2005)
+- Apply security vulnerability fixes to contrib/infback9 as well
+- Clean up some text files (carriage returns, trailing space)
+- Update testzlib, vstudio, masmx64, and masmx86 in contrib [Vollant]
+
+Changes in 1.2.2.4 (11 July 2005)
+- Add inflatePrime() function for starting inflation at bit boundary
+- Avoid some Visual C warnings in deflate.c
+- Avoid more silly Visual C warnings in inflate.c and inftrees.c for 64-bit
+  compile
+- Fix some spelling errors in comments [Betts]
+- Correct inflateInit2() error return documentation in zlib.h
+- Add zran.c example of compressed data random access to examples
+  directory, shows use of inflatePrime()
+- Fix cast for assignments to strm->state in inflate.c and infback.c
+- Fix zlibCompileFlags() in zutil.c to use 1L for long shifts [Oberhumer]
+- Move declarations of gf2 functions to right place in crc32.c [Oberhumer]
+- Add cast in trees.c t avoid a warning [Oberhumer]
+- Avoid some warnings in fitblk.c, gun.c, gzjoin.c in examples [Oberhumer]
+- Update make_vms.com [Zinser]
+- Initialize state->write in inflateReset() since copied in inflate_fast()
+- Be more strict on incomplete code sets in inflate_table() and increase
+  ENOUGH and MAXD -- this repairs a possible security vulnerability for
+  invalid inflate input.  Thanks to Tavis Ormandy and Markus Oberhumer for
+  discovering the vulnerability and providing test cases.
+- Add ia64 support to configure for HP-UX [Smith]
+- Add error return to gzread() for format or i/o error [Levin]
+- Use malloc.h for OS/2 [Necasek]
+
+Changes in 1.2.2.3 (27 May 2005)
+- Replace 1U constants in inflate.c and inftrees.c for 64-bit compile
+- Typecast fread() return values in gzio.c [Vollant]
+- Remove trailing space in minigzip.c outmode (VC++ can't deal with it)
+- Fix crc check bug in gzread() after gzungetc() [Heiner]
+- Add the deflateTune() function to adjust internal compression parameters
+- Add a fast gzip decompressor, gun.c, to examples (use of inflateBack)
+- Remove an incorrect assertion in examples/zpipe.c
+- Add C++ wrapper in infback9.h [Donais]
+- Fix bug in inflateCopy() when decoding fixed codes
+- Note in zlib.h how much deflateSetDictionary() actually uses
+- Remove USE_DICT_HEAD in deflate.c (would mess up inflate if used)
+- Add _WIN32_WCE to define WIN32 in zconf.in.h [Spencer]
+- Don't include stderr.h or errno.h for _WIN32_WCE in zutil.h [Spencer]
+- Add gzdirect() function to indicate transparent reads
+- Update contrib/minizip [Vollant]
+- Fix compilation of deflate.c when both ASMV and FASTEST [Oberhumer]
+- Add casts in crc32.c to avoid warnings [Oberhumer]
+- Add contrib/masmx64 [Vollant]
+- Update contrib/asm586, asm686, masmx86, testzlib, vstudio [Vollant]
+
+Changes in 1.2.2.2 (30 December 2004)
+- Replace structure assignments in deflate.c and inflate.c with zmemcpy to
+  avoid implicit memcpy calls (portability for no-library compilation)
+- Increase sprintf() buffer size in gzdopen() to allow for large numbers
+- Add INFLATE_STRICT to check distances against zlib header
+- Improve WinCE errno handling and comments [Chang]
+- Remove comment about no gzip header processing in FAQ
+- Add Z_FIXED strategy option to deflateInit2() to force fixed trees
+- Add updated make_vms.com [Coghlan], update README
+- Create a new "examples" directory, move gzappend.c there, add zpipe.c,
+  fitblk.c, gzlog.[ch], gzjoin.c, and zlib_how.html.
+- Add FAQ entry and comments in deflate.c on uninitialized memory access
+- Add Solaris 9 make options in configure [Gilbert]
+- Allow strerror() usage in gzio.c for STDC
+- Fix DecompressBuf in contrib/delphi/ZLib.pas [ManChesTer]
+- Update contrib/masmx86/inffas32.asm and gvmat32.asm [Vollant]
+- Use z_off_t for adler32_combine() and crc32_combine() lengths
+- Make adler32() much faster for small len
+- Use OS_CODE in deflate() default gzip header
+
+Changes in 1.2.2.1 (31 October 2004)
+- Allow inflateSetDictionary() call for raw inflate
+- Fix inflate header crc check bug for file names and comments
+- Add deflateSetHeader() and gz_header structure for custom gzip headers
+- Add inflateGetheader() to retrieve gzip headers
+- Add crc32_combine() and adler32_combine() functions
+- Add alloc_func, free_func, in_func, out_func to Z_PREFIX list
+- Use zstreamp consistently in zlib.h (inflate_back functions)
+- Remove GUNZIP condition from definition of inflate_mode in inflate.h
+  and in contrib/inflate86/inffast.S [Truta, Anderson]
+- Add support for AMD64 in contrib/inflate86/inffas86.c [Anderson]
+- Update projects/README.projects and projects/visualc6 [Truta]
+- Update win32/DLL_FAQ.txt [Truta]
+- Avoid warning under NO_GZCOMPRESS in gzio.c; fix typo [Truta]
+- Deprecate Z_ASCII; use Z_TEXT instead [Truta]
+- Use a new algorithm for setting strm->data_type in trees.c [Truta]
+- Do not define an exit() prototype in zutil.c unless DEBUG defined
+- Remove prototype of exit() from zutil.c, example.c, minigzip.c [Truta]
+- Add comment in zlib.h for Z_NO_FLUSH parameter to deflate()
+- Fix Darwin build version identification [Peterson]
+
+Changes in 1.2.2 (3 October 2004)
+- Update zlib.h comments on gzip in-memory processing
+- Set adler to 1 in inflateReset() to support Java test suite [Walles]
+- Add contrib/dotzlib [Ravn]
+- Update win32/DLL_FAQ.txt [Truta]
+- Update contrib/minizip [Vollant]
+- Move contrib/visual-basic.txt to old/ [Truta]
+- Fix assembler builds in projects/visualc6/ [Truta]
+
+Changes in 1.2.1.2 (9 September 2004)
+- Update INDEX file
+- Fix trees.c to update strm->data_type (no one ever noticed!)
+- Fix bug in error case in inflate.c, infback.c, and infback9.c [Brown]
+- Add "volatile" to crc table flag declaration (for DYNAMIC_CRC_TABLE)
+- Add limited multitasking protection to DYNAMIC_CRC_TABLE
+- Add NO_vsnprintf for VMS in zutil.h [Mozilla]
+- Don't declare strerror() under VMS [Mozilla]
+- Add comment to DYNAMIC_CRC_TABLE to use get_crc_table() to initialize
+- Update contrib/ada [Anisimkov]
+- Update contrib/minizip [Vollant]
+- Fix configure to not hardcode directories for Darwin [Peterson]
+- Fix gzio.c to not return error on empty files [Brown]
+- Fix indentation; update version in contrib/delphi/ZLib.pas and
+  contrib/pascal/zlibpas.pas [Truta]
+- Update mkasm.bat in contrib/masmx86 [Truta]
+- Update contrib/untgz [Truta]
+- Add projects/README.projects [Truta]
+- Add project for MS Visual C++ 6.0 in projects/visualc6 [Cadieux, Truta]
+- Update win32/DLL_FAQ.txt [Truta]
+- Update list of Z_PREFIX symbols in zconf.h [Randers-Pehrson, Truta]
+- Remove an unnecessary assignment to curr in inftrees.c [Truta]
+- Add OS/2 to exe builds in configure [Poltorak]
+- Remove err dummy parameter in zlib.h [Kientzle]
+
+Changes in 1.2.1.1 (9 January 2004)
+- Update email address in README
+- Several FAQ updates
+- Fix a big fat bug in inftrees.c that prevented decoding valid
+  dynamic blocks with only literals and no distance codes --
+  Thanks to "Hot Emu" for the bug report and sample file
+- Add a note to puff.c on no distance codes case.
+
+Changes in 1.2.1 (17 November 2003)
+- Remove a tab in contrib/gzappend/gzappend.c
+- Update some interfaces in contrib for new zlib functions
+- Update zlib version number in some contrib entries
+- Add Windows CE definition for ptrdiff_t in zutil.h [Mai, Truta]
+- Support shared libraries on Hurd and KFreeBSD [Brown]
+- Fix error in NO_DIVIDE option of adler32.c
+
+Changes in 1.2.0.8 (4 November 2003)
+- Update version in contrib/delphi/ZLib.pas and contrib/pascal/zlibpas.pas
+- Add experimental NO_DIVIDE #define in adler32.c
+    - Possibly faster on some processors (let me know if it is)
+- Correct Z_BLOCK to not return on first inflate call if no wrap
+- Fix strm->data_type on inflate() return to correctly indicate EOB
+- Add deflatePrime() function for appending in the middle of a byte
+- Add contrib/gzappend for an example of appending to a stream
+- Update win32/DLL_FAQ.txt [Truta]
+- Delete Turbo C comment in README [Truta]
+- Improve some indentation in zconf.h [Truta]
+- Fix infinite loop on bad input in configure script [Church]
+- Fix gzeof() for concatenated gzip files [Johnson]
+- Add example to contrib/visual-basic.txt [Michael B.]
+- Add -p to mkdir's in Makefile.in [vda]
+- Fix configure to properly detect presence or lack of printf functions
+- Add AS400 support [Monnerat]
+- Add a little Cygwin support [Wilson]
+
+Changes in 1.2.0.7 (21 September 2003)
+- Correct some debug formats in contrib/infback9
+- Cast a type in a debug statement in trees.c
+- Change search and replace delimiter in configure from % to # [Beebe]
+- Update contrib/untgz to 0.2 with various fixes [Truta]
+- Add build support for Amiga [Nikl]
+- Remove some directories in old that have been updated to 1.2
+- Add dylib building for Mac OS X in configure and Makefile.in
+- Remove old distribution stuff from Makefile
+- Update README to point to DLL_FAQ.txt, and add comment on Mac OS X
+- Update links in README
+
+Changes in 1.2.0.6 (13 September 2003)
+- Minor FAQ updates
+- Update contrib/minizip to 1.00 [Vollant]
+- Remove test of gz functions in example.c when GZ_COMPRESS defined [Truta]
+- Update POSTINC comment for 68060 [Nikl]
+- Add contrib/infback9 with deflate64 decoding (unsupported)
+- For MVS define NO_vsnprintf and undefine FAR [van Burik]
+- Add pragma for fdopen on MVS [van Burik]
+
+Changes in 1.2.0.5 (8 September 2003)
+- Add OF to inflateBackEnd() declaration in zlib.h
+- Remember start when using gzdopen in the middle of a file
+- Use internal off_t counters in gz* functions to properly handle seeks
+- Perform more rigorous check for distance-too-far in inffast.c
+- Add Z_BLOCK flush option to return from inflate at block boundary
+- Set strm->data_type on return from inflate
+    - Indicate bits unused, if at block boundary, and if in last block
+- Replace size_t with ptrdiff_t in crc32.c, and check for correct size
+- Add condition so old NO_DEFLATE define still works for compatibility
+- FAQ update regarding the Windows DLL [Truta]
+- INDEX update: add qnx entry, remove aix entry [Truta]
+- Install zlib.3 into mandir [Wilson]
+- Move contrib/zlib_dll_FAQ.txt to win32/DLL_FAQ.txt; update [Truta]
+- Adapt the zlib interface to the new DLL convention guidelines [Truta]
+- Introduce ZLIB_WINAPI macro to allow the export of functions using
+  the WINAPI calling convention, for Visual Basic [Vollant, Truta]
+- Update msdos and win32 scripts and makefiles [Truta]
+- Export symbols by name, not by ordinal, in win32/zlib.def [Truta]
+- Add contrib/ada [Anisimkov]
+- Move asm files from contrib/vstudio/vc70_32 to contrib/asm386 [Truta]
+- Rename contrib/asm386 to contrib/masmx86 [Truta, Vollant]
+- Add contrib/masm686 [Truta]
+- Fix offsets in contrib/inflate86 and contrib/masmx86/inffas32.asm
+  [Truta, Vollant]
+- Update contrib/delphi; rename to contrib/pascal; add example [Truta]
+- Remove contrib/delphi2; add a new contrib/delphi [Truta]
+- Avoid inclusion of the nonstandard <memory.h> in contrib/iostream,
+  and fix some method prototypes [Truta]
+- Fix the ZCR_SEED2 constant to avoid warnings in contrib/minizip
+  [Truta]
+- Avoid the use of backslash (\) in contrib/minizip [Vollant]
+- Fix file time handling in contrib/untgz; update makefiles [Truta]
+- Update contrib/vstudio/vc70_32 to comply with the new DLL guidelines
+  [Vollant]
+- Remove contrib/vstudio/vc15_16 [Vollant]
+- Rename contrib/vstudio/vc70_32 to contrib/vstudio/vc7 [Truta]
+- Update README.contrib [Truta]
+- Invert the assignment order of match_head and s->prev[...] in
+  INSERT_STRING [Truta]
+- Compare TOO_FAR with 32767 instead of 32768, to avoid 16-bit warnings
+  [Truta]
+- Compare function pointers with 0, not with NULL or Z_NULL [Truta]
+- Fix prototype of syncsearch in inflate.c [Truta]
+- Introduce ASMINF macro to be enabled when using an ASM implementation
+  of inflate_fast [Truta]
+- Change NO_DEFLATE to NO_GZCOMPRESS [Truta]
+- Modify test_gzio in example.c to take a single file name as a
+  parameter [Truta]
+- Exit the example.c program if gzopen fails [Truta]
+- Add type casts around strlen in example.c [Truta]
+- Remove casting to sizeof in minigzip.c; give a proper type
+  to the variable compared with SUFFIX_LEN [Truta]
+- Update definitions of STDC and STDC99 in zconf.h [Truta]
+- Synchronize zconf.h with the new Windows DLL interface [Truta]
+- Use SYS16BIT instead of __32BIT__ to distinguish between
+  16- and 32-bit platforms [Truta]
+- Use far memory allocators in small 16-bit memory models for
+  Turbo C [Truta]
+- Add info about the use of ASMV, ASMINF and ZLIB_WINAPI in
+  zlibCompileFlags [Truta]
+- Cygwin has vsnprintf [Wilson]
+- In Windows16, OS_CODE is 0, as in MSDOS [Truta]
+- In Cygwin, OS_CODE is 3 (Unix), not 11 (Windows32) [Wilson]
+
+Changes in 1.2.0.4 (10 August 2003)
+- Minor FAQ updates
+- Be more strict when checking inflateInit2's windowBits parameter
+- Change NO_GUNZIP compile option to NO_GZIP to cover deflate as well
+- Add gzip wrapper option to deflateInit2 using windowBits
+- Add updated QNX rule in configure and qnx directory [Bonnefoy]
+- Make inflate distance-too-far checks more rigorous
+- Clean up FAR usage in inflate
+- Add casting to sizeof() in gzio.c and minigzip.c
+
+Changes in 1.2.0.3 (19 July 2003)
+- Fix silly error in gzungetc() implementation [Vollant]
+- Update contrib/minizip and contrib/vstudio [Vollant]
+- Fix printf format in example.c
+- Correct cdecl support in zconf.in.h [Anisimkov]
+- Minor FAQ updates
+
+Changes in 1.2.0.2 (13 July 2003)
+- Add ZLIB_VERNUM in zlib.h for numerical preprocessor comparisons
+- Attempt to avoid warnings in crc32.c for pointer-int conversion
+- Add AIX to configure, remove aix directory [Bakker]
+- Add some casts to minigzip.c
+- Improve checking after insecure sprintf() or vsprintf() calls
+- Remove #elif's from crc32.c
+- Change leave label to inf_leave in inflate.c and infback.c to avoid
+  library conflicts
+- Remove inflate gzip decoding by default--only enable gzip decoding by
+  special request for stricter backward compatibility
+- Add zlibCompileFlags() function to return compilation information
+- More typecasting in deflate.c to avoid warnings
+- Remove leading underscore from _Capital #defines [Truta]
+- Fix configure to link shared library when testing
+- Add some Windows CE target adjustments [Mai]
+- Remove #define ZLIB_DLL in zconf.h [Vollant]
+- Add zlib.3 [Rodgers]
+- Update RFC URL in deflate.c and algorithm.txt [Mai]
+- Add zlib_dll_FAQ.txt to contrib [Truta]
+- Add UL to some constants [Truta]
+- Update minizip and vstudio [Vollant]
+- Remove vestigial NEED_DUMMY_RETURN from zconf.in.h
+- Expand use of NO_DUMMY_DECL to avoid all dummy structures
+- Added iostream3 to contrib [Schwardt]
+- Replace rewind() with fseek() for WinCE [Truta]
+- Improve setting of zlib format compression level flags
+    - Report 0 for huffman and rle strategies and for level == 0 or 1
+    - Report 2 only for level == 6
+- Only deal with 64K limit when necessary at compile time [Truta]
+- Allow TOO_FAR check to be turned off at compile time [Truta]
+- Add gzclearerr() function [Souza]
+- Add gzungetc() function
+
+Changes in 1.2.0.1 (17 March 2003)
+- Add Z_RLE strategy for run-length encoding [Truta]
+    - When Z_RLE requested, restrict matches to distance one
+    - Update zlib.h, minigzip.c, gzopen(), gzdopen() for Z_RLE
+- Correct FASTEST compilation to allow level == 0
+- Clean up what gets compiled for FASTEST
+- Incorporate changes to zconf.in.h [Vollant]
+    - Refine detection of Turbo C need for dummy returns
+    - Refine ZLIB_DLL compilation
+    - Include additional header file on VMS for off_t typedef
+- Try to use _vsnprintf where it supplants vsprintf [Vollant]
+- Add some casts in inffast.c
+- Enchance comments in zlib.h on what happens if gzprintf() tries to
+  write more than 4095 bytes before compression
+- Remove unused state from inflateBackEnd()
+- Remove exit(0) from minigzip.c, example.c
+- Get rid of all those darn tabs
+- Add "check" target to Makefile.in that does the same thing as "test"
+- Add "mostlyclean" and "maintainer-clean" targets to Makefile.in
+- Update contrib/inflate86 [Anderson]
+- Update contrib/testzlib, contrib/vstudio, contrib/minizip [Vollant]
+- Add msdos and win32 directories with makefiles [Truta]
+- More additions and improvements to the FAQ
+
+Changes in 1.2.0 (9 March 2003)
+- New and improved inflate code
+    - About 20% faster
+    - Does not allocate 32K window unless and until needed
+    - Automatically detects and decompresses gzip streams
+    - Raw inflate no longer needs an extra dummy byte at end
+    - Added inflateBack functions using a callback interface--even faster
+      than inflate, useful for file utilities (gzip, zip)
+    - Added inflateCopy() function to record state for random access on
+      externally generated deflate streams (e.g. in gzip files)
+    - More readable code (I hope)
+- New and improved crc32()
+    - About 50% faster, thanks to suggestions from Rodney Brown
+- Add deflateBound() and compressBound() functions
+- Fix memory leak in deflateInit2()
+- Permit setting dictionary for raw deflate (for parallel deflate)
+- Fix const declaration for gzwrite()
+- Check for some malloc() failures in gzio.c
+- Fix bug in gzopen() on single-byte file 0x1f
+- Fix bug in gzread() on concatenated file with 0x1f at end of buffer
+  and next buffer doesn't start with 0x8b
+- Fix uncompress() to return Z_DATA_ERROR on truncated input
+- Free memory at end of example.c
+- Remove MAX #define in trees.c (conflicted with some libraries)
+- Fix static const's in deflate.c, gzio.c, and zutil.[ch]
+- Declare malloc() and free() in gzio.c if STDC not defined
+- Use malloc() instead of calloc() in zutil.c if int big enough
+- Define STDC for AIX
+- Add aix/ with approach for compiling shared library on AIX
+- Add HP-UX support for shared libraries in configure
+- Add OpenUNIX support for shared libraries in configure
+- Use $cc instead of gcc to build shared library
+- Make prefix directory if needed when installing
+- Correct Macintosh avoidance of typedef Byte in zconf.h
+- Correct Turbo C memory allocation when under Linux
+- Use libz.a instead of -lz in Makefile (assure use of compiled library)
+- Update configure to check for snprintf or vsnprintf functions and their
+  return value, warn during make if using an insecure function
+- Fix configure problem with compile-time knowledge of HAVE_UNISTD_H that
+  is lost when library is used--resolution is to build new zconf.h
+- Documentation improvements (in zlib.h):
+    - Document raw deflate and inflate
+    - Update RFCs URL
+    - Point out that zlib and gzip formats are different
+    - Note that Z_BUF_ERROR is not fatal
+    - Document string limit for gzprintf() and possible buffer overflow
+    - Note requirement on avail_out when flushing
+    - Note permitted values of flush parameter of inflate()
+- Add some FAQs (and even answers) to the FAQ
+- Add contrib/inflate86/ for x86 faster inflate
+- Add contrib/blast/ for PKWare Data Compression Library decompression
+- Add contrib/puff/ simple inflate for deflate format description
+
+Changes in 1.1.4 (11 March 2002)
+- ZFREE was repeated on same allocation on some error conditions.
+  This creates a security problem described in
+  http://www.zlib.org/advisory-2002-03-11.txt
+- Returned incorrect error (Z_MEM_ERROR) on some invalid data
+- Avoid accesses before window for invalid distances with inflate window
+  less than 32K.
+- force windowBits > 8 to avoid a bug in the encoder for a window size
+  of 256 bytes. (A complete fix will be available in 1.1.5).
+
+Changes in 1.1.3 (9 July 1998)
+- fix "an inflate input buffer bug that shows up on rare but persistent
+  occasions" (Mark)
+- fix gzread and gztell for concatenated .gz files (Didier Le Botlan)
+- fix gzseek(..., SEEK_SET) in write mode
+- fix crc check after a gzeek (Frank Faubert)
+- fix miniunzip when the last entry in a zip file is itself a zip file
+  (J Lillge)
+- add contrib/asm586 and contrib/asm686 (Brian Raiter)
+  See http://www.muppetlabs.com/~breadbox/software/assembly.html
+- add support for Delphi 3 in contrib/delphi (Bob Dellaca)
+- add support for C++Builder 3 and Delphi 3 in contrib/delphi2 (Davide Moretti)
+- do not exit prematurely in untgz if 0 at start of block (Magnus Holmgren)
+- use macro EXTERN instead of extern to support DLL for BeOS (Sander Stoks)
+- added a FAQ file
+
+- Support gzdopen on Mac with Metrowerks (Jason Linhart)
+- Do not redefine Byte on Mac (Brad Pettit & Jason Linhart)
+- define SEEK_END too if SEEK_SET is not defined (Albert Chin-A-Young)
+- avoid some warnings with Borland C (Tom Tanner)
+- fix a problem in contrib/minizip/zip.c for 16-bit MSDOS (Gilles Vollant)
+- emulate utime() for WIN32 in contrib/untgz  (Gilles Vollant)
+- allow several arguments to configure (Tim Mooney, Frodo Looijaard)
+- use libdir and includedir in Makefile.in (Tim Mooney)
+- support shared libraries on OSF1 V4 (Tim Mooney)
+- remove so_locations in "make clean"  (Tim Mooney)
+- fix maketree.c compilation error (Glenn, Mark)
+- Python interface to zlib now in Python 1.5 (Jeremy Hylton)
+- new Makefile.riscos (Rich Walker)
+- initialize static descriptors in trees.c for embedded targets (Nick Smith)
+- use "foo-gz" in example.c for RISCOS and VMS (Nick Smith)
+- add the OS/2 files in Makefile.in too (Andrew Zabolotny)
+- fix fdopen and halloc macros for Microsoft C 6.0 (Tom Lane)
+- fix maketree.c to allow clean compilation of inffixed.h (Mark)
+- fix parameter check in deflateCopy (Gunther Nikl)
+- cleanup trees.c, use compressed_len only in debug mode (Christian Spieler)
+- Many portability patches by Christian Spieler:
+  . zutil.c, zutil.h: added "const" for zmem*
+  . Make_vms.com: fixed some typos
+  . Make_vms.com: msdos/Makefile.*: removed zutil.h from some dependency lists
+  . msdos/Makefile.msc: remove "default rtl link library" info from obj files
+  . msdos/Makefile.*: use model-dependent name for the built zlib library
+  . msdos/Makefile.emx, nt/Makefile.emx, nt/Makefile.gcc:
+     new makefiles, for emx (DOS/OS2), emx&rsxnt and mingw32 (Windows 9x / NT)
+- use define instead of typedef for Bytef also for MSC small/medium (Tom Lane)
+- replace __far with _far for better portability (Christian Spieler, Tom Lane)
+- fix test for errno.h in configure (Tim Newsham)
+
+Changes in 1.1.2 (19 March 98)
+- added contrib/minzip, mini zip and unzip based on zlib (Gilles Vollant)
+  See http://www.winimage.com/zLibDll/unzip.html
+- preinitialize the inflate tables for fixed codes, to make the code
+  completely thread safe (Mark)
+- some simplifications and slight speed-up to the inflate code (Mark)
+- fix gzeof on non-compressed files (Allan Schrum)
+- add -std1 option in configure for OSF1 to fix gzprintf (Martin Mokrejs)
+- use default value of 4K for Z_BUFSIZE for 16-bit MSDOS (Tim Wegner + Glenn)
+- added os2/Makefile.def and os2/zlib.def (Andrew Zabolotny)
+- add shared lib support for UNIX_SV4.2MP (MATSUURA Takanori)
+- do not wrap extern "C" around system includes (Tom Lane)
+- mention zlib binding for TCL in README (Andreas Kupries)
+- added amiga/Makefile.pup for Amiga powerUP SAS/C PPC (Andreas Kleinert)
+- allow "make install prefix=..." even after configure (Glenn Randers-Pehrson)
+- allow "configure --prefix $HOME" (Tim Mooney)
+- remove warnings in example.c and gzio.c (Glenn Randers-Pehrson)
+- move Makefile.sas to amiga/Makefile.sas
+
+Changes in 1.1.1 (27 Feb 98)
+- fix macros _tr_tally_* in deflate.h for debug mode  (Glenn Randers-Pehrson)
+- remove block truncation heuristic which had very marginal effect for zlib
+  (smaller lit_bufsize than in gzip 1.2.4) and degraded a little the
+  compression ratio on some files. This also allows inlining _tr_tally for
+  matches in deflate_slow.
+- added msdos/Makefile.w32 for WIN32 Microsoft Visual C++ (Bob Frazier)
+
+Changes in 1.1.0 (24 Feb 98)
+- do not return STREAM_END prematurely in inflate (John Bowler)
+- revert to the zlib 1.0.8 inflate to avoid the gcc 2.8.0 bug (Jeremy Buhler)
+- compile with -DFASTEST to get compression code optimized for speed only
+- in minigzip, try mmap'ing the input file first (Miguel Albrecht)
+- increase size of I/O buffers in minigzip.c and gzio.c (not a big gain
+  on Sun but significant on HP)
+
+- add a pointer to experimental unzip library in README (Gilles Vollant)
+- initialize variable gcc in configure (Chris Herborth)
+
+Changes in 1.0.9 (17 Feb 1998)
+- added gzputs and gzgets functions
+- do not clear eof flag in gzseek (Mark Diekhans)
+- fix gzseek for files in transparent mode (Mark Diekhans)
+- do not assume that vsprintf returns the number of bytes written (Jens Krinke)
+- replace EXPORT with ZEXPORT to avoid conflict with other programs
+- added compress2 in zconf.h, zlib.def, zlib.dnt
+- new asm code from Gilles Vollant in contrib/asm386
+- simplify the inflate code (Mark):
+ . Replace ZALLOC's in huft_build() with single ZALLOC in inflate_blocks_new()
+ . ZALLOC the length list in inflate_trees_fixed() instead of using stack
+ . ZALLOC the value area for huft_build() instead of using stack
+ . Simplify Z_FINISH check in inflate()
+
+- Avoid gcc 2.8.0 comparison bug a little differently than zlib 1.0.8
+- in inftrees.c, avoid cc -O bug on HP (Farshid Elahi)
+- in zconf.h move the ZLIB_DLL stuff earlier to avoid problems with
+  the declaration of FAR (Gilles VOllant)
+- install libz.so* with mode 755 (executable) instead of 644 (Marc Lehmann)
+- read_buf buf parameter of type Bytef* instead of charf*
+- zmemcpy parameters are of type Bytef*, not charf* (Joseph Strout)
+- do not redeclare unlink in minigzip.c for WIN32 (John Bowler)
+- fix check for presence of directories in "make install" (Ian Willis)
+
+Changes in 1.0.8 (27 Jan 1998)
+- fixed offsets in contrib/asm386/gvmat32.asm (Gilles Vollant)
+- fix gzgetc and gzputc for big endian systems (Markus Oberhumer)
+- added compress2() to allow setting the compression level
+- include sys/types.h to get off_t on some systems (Marc Lehmann & QingLong)
+- use constant arrays for the static trees in trees.c instead of computing
+  them at run time (thanks to Ken Raeburn for this suggestion). To create
+  trees.h, compile with GEN_TREES_H and run "make test".
+- check return code of example in "make test" and display result
+- pass minigzip command line options to file_compress
+- simplifying code of inflateSync to avoid gcc 2.8 bug
+
+- support CC="gcc -Wall" in configure -s (QingLong)
+- avoid a flush caused by ftell in gzopen for write mode (Ken Raeburn)
+- fix test for shared library support to avoid compiler warnings
+- zlib.lib -> zlib.dll in msdos/zlib.rc (Gilles Vollant)
+- check for TARGET_OS_MAC in addition to MACOS (Brad Pettit)
+- do not use fdopen for Metrowerks on Mac (Brad Pettit))
+- add checks for gzputc and gzputc in example.c
+- avoid warnings in gzio.c and deflate.c (Andreas Kleinert)
+- use const for the CRC table (Ken Raeburn)
+- fixed "make uninstall" for shared libraries
+- use Tracev instead of Trace in infblock.c
+- in example.c use correct compressed length for test_sync
+- suppress +vnocompatwarnings in configure for HPUX (not always supported)
+
+Changes in 1.0.7 (20 Jan 1998)
+- fix gzseek which was broken in write mode
+- return error for gzseek to negative absolute position
+- fix configure for Linux (Chun-Chung Chen)
+- increase stack space for MSC (Tim Wegner)
+- get_crc_table and inflateSyncPoint are EXPORTed (Gilles Vollant)
+- define EXPORTVA for gzprintf (Gilles Vollant)
+- added man page zlib.3 (Rick Rodgers)
+- for contrib/untgz, fix makedir() and improve Makefile
+
+- check gzseek in write mode in example.c
+- allocate extra buffer for seeks only if gzseek is actually called
+- avoid signed/unsigned comparisons (Tim Wegner, Gilles Vollant)
+- add inflateSyncPoint in zconf.h
+- fix list of exported functions in nt/zlib.dnt and mdsos/zlib.def
+
+Changes in 1.0.6 (19 Jan 1998)
+- add functions gzprintf, gzputc, gzgetc, gztell, gzeof, gzseek, gzrewind and
+  gzsetparams (thanks to Roland Giersig and Kevin Ruland for some of this code)
+- Fix a deflate bug occurring only with compression level 0 (thanks to
+  Andy Buckler for finding this one).
+- In minigzip, pass transparently also the first byte for .Z files.
+- return Z_BUF_ERROR instead of Z_OK if output buffer full in uncompress()
+- check Z_FINISH in inflate (thanks to Marc Schluper)
+- Implement deflateCopy (thanks to Adam Costello)
+- make static libraries by default in configure, add --shared option.
+- move MSDOS or Windows specific files to directory msdos
+- suppress the notion of partial flush to simplify the interface
+  (but the symbol Z_PARTIAL_FLUSH is kept for compatibility with 1.0.4)
+- suppress history buffer provided by application to simplify the interface
+  (this feature was not implemented anyway in 1.0.4)
+- next_in and avail_in must be initialized before calling inflateInit or
+  inflateInit2
+- add EXPORT in all exported functions (for Windows DLL)
+- added Makefile.nt (thanks to Stephen Williams)
+- added the unsupported "contrib" directory:
+   contrib/asm386/ by Gilles Vollant <info@winimage.com>
+        386 asm code replacing longest_match().
+   contrib/iostream/ by Kevin Ruland <kevin@rodin.wustl.edu>
+        A C++ I/O streams interface to the zlib gz* functions
    contrib/iostream2/  by Tyge Løvset <Tyge.Lovset@cmr.no>
-        Another C++ I/O streams interface 
-   contrib/untgz/  by "Pedro A. Aranda Guti\irrez" <paag@tid.es> 
-        A very simple tar.gz file extractor using zlib 
-   contrib/visual-basic.txt by Carlos Rios <c_rios@sonda.cl> 
-        How to use compress(), uncompress() and the gz* functions from VB. 
-- pass params -f (filtered data), -h (huffman only), -1 to -9 (compression 
-  level) in minigzip (thanks to Tom Lane) 
- 
-- use const for rommable constants in deflate 
-- added test for gzseek and gztell in example.c 
-- add undocumented function inflateSyncPoint() (hack for Paul Mackerras) 
-- add undocumented function zError to convert error code to string 
-  (for Tim Smithers) 
-- Allow compilation of gzio with -DNO_DEFLATE to avoid the compression code. 
-- Use default memcpy for Symantec MSDOS compiler. 
-- Add EXPORT keyword for check_func (needed for Windows DLL) 
-- add current directory to LD_LIBRARY_PATH for "make test" 
-- create also a link for libz.so.1 
-- added support for FUJITSU UXP/DS (thanks to Toshiaki Nomura) 
-- use $(SHAREDLIB) instead of libz.so in Makefile.in (for HPUX) 
-- added -soname for Linux in configure (Chun-Chung Chen, 
-- assign numbers to the exported functions in zlib.def (for Windows DLL) 
-- add advice in zlib.h for best usage of deflateSetDictionary 
-- work around compiler bug on Atari (cast Z_NULL in call of s->checkfn) 
-- allow compilation with ANSI keywords only enabled for TurboC in large model 
-- avoid "versionString"[0] (Borland bug) 
-- add NEED_DUMMY_RETURN for Borland 
-- use variable z_verbose for tracing in debug mode (L. Peter Deutsch). 
-- allow compilation with CC 
-- defined STDC for OS/2 (David Charlap) 
-- limit external names to 8 chars for MVS (Thomas Lund) 
-- in minigzip.c, use static buffers only for 16-bit systems 
-- fix suffix check for "minigzip -d foo.gz" 
-- do not return an error for the 2nd of two consecutive gzflush() (Felix Lee) 
-- use _fdopen instead of fdopen for MSC >= 6.0 (Thomas Fanslau) 
-- added makelcc.bat for lcc-win32 (Tom St Denis) 
-- in Makefile.dj2, use copy and del instead of install and rm (Frank Donahoe) 
-- Avoid expanded $Id$. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion. 
-- check for unistd.h in configure (for off_t) 
-- remove useless check parameter in inflate_blocks_free 
-- avoid useless assignment of s->check to itself in inflate_blocks_new 
-- do not flush twice in gzclose (thanks to Ken Raeburn) 
-- rename FOPEN as F_OPEN to avoid clash with /usr/include/sys/file.h 
-- use NO_ERRNO_H instead of enumeration of operating systems with errno.h 
-- work around buggy fclose on pipes for HP/UX 
-- support zlib DLL with BORLAND C++ 5.0 (thanks to Glenn Randers-Pehrson) 
-- fix configure if CC is already equal to gcc 
- 
-Changes in 1.0.5 (3 Jan 98) 
-- Fix inflate to terminate gracefully when fed corrupted or invalid data 
-- Use const for rommable constants in inflate 
-- Eliminate memory leaks on error conditions in inflate 
-- Removed some vestigial code in inflate 
-- Update web address in README 
- 
-Changes in 1.0.4 (24 Jul 96) 
-- In very rare conditions, deflate(s, Z_FINISH) could fail to produce an EOF 
-  bit, so the decompressor could decompress all the correct data but went 
-  on to attempt decompressing extra garbage data. This affected minigzip too. 
-- zlibVersion and gzerror return const char* (needed for DLL) 
-- port to RISCOS (no fdopen, no multiple dots, no unlink, no fileno) 
-- use z_error only for DEBUG (avoid problem with DLLs) 
- 
-Changes in 1.0.3 (2 Jul 96) 
-- use z_streamp instead of z_stream *, which is now a far pointer in MSDOS 
-  small and medium models; this makes the library incompatible with previous 
-  versions for these models. (No effect in large model or on other systems.) 
-- return OK instead of BUF_ERROR if previous deflate call returned with 
-  avail_out as zero but there is nothing to do 
-- added memcmp for non STDC compilers 
-- define NO_DUMMY_DECL for more Mac compilers (.h files merged incorrectly) 
-- define __32BIT__ if __386__ or i386 is defined (pb. with Watcom and SCO) 
-- better check for 16-bit mode MSC (avoids problem with Symantec) 
- 
-Changes in 1.0.2 (23 May 96) 
-- added Windows DLL support 
-- added a function zlibVersion (for the DLL support) 
-- fixed declarations using Bytef in infutil.c (pb with MSDOS medium model) 
-- Bytef is define's instead of typedef'd only for Borland C 
-- avoid reading uninitialized memory in example.c 
-- mention in README that the zlib format is now RFC1950 
-- updated Makefile.dj2 
-- added algorithm.doc 
- 
-Changes in 1.0.1 (20 May 96) [1.0 skipped to avoid confusion] 
-- fix array overlay in deflate.c which sometimes caused bad compressed data 
-- fix inflate bug with empty stored block 
-- fix MSDOS medium model which was broken in 0.99 
+        Another C++ I/O streams interface
+   contrib/untgz/  by "Pedro A. Aranda Guti\irrez" <paag@tid.es>
+        A very simple tar.gz file extractor using zlib
+   contrib/visual-basic.txt by Carlos Rios <c_rios@sonda.cl>
+        How to use compress(), uncompress() and the gz* functions from VB.
+- pass params -f (filtered data), -h (huffman only), -1 to -9 (compression
+  level) in minigzip (thanks to Tom Lane)
+
+- use const for rommable constants in deflate
+- added test for gzseek and gztell in example.c
+- add undocumented function inflateSyncPoint() (hack for Paul Mackerras)
+- add undocumented function zError to convert error code to string
+  (for Tim Smithers)
+- Allow compilation of gzio with -DNO_DEFLATE to avoid the compression code.
+- Use default memcpy for Symantec MSDOS compiler.
+- Add EXPORT keyword for check_func (needed for Windows DLL)
+- add current directory to LD_LIBRARY_PATH for "make test"
+- create also a link for libz.so.1
+- added support for FUJITSU UXP/DS (thanks to Toshiaki Nomura)
+- use $(SHAREDLIB) instead of libz.so in Makefile.in (for HPUX)
+- added -soname for Linux in configure (Chun-Chung Chen,
+- assign numbers to the exported functions in zlib.def (for Windows DLL)
+- add advice in zlib.h for best usage of deflateSetDictionary
+- work around compiler bug on Atari (cast Z_NULL in call of s->checkfn)
+- allow compilation with ANSI keywords only enabled for TurboC in large model
+- avoid "versionString"[0] (Borland bug)
+- add NEED_DUMMY_RETURN for Borland
+- use variable z_verbose for tracing in debug mode (L. Peter Deutsch).
+- allow compilation with CC
+- defined STDC for OS/2 (David Charlap)
+- limit external names to 8 chars for MVS (Thomas Lund)
+- in minigzip.c, use static buffers only for 16-bit systems
+- fix suffix check for "minigzip -d foo.gz"
+- do not return an error for the 2nd of two consecutive gzflush() (Felix Lee)
+- use _fdopen instead of fdopen for MSC >= 6.0 (Thomas Fanslau)
+- added makelcc.bat for lcc-win32 (Tom St Denis)
+- in Makefile.dj2, use copy and del instead of install and rm (Frank Donahoe)
+- Avoid expanded $Id$. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion.
+- check for unistd.h in configure (for off_t)
+- remove useless check parameter in inflate_blocks_free
+- avoid useless assignment of s->check to itself in inflate_blocks_new
+- do not flush twice in gzclose (thanks to Ken Raeburn)
+- rename FOPEN as F_OPEN to avoid clash with /usr/include/sys/file.h
+- use NO_ERRNO_H instead of enumeration of operating systems with errno.h
+- work around buggy fclose on pipes for HP/UX
+- support zlib DLL with BORLAND C++ 5.0 (thanks to Glenn Randers-Pehrson)
+- fix configure if CC is already equal to gcc
+
+Changes in 1.0.5 (3 Jan 98)
+- Fix inflate to terminate gracefully when fed corrupted or invalid data
+- Use const for rommable constants in inflate
+- Eliminate memory leaks on error conditions in inflate
+- Removed some vestigial code in inflate
+- Update web address in README
+
+Changes in 1.0.4 (24 Jul 96)
+- In very rare conditions, deflate(s, Z_FINISH) could fail to produce an EOF
+  bit, so the decompressor could decompress all the correct data but went
+  on to attempt decompressing extra garbage data. This affected minigzip too.
+- zlibVersion and gzerror return const char* (needed for DLL)
+- port to RISCOS (no fdopen, no multiple dots, no unlink, no fileno)
+- use z_error only for DEBUG (avoid problem with DLLs)
+
+Changes in 1.0.3 (2 Jul 96)
+- use z_streamp instead of z_stream *, which is now a far pointer in MSDOS
+  small and medium models; this makes the library incompatible with previous
+  versions for these models. (No effect in large model or on other systems.)
+- return OK instead of BUF_ERROR if previous deflate call returned with
+  avail_out as zero but there is nothing to do
+- added memcmp for non STDC compilers
+- define NO_DUMMY_DECL for more Mac compilers (.h files merged incorrectly)
+- define __32BIT__ if __386__ or i386 is defined (pb. with Watcom and SCO)
+- better check for 16-bit mode MSC (avoids problem with Symantec)
+
+Changes in 1.0.2 (23 May 96)
+- added Windows DLL support
+- added a function zlibVersion (for the DLL support)
+- fixed declarations using Bytef in infutil.c (pb with MSDOS medium model)
+- Bytef is define's instead of typedef'd only for Borland C
+- avoid reading uninitialized memory in example.c
+- mention in README that the zlib format is now RFC1950
+- updated Makefile.dj2
+- added algorithm.doc
+
+Changes in 1.0.1 (20 May 96) [1.0 skipped to avoid confusion]
+- fix array overlay in deflate.c which sometimes caused bad compressed data
+- fix inflate bug with empty stored block
+- fix MSDOS medium model which was broken in 0.99
 - fix deflateParams() which could generate bad compressed data.
-- Bytef is define'd instead of typedef'ed (work around Borland bug) 
-- added an INDEX file 
-- new makefiles for DJGPP (Makefile.dj2), 32-bit Borland (Makefile.b32), 
-  Watcom (Makefile.wat), Amiga SAS/C (Makefile.sas) 
-- speed up adler32 for modern machines without auto-increment 
-- added -ansi for IRIX in configure 
-- static_init_done in trees.c is an int 
-- define unlink as delete for VMS 
-- fix configure for QNX 
-- add configure branch for SCO and HPUX 
-- avoid many warnings (unused variables, dead assignments, etc...) 
-- no fdopen for BeOS 
-- fix the Watcom fix for 32 bit mode (define FAR as empty) 
-- removed redefinition of Byte for MKWERKS 
-- work around an MWKERKS bug (incorrect merge of all .h files) 
- 
-Changes in 0.99 (27 Jan 96) 
-- allow preset dictionary shared between compressor and decompressor 
-- allow compression level 0 (no compression) 
-- add deflateParams in zlib.h: allow dynamic change of compression level 
-  and compression strategy. 
-- test large buffers and deflateParams in example.c 
-- add optional "configure" to build zlib as a shared library 
-- suppress Makefile.qnx, use configure instead 
-- fixed deflate for 64-bit systems (detected on Cray) 
-- fixed inflate_blocks for 64-bit systems (detected on Alpha) 
-- declare Z_DEFLATED in zlib.h (possible parameter for deflateInit2) 
-- always return Z_BUF_ERROR when deflate() has nothing to do 
-- deflateInit and inflateInit are now macros to allow version checking 
-- prefix all global functions and types with z_ with -DZ_PREFIX 
-- make falloc completely reentrant (inftrees.c) 
-- fixed very unlikely race condition in ct_static_init 
-- free in reverse order of allocation to help memory manager 
-- use zlib-1.0/* instead of zlib/* inside the tar.gz 
-- make zlib warning-free with "gcc -O3 -Wall -Wwrite-strings -Wpointer-arith 
-  -Wconversion -Wstrict-prototypes -Wmissing-prototypes" 
-- allow gzread on concatenated .gz files 
-- deflateEnd now returns Z_DATA_ERROR if it was premature 
-- deflate is finally (?) fully deterministic (no matches beyond end of input) 
-- Document Z_SYNC_FLUSH 
-- add uninstall in Makefile 
-- Check for __cpluplus in zlib.h 
-- Better test in ct_align for partial flush 
-- avoid harmless warnings for Borland C++ 
-- initialize hash_head in deflate.c 
-- avoid warning on fdopen (gzio.c) for HP cc -Aa 
-- include stdlib.h for STDC compilers 
-- include errno.h for Cray 
-- ignore error if ranlib doesn't exist 
-- call ranlib twice for NeXTSTEP 
-- use exec_prefix instead of prefix for libz.a 
-- renamed ct_* as _tr_* to avoid conflict with applications 
-- clear z->msg in inflateInit2 before any error return 
-- initialize opaque in example.c, gzio.c, deflate.c and inflate.c 
-- fixed typo in zconf.h (_GNUC__ => __GNUC__) 
-- check for WIN32 in zconf.h and zutil.c (avoid farmalloc in 32-bit mode) 
-- fix typo in Make_vms.com (f$trnlnm -> f$getsyi) 
-- in fcalloc, normalize pointer if size > 65520 bytes 
-- don't use special fcalloc for 32 bit Borland C++ 
-- use STDC instead of __GO32__ to avoid redeclaring exit, calloc, etc... 
-- use Z_BINARY instead of BINARY 
-- document that gzclose after gzdopen will close the file 
-- allow "a" as mode in gzopen. 
-- fix error checking in gzread 
-- allow skipping .gz extra-field on pipes 
-- added reference to Perl interface in README 
-- put the crc table in FAR data (I dislike more and more the medium model :) 
-- added get_crc_table 
-- added a dimension to all arrays (Borland C can't count). 
-- workaround Borland C bug in declaration of inflate_codes_new & inflate_fast 
-- guard against multiple inclusion of *.h (for precompiled header on Mac) 
-- Watcom C pretends to be Microsoft C small model even in 32 bit mode. 
-- don't use unsized arrays to avoid silly warnings by Visual C++: 
-     warning C4746: 'inflate_mask' : unsized array treated as  '__far' 
-     (what's wrong with far data in far model?). 
-- define enum out of inflate_blocks_state to allow compilation with C++ 
- 
-Changes in 0.95 (16 Aug 95) 
-- fix MSDOS small and medium model (now easier to adapt to any compiler) 
-- inlined send_bits 
-- fix the final (:-) bug for deflate with flush (output was correct but 
-  not completely flushed in rare occasions). 
-- default window size is same for compression and decompression 
-  (it's now sufficient to set MAX_WBITS in zconf.h). 
-- voidp -> voidpf and voidnp -> voidp (for consistency with other 
-  typedefs and because voidnp was not near in large model). 
- 
-Changes in 0.94 (13 Aug 95) 
-- support MSDOS medium model 
-- fix deflate with flush (could sometimes generate bad output) 
-- fix deflateReset (zlib header was incorrectly suppressed) 
-- added support for VMS 
-- allow a compression level in gzopen() 
-- gzflush now calls fflush 
-- For deflate with flush, flush even if no more input is provided. 
-- rename libgz.a as libz.a 
-- avoid complex expression in infcodes.c triggering Turbo C bug 
-- work around a problem with gcc on Alpha (in INSERT_STRING) 
-- don't use inline functions (problem with some gcc versions) 
-- allow renaming of Byte, uInt, etc... with #define. 
-- avoid warning about (unused) pointer before start of array in deflate.c 
-- avoid various warnings in gzio.c, example.c, infblock.c, adler32.c, zutil.c 
-- avoid reserved word 'new' in trees.c 
- 
-Changes in 0.93 (25 June 95) 
-- temporarily disable inline functions 
-- make deflate deterministic 
-- give enough lookahead for PARTIAL_FLUSH 
-- Set binary mode for stdin/stdout in minigzip.c for OS/2 
-- don't even use signed char in inflate (not portable enough) 
-- fix inflate memory leak for segmented architectures 
- 
-Changes in 0.92 (3 May 95) 
-- don't assume that char is signed (problem on SGI) 
-- Clear bit buffer when starting a stored block 
-- no memcpy on Pyramid 
-- suppressed inftest.c 
-- optimized fill_window, put longest_match inline for gcc 
-- optimized inflate on stored blocks. 
-- untabify all sources to simplify patches 
- 
-Changes in 0.91 (2 May 95) 
-- Default MEM_LEVEL is 8 (not 9 for Unix) as documented in zlib.h 
-- Document the memory requirements in zconf.h 
-- added "make install" 
-- fix sync search logic in inflateSync 
-- deflate(Z_FULL_FLUSH) now works even if output buffer too short 
-- after inflateSync, don't scare people with just "lo world" 
-- added support for DJGPP 
- 
-Changes in 0.9 (1 May 95) 
-- don't assume that zalloc clears the allocated memory (the TurboC bug 
-  was Mark's bug after all :) 
-- let again gzread copy uncompressed data unchanged (was working in 0.71) 
-- deflate(Z_FULL_FLUSH), inflateReset and inflateSync are now fully implemented 
-- added a test of inflateSync in example.c 
-- moved MAX_WBITS to zconf.h because users might want to change that. 
-- document explicitly that zalloc(64K) on MSDOS must return a normalized 
-  pointer (zero offset) 
-- added Makefiles for Microsoft C, Turbo C, Borland C++ 
-- faster crc32() 
- 
-Changes in 0.8 (29 April 95) 
-- added fast inflate (inffast.c) 
-- deflate(Z_FINISH) now returns Z_STREAM_END when done. Warning: this 
-  is incompatible with previous versions of zlib which returned Z_OK. 
-- work around a TurboC compiler bug (bad code for b << 0, see infutil.h) 
-  (actually that was not a compiler bug, see 0.81 above) 
-- gzread no longer reads one extra byte in certain cases 
-- In gzio destroy(), don't reference a freed structure 
-- avoid many warnings for MSDOS 
-- avoid the ERROR symbol which is used by MS Windows 
- 
-Changes in 0.71 (14 April 95) 
-- Fixed more MSDOS compilation problems :( There is still a bug with 
-  TurboC large model. 
- 
-Changes in 0.7 (14 April 95) 
-- Added full inflate support. 
-- Simplified the crc32() interface. The pre- and post-conditioning 
-  (one's complement) is now done inside crc32(). WARNING: this is 
-  incompatible with previous versions; see zlib.h for the new usage. 
- 
-Changes in 0.61 (12 April 95) 
-- workaround for a bug in TurboC. example and minigzip now work on MSDOS. 
- 
-Changes in 0.6 (11 April 95) 
-- added minigzip.c 
-- added gzdopen to reopen a file descriptor as gzFile 
-- added transparent reading of non-gziped files in gzread. 
-- fixed bug in gzread (don't read crc as data) 
-- fixed bug in destroy (gzio.c) (don't return Z_STREAM_END for gzclose). 
-- don't allocate big arrays in the stack (for MSDOS) 
-- fix some MSDOS compilation problems 
- 
-Changes in 0.5: 
-- do real compression in deflate.c. Z_PARTIAL_FLUSH is supported but 
-  not yet Z_FULL_FLUSH. 
-- support decompression but only in a single step (forced Z_FINISH) 
-- added opaque object for zalloc and zfree. 
-- added deflateReset and inflateReset 
-- added a variable zlib_version for consistency checking. 
-- renamed the 'filter' parameter of deflateInit2 as 'strategy'. 
-  Added Z_FILTERED and Z_HUFFMAN_ONLY constants. 
- 
-Changes in 0.4: 
-- avoid "zip" everywhere, use zlib instead of ziplib. 
-- suppress Z_BLOCK_FLUSH, interpret Z_PARTIAL_FLUSH as block flush 
-  if compression method == 8. 
-- added adler32 and crc32 
-- renamed deflateOptions as deflateInit2, call one or the other but not both 
-- added the method parameter for deflateInit2. 
-- added inflateInit2 
-- simplied considerably deflateInit and inflateInit by not supporting 
-  user-provided history buffer. This is supported only in deflateInit2 
-  and inflateInit2. 
- 
-Changes in 0.3: 
-- prefix all macro names with Z_ 
-- use Z_FINISH instead of deflateEnd to finish compression. 
-- added Z_HUFFMAN_ONLY 
-- added gzerror() 
+- Bytef is define'd instead of typedef'ed (work around Borland bug)
+- added an INDEX file
+- new makefiles for DJGPP (Makefile.dj2), 32-bit Borland (Makefile.b32),
+  Watcom (Makefile.wat), Amiga SAS/C (Makefile.sas)
+- speed up adler32 for modern machines without auto-increment
+- added -ansi for IRIX in configure
+- static_init_done in trees.c is an int
+- define unlink as delete for VMS
+- fix configure for QNX
+- add configure branch for SCO and HPUX
+- avoid many warnings (unused variables, dead assignments, etc...)
+- no fdopen for BeOS
+- fix the Watcom fix for 32 bit mode (define FAR as empty)
+- removed redefinition of Byte for MKWERKS
+- work around an MWKERKS bug (incorrect merge of all .h files)
+
+Changes in 0.99 (27 Jan 96)
+- allow preset dictionary shared between compressor and decompressor
+- allow compression level 0 (no compression)
+- add deflateParams in zlib.h: allow dynamic change of compression level
+  and compression strategy.
+- test large buffers and deflateParams in example.c
+- add optional "configure" to build zlib as a shared library
+- suppress Makefile.qnx, use configure instead
+- fixed deflate for 64-bit systems (detected on Cray)
+- fixed inflate_blocks for 64-bit systems (detected on Alpha)
+- declare Z_DEFLATED in zlib.h (possible parameter for deflateInit2)
+- always return Z_BUF_ERROR when deflate() has nothing to do
+- deflateInit and inflateInit are now macros to allow version checking
+- prefix all global functions and types with z_ with -DZ_PREFIX
+- make falloc completely reentrant (inftrees.c)
+- fixed very unlikely race condition in ct_static_init
+- free in reverse order of allocation to help memory manager
+- use zlib-1.0/* instead of zlib/* inside the tar.gz
+- make zlib warning-free with "gcc -O3 -Wall -Wwrite-strings -Wpointer-arith
+  -Wconversion -Wstrict-prototypes -Wmissing-prototypes"
+- allow gzread on concatenated .gz files
+- deflateEnd now returns Z_DATA_ERROR if it was premature
+- deflate is finally (?) fully deterministic (no matches beyond end of input)
+- Document Z_SYNC_FLUSH
+- add uninstall in Makefile
+- Check for __cpluplus in zlib.h
+- Better test in ct_align for partial flush
+- avoid harmless warnings for Borland C++
+- initialize hash_head in deflate.c
+- avoid warning on fdopen (gzio.c) for HP cc -Aa
+- include stdlib.h for STDC compilers
+- include errno.h for Cray
+- ignore error if ranlib doesn't exist
+- call ranlib twice for NeXTSTEP
+- use exec_prefix instead of prefix for libz.a
+- renamed ct_* as _tr_* to avoid conflict with applications
+- clear z->msg in inflateInit2 before any error return
+- initialize opaque in example.c, gzio.c, deflate.c and inflate.c
+- fixed typo in zconf.h (_GNUC__ => __GNUC__)
+- check for WIN32 in zconf.h and zutil.c (avoid farmalloc in 32-bit mode)
+- fix typo in Make_vms.com (f$trnlnm -> f$getsyi)
+- in fcalloc, normalize pointer if size > 65520 bytes
+- don't use special fcalloc for 32 bit Borland C++
+- use STDC instead of __GO32__ to avoid redeclaring exit, calloc, etc...
+- use Z_BINARY instead of BINARY
+- document that gzclose after gzdopen will close the file
+- allow "a" as mode in gzopen.
+- fix error checking in gzread
+- allow skipping .gz extra-field on pipes
+- added reference to Perl interface in README
+- put the crc table in FAR data (I dislike more and more the medium model :)
+- added get_crc_table
+- added a dimension to all arrays (Borland C can't count).
+- workaround Borland C bug in declaration of inflate_codes_new & inflate_fast
+- guard against multiple inclusion of *.h (for precompiled header on Mac)
+- Watcom C pretends to be Microsoft C small model even in 32 bit mode.
+- don't use unsized arrays to avoid silly warnings by Visual C++:
+     warning C4746: 'inflate_mask' : unsized array treated as  '__far'
+     (what's wrong with far data in far model?).
+- define enum out of inflate_blocks_state to allow compilation with C++
+
+Changes in 0.95 (16 Aug 95)
+- fix MSDOS small and medium model (now easier to adapt to any compiler)
+- inlined send_bits
+- fix the final (:-) bug for deflate with flush (output was correct but
+  not completely flushed in rare occasions).
+- default window size is same for compression and decompression
+  (it's now sufficient to set MAX_WBITS in zconf.h).
+- voidp -> voidpf and voidnp -> voidp (for consistency with other
+  typedefs and because voidnp was not near in large model).
+
+Changes in 0.94 (13 Aug 95)
+- support MSDOS medium model
+- fix deflate with flush (could sometimes generate bad output)
+- fix deflateReset (zlib header was incorrectly suppressed)
+- added support for VMS
+- allow a compression level in gzopen()
+- gzflush now calls fflush
+- For deflate with flush, flush even if no more input is provided.
+- rename libgz.a as libz.a
+- avoid complex expression in infcodes.c triggering Turbo C bug
+- work around a problem with gcc on Alpha (in INSERT_STRING)
+- don't use inline functions (problem with some gcc versions)
+- allow renaming of Byte, uInt, etc... with #define.
+- avoid warning about (unused) pointer before start of array in deflate.c
+- avoid various warnings in gzio.c, example.c, infblock.c, adler32.c, zutil.c
+- avoid reserved word 'new' in trees.c
+
+Changes in 0.93 (25 June 95)
+- temporarily disable inline functions
+- make deflate deterministic
+- give enough lookahead for PARTIAL_FLUSH
+- Set binary mode for stdin/stdout in minigzip.c for OS/2
+- don't even use signed char in inflate (not portable enough)
+- fix inflate memory leak for segmented architectures
+
+Changes in 0.92 (3 May 95)
+- don't assume that char is signed (problem on SGI)
+- Clear bit buffer when starting a stored block
+- no memcpy on Pyramid
+- suppressed inftest.c
+- optimized fill_window, put longest_match inline for gcc
+- optimized inflate on stored blocks.
+- untabify all sources to simplify patches
+
+Changes in 0.91 (2 May 95)
+- Default MEM_LEVEL is 8 (not 9 for Unix) as documented in zlib.h
+- Document the memory requirements in zconf.h
+- added "make install"
+- fix sync search logic in inflateSync
+- deflate(Z_FULL_FLUSH) now works even if output buffer too short
+- after inflateSync, don't scare people with just "lo world"
+- added support for DJGPP
+
+Changes in 0.9 (1 May 95)
+- don't assume that zalloc clears the allocated memory (the TurboC bug
+  was Mark's bug after all :)
+- let again gzread copy uncompressed data unchanged (was working in 0.71)
+- deflate(Z_FULL_FLUSH), inflateReset and inflateSync are now fully implemented
+- added a test of inflateSync in example.c
+- moved MAX_WBITS to zconf.h because users might want to change that.
+- document explicitly that zalloc(64K) on MSDOS must return a normalized
+  pointer (zero offset)
+- added Makefiles for Microsoft C, Turbo C, Borland C++
+- faster crc32()
+
+Changes in 0.8 (29 April 95)
+- added fast inflate (inffast.c)
+- deflate(Z_FINISH) now returns Z_STREAM_END when done. Warning: this
+  is incompatible with previous versions of zlib which returned Z_OK.
+- work around a TurboC compiler bug (bad code for b << 0, see infutil.h)
+  (actually that was not a compiler bug, see 0.81 above)
+- gzread no longer reads one extra byte in certain cases
+- In gzio destroy(), don't reference a freed structure
+- avoid many warnings for MSDOS
+- avoid the ERROR symbol which is used by MS Windows
+
+Changes in 0.71 (14 April 95)
+- Fixed more MSDOS compilation problems :( There is still a bug with
+  TurboC large model.
+
+Changes in 0.7 (14 April 95)
+- Added full inflate support.
+- Simplified the crc32() interface. The pre- and post-conditioning
+  (one's complement) is now done inside crc32(). WARNING: this is
+  incompatible with previous versions; see zlib.h for the new usage.
+
+Changes in 0.61 (12 April 95)
+- workaround for a bug in TurboC. example and minigzip now work on MSDOS.
+
+Changes in 0.6 (11 April 95)
+- added minigzip.c
+- added gzdopen to reopen a file descriptor as gzFile
+- added transparent reading of non-gziped files in gzread.
+- fixed bug in gzread (don't read crc as data)
+- fixed bug in destroy (gzio.c) (don't return Z_STREAM_END for gzclose).
+- don't allocate big arrays in the stack (for MSDOS)
+- fix some MSDOS compilation problems
+
+Changes in 0.5:
+- do real compression in deflate.c. Z_PARTIAL_FLUSH is supported but
+  not yet Z_FULL_FLUSH.
+- support decompression but only in a single step (forced Z_FINISH)
+- added opaque object for zalloc and zfree.
+- added deflateReset and inflateReset
+- added a variable zlib_version for consistency checking.
+- renamed the 'filter' parameter of deflateInit2 as 'strategy'.
+  Added Z_FILTERED and Z_HUFFMAN_ONLY constants.
+
+Changes in 0.4:
+- avoid "zip" everywhere, use zlib instead of ziplib.
+- suppress Z_BLOCK_FLUSH, interpret Z_PARTIAL_FLUSH as block flush
+  if compression method == 8.
+- added adler32 and crc32
+- renamed deflateOptions as deflateInit2, call one or the other but not both
+- added the method parameter for deflateInit2.
+- added inflateInit2
+- simplied considerably deflateInit and inflateInit by not supporting
+  user-provided history buffer. This is supported only in deflateInit2
+  and inflateInit2.
+
+Changes in 0.3:
+- prefix all macro names with Z_
+- use Z_FINISH instead of deflateEnd to finish compression.
+- added Z_HUFFMAN_ONLY
+- added gzerror()
diff --git a/contrib/libs/zlib/FAQ b/contrib/libs/zlib/FAQ
index 628d63d9be..99b7cf92e4 100644
--- a/contrib/libs/zlib/FAQ
+++ b/contrib/libs/zlib/FAQ
@@ -1,368 +1,368 @@
- 
-                Frequently Asked Questions about zlib 
- 
- 
-If your question is not there, please check the zlib home page 
-http://zlib.net/ which may have more recent information. 
-The lastest zlib FAQ is at http://zlib.net/zlib_faq.html 
- 
- 
- 1. Is zlib Y2K-compliant? 
- 
-    Yes. zlib doesn't handle dates. 
- 
- 2. Where can I get a Windows DLL version? 
- 
-    The zlib sources can be compiled without change to produce a DLL.  See the 
-    file win32/DLL_FAQ.txt in the zlib distribution.  Pointers to the 
-    precompiled DLL are found in the zlib web site at http://zlib.net/ . 
- 
- 3. Where can I get a Visual Basic interface to zlib? 
- 
-    See 
-        * http://marknelson.us/1997/01/01/zlib-engine/ 
-        * win32/DLL_FAQ.txt in the zlib distribution 
- 
- 4. compress() returns Z_BUF_ERROR. 
- 
-    Make sure that before the call of compress(), the length of the compressed 
-    buffer is equal to the available size of the compressed buffer and not 
-    zero.  For Visual Basic, check that this parameter is passed by reference 
-    ("as any"), not by value ("as long"). 
- 
- 5. deflate() or inflate() returns Z_BUF_ERROR. 
- 
-    Before making the call, make sure that avail_in and avail_out are not zero. 
-    When setting the parameter flush equal to Z_FINISH, also make sure that 
-    avail_out is big enough to allow processing all pending input.  Note that a 
-    Z_BUF_ERROR is not fatal--another call to deflate() or inflate() can be 
-    made with more input or output space.  A Z_BUF_ERROR may in fact be 
-    unavoidable depending on how the functions are used, since it is not 
-    possible to tell whether or not there is more output pending when 
-    strm.avail_out returns with zero.  See http://zlib.net/zlib_how.html for a 
-    heavily annotated example. 
- 
- 6. Where's the zlib documentation (man pages, etc.)? 
- 
-    It's in zlib.h .  Examples of zlib usage are in the files test/example.c 
-    and test/minigzip.c, with more in examples/ . 
- 
- 7. Why don't you use GNU autoconf or libtool or ...? 
- 
-    Because we would like to keep zlib as a very small and simple package. 
-    zlib is rather portable and doesn't need much configuration. 
- 
- 8. I found a bug in zlib. 
- 
-    Most of the time, such problems are due to an incorrect usage of zlib. 
-    Please try to reproduce the problem with a small program and send the 
-    corresponding source to us at zlib@gzip.org .  Do not send multi-megabyte 
-    data files without prior agreement. 
- 
- 9. Why do I get "undefined reference to gzputc"? 
- 
-    If "make test" produces something like 
- 
-       example.o(.text+0x154): undefined reference to `gzputc' 
- 
-    check that you don't have old files libz.* in /usr/lib, /usr/local/lib or 
-    /usr/X11R6/lib. Remove any old versions, then do "make install". 
- 
-10. I need a Delphi interface to zlib. 
- 
-    See the contrib/delphi directory in the zlib distribution. 
- 
-11. Can zlib handle .zip archives? 
- 
-    Not by itself, no.  See the directory contrib/minizip in the zlib 
-    distribution. 
- 
-12. Can zlib handle .Z files? 
- 
-    No, sorry.  You have to spawn an uncompress or gunzip subprocess, or adapt 
-    the code of uncompress on your own. 
- 
-13. How can I make a Unix shared library? 
- 
-    By default a shared (and a static) library is built for Unix.  So: 
- 
-    make distclean 
-    ./configure 
-    make 
- 
-14. How do I install a shared zlib library on Unix? 
- 
-    After the above, then: 
- 
-    make install 
- 
-    However, many flavors of Unix come with a shared zlib already installed. 
-    Before going to the trouble of compiling a shared version of zlib and 
-    trying to install it, you may want to check if it's already there!  If you 
-    can #include <zlib.h>, it's there.  The -lz option will probably link to 
-    it.  You can check the version at the top of zlib.h or with the 
-    ZLIB_VERSION symbol defined in zlib.h . 
- 
-15. I have a question about OttoPDF. 
- 
-    We are not the authors of OttoPDF. The real author is on the OttoPDF web 
-    site: Joel Hainley, jhainley@myndkryme.com. 
- 
-16. Can zlib decode Flate data in an Adobe PDF file? 
- 
-    Yes. See http://www.pdflib.com/ . To modify PDF forms, see 
-    http://sourceforge.net/projects/acroformtool/ . 
- 
-17. Why am I getting this "register_frame_info not found" error on Solaris? 
- 
-    After installing zlib 1.1.4 on Solaris 2.6, running applications using zlib 
-    generates an error such as: 
- 
-        ld.so.1: rpm: fatal: relocation error: file /usr/local/lib/libz.so: 
-        symbol __register_frame_info: referenced symbol not found 
- 
-    The symbol __register_frame_info is not part of zlib, it is generated by 
-    the C compiler (cc or gcc).  You must recompile applications using zlib 
-    which have this problem.  This problem is specific to Solaris.  See 
-    http://www.sunfreeware.com for Solaris versions of zlib and applications 
-    using zlib. 
- 
-18. Why does gzip give an error on a file I make with compress/deflate? 
- 
-    The compress and deflate functions produce data in the zlib format, which 
-    is different and incompatible with the gzip format.  The gz* functions in 
-    zlib on the other hand use the gzip format.  Both the zlib and gzip formats 
-    use the same compressed data format internally, but have different headers 
-    and trailers around the compressed data. 
- 
-19. Ok, so why are there two different formats? 
- 
-    The gzip format was designed to retain the directory information about a 
-    single file, such as the name and last modification date.  The zlib format 
-    on the other hand was designed for in-memory and communication channel 
-    applications, and has a much more compact header and trailer and uses a 
-    faster integrity check than gzip. 
- 
-20. Well that's nice, but how do I make a gzip file in memory? 
- 
-    You can request that deflate write the gzip format instead of the zlib 
-    format using deflateInit2().  You can also request that inflate decode the 
-    gzip format using inflateInit2().  Read zlib.h for more details. 
- 
-21. Is zlib thread-safe? 
- 
-    Yes.  However any library routines that zlib uses and any application- 
-    provided memory allocation routines must also be thread-safe.  zlib's gz* 
-    functions use stdio library routines, and most of zlib's functions use the 
-    library memory allocation routines by default.  zlib's *Init* functions 
-    allow for the application to provide custom memory allocation routines. 
- 
-    Of course, you should only operate on any given zlib or gzip stream from a 
-    single thread at a time. 
- 
-22. Can I use zlib in my commercial application? 
- 
-    Yes.  Please read the license in zlib.h. 
- 
-23. Is zlib under the GNU license? 
- 
-    No.  Please read the license in zlib.h. 
- 
-24. The license says that altered source versions must be "plainly marked". So 
-    what exactly do I need to do to meet that requirement? 
- 
-    You need to change the ZLIB_VERSION and ZLIB_VERNUM #defines in zlib.h.  In 
-    particular, the final version number needs to be changed to "f", and an 
-    identification string should be appended to ZLIB_VERSION.  Version numbers 
-    x.x.x.f are reserved for modifications to zlib by others than the zlib 
-    maintainers.  For example, if the version of the base zlib you are altering 
-    is "1.2.3.4", then in zlib.h you should change ZLIB_VERNUM to 0x123f, and 
-    ZLIB_VERSION to something like "1.2.3.f-zachary-mods-v3".  You can also 
-    update the version strings in deflate.c and inftrees.c. 
- 
-    For altered source distributions, you should also note the origin and 
-    nature of the changes in zlib.h, as well as in ChangeLog and README, along 
-    with the dates of the alterations.  The origin should include at least your 
-    name (or your company's name), and an email address to contact for help or 
-    issues with the library. 
- 
-    Note that distributing a compiled zlib library along with zlib.h and 
-    zconf.h is also a source distribution, and so you should change 
-    ZLIB_VERSION and ZLIB_VERNUM and note the origin and nature of the changes 
-    in zlib.h as you would for a full source distribution. 
- 
-25. Will zlib work on a big-endian or little-endian architecture, and can I 
-    exchange compressed data between them? 
- 
-    Yes and yes. 
- 
-26. Will zlib work on a 64-bit machine? 
- 
-    Yes.  It has been tested on 64-bit machines, and has no dependence on any 
-    data types being limited to 32-bits in length.  If you have any 
-    difficulties, please provide a complete problem report to zlib@gzip.org 
- 
-27. Will zlib decompress data from the PKWare Data Compression Library? 
- 
-    No.  The PKWare DCL uses a completely different compressed data format than 
-    does PKZIP and zlib.  However, you can look in zlib's contrib/blast 
-    directory for a possible solution to your problem. 
- 
-28. Can I access data randomly in a compressed stream? 
- 
-    No, not without some preparation.  If when compressing you periodically use 
-    Z_FULL_FLUSH, carefully write all the pending data at those points, and 
-    keep an index of those locations, then you can start decompression at those 
-    points.  You have to be careful to not use Z_FULL_FLUSH too often, since it 
-    can significantly degrade compression.  Alternatively, you can scan a 
-    deflate stream once to generate an index, and then use that index for 
-    random access.  See examples/zran.c . 
- 
-29. Does zlib work on MVS, OS/390, CICS, etc.? 
- 
-    It has in the past, but we have not heard of any recent evidence.  There 
-    were working ports of zlib 1.1.4 to MVS, but those links no longer work. 
-    If you know of recent, successful applications of zlib on these operating 
-    systems, please let us know.  Thanks. 
- 
-30. Is there some simpler, easier to read version of inflate I can look at to 
-    understand the deflate format? 
- 
-    First off, you should read RFC 1951.  Second, yes.  Look in zlib's 
-    contrib/puff directory. 
- 
-31. Does zlib infringe on any patents? 
- 
-    As far as we know, no.  In fact, that was originally the whole point behind 
-    zlib.  Look here for some more information: 
- 
-    http://www.gzip.org/#faq11 
- 
-32. Can zlib work with greater than 4 GB of data? 
- 
-    Yes.  inflate() and deflate() will process any amount of data correctly. 
-    Each call of inflate() or deflate() is limited to input and output chunks 
-    of the maximum value that can be stored in the compiler's "unsigned int" 
-    type, but there is no limit to the number of chunks.  Note however that the 
-    strm.total_in and strm_total_out counters may be limited to 4 GB.  These 
-    counters are provided as a convenience and are not used internally by 
-    inflate() or deflate().  The application can easily set up its own counters 
-    updated after each call of inflate() or deflate() to count beyond 4 GB. 
-    compress() and uncompress() may be limited to 4 GB, since they operate in a 
-    single call.  gzseek() and gztell() may be limited to 4 GB depending on how 
-    zlib is compiled.  See the zlibCompileFlags() function in zlib.h. 
- 
-    The word "may" appears several times above since there is a 4 GB limit only 
-    if the compiler's "long" type is 32 bits.  If the compiler's "long" type is 
-    64 bits, then the limit is 16 exabytes. 
- 
-33. Does zlib have any security vulnerabilities? 
- 
-    The only one that we are aware of is potentially in gzprintf().  If zlib is 
-    compiled to use sprintf() or vsprintf(), then there is no protection 
-    against a buffer overflow of an 8K string space (or other value as set by 
-    gzbuffer()), other than the caller of gzprintf() assuring that the output 
-    will not exceed 8K.  On the other hand, if zlib is compiled to use 
-    snprintf() or vsnprintf(), which should normally be the case, then there is 
-    no vulnerability.  The ./configure script will display warnings if an 
-    insecure variation of sprintf() will be used by gzprintf().  Also the 
-    zlibCompileFlags() function will return information on what variant of 
-    sprintf() is used by gzprintf(). 
- 
-    If you don't have snprintf() or vsnprintf() and would like one, you can 
-    find a portable implementation here: 
- 
-        http://www.ijs.si/software/snprintf/ 
- 
-    Note that you should be using the most recent version of zlib.  Versions 
-    1.1.3 and before were subject to a double-free vulnerability, and versions 
-    1.2.1 and 1.2.2 were subject to an access exception when decompressing 
-    invalid compressed data. 
- 
-34. Is there a Java version of zlib? 
- 
-    Probably what you want is to use zlib in Java. zlib is already included 
-    as part of the Java SDK in the java.util.zip package. If you really want 
-    a version of zlib written in the Java language, look on the zlib home 
-    page for links: http://zlib.net/ . 
- 
-35. I get this or that compiler or source-code scanner warning when I crank it 
-    up to maximally-pedantic. Can't you guys write proper code? 
- 
-    Many years ago, we gave up attempting to avoid warnings on every compiler 
-    in the universe.  It just got to be a waste of time, and some compilers 
-    were downright silly as well as contradicted each other.  So now, we simply 
-    make sure that the code always works. 
- 
-36. Valgrind (or some similar memory access checker) says that deflate is 
-    performing a conditional jump that depends on an uninitialized value. 
-    Isn't that a bug? 
- 
-    No.  That is intentional for performance reasons, and the output of deflate 
-    is not affected.  This only started showing up recently since zlib 1.2.x 
-    uses malloc() by default for allocations, whereas earlier versions used 
-    calloc(), which zeros out the allocated memory.  Even though the code was 
-    correct, versions 1.2.4 and later was changed to not stimulate these 
-    checkers. 
- 
-37. Will zlib read the (insert any ancient or arcane format here) compressed 
-    data format? 
- 
-    Probably not. Look in the comp.compression FAQ for pointers to various 
-    formats and associated software. 
- 
-38. How can I encrypt/decrypt zip files with zlib? 
- 
-    zlib doesn't support encryption.  The original PKZIP encryption is very 
-    weak and can be broken with freely available programs.  To get strong 
-    encryption, use GnuPG, http://www.gnupg.org/ , which already includes zlib 
-    compression.  For PKZIP compatible "encryption", look at 
-    http://www.info-zip.org/ 
- 
-39. What's the difference between the "gzip" and "deflate" HTTP 1.1 encodings? 
- 
-    "gzip" is the gzip format, and "deflate" is the zlib format.  They should 
-    probably have called the second one "zlib" instead to avoid confusion with 
-    the raw deflate compressed data format.  While the HTTP 1.1 RFC 2616 
-    correctly points to the zlib specification in RFC 1950 for the "deflate" 
-    transfer encoding, there have been reports of servers and browsers that 
-    incorrectly produce or expect raw deflate data per the deflate 
-    specification in RFC 1951, most notably Microsoft.  So even though the 
-    "deflate" transfer encoding using the zlib format would be the more 
-    efficient approach (and in fact exactly what the zlib format was designed 
-    for), using the "gzip" transfer encoding is probably more reliable due to 
-    an unfortunate choice of name on the part of the HTTP 1.1 authors. 
- 
-    Bottom line: use the gzip format for HTTP 1.1 encoding. 
- 
-40. Does zlib support the new "Deflate64" format introduced by PKWare? 
- 
-    No.  PKWare has apparently decided to keep that format proprietary, since 
-    they have not documented it as they have previous compression formats.  In 
-    any case, the compression improvements are so modest compared to other more 
-    modern approaches, that it's not worth the effort to implement. 
- 
-41. I'm having a problem with the zip functions in zlib, can you help? 
- 
-    There are no zip functions in zlib.  You are probably using minizip by 
-    Giles Vollant, which is found in the contrib directory of zlib.  It is not 
-    part of zlib.  In fact none of the stuff in contrib is part of zlib.  The 
-    files in there are not supported by the zlib authors.  You need to contact 
-    the authors of the respective contribution for help. 
- 
-42. The match.asm code in contrib is under the GNU General Public License. 
-    Since it's part of zlib, doesn't that mean that all of zlib falls under the 
-    GNU GPL? 
- 
-    No.  The files in contrib are not part of zlib.  They were contributed by 
-    other authors and are provided as a convenience to the user within the zlib 
-    distribution.  Each item in contrib has its own license. 
- 
-43. Is zlib subject to export controls?  What is its ECCN? 
- 
-    zlib is not subject to export controls, and so is classified as EAR99. 
- 
-44. Can you please sign these lengthy legal documents and fax them back to us 
-    so that we can use your software in our product? 
- 
-    No. Go away. Shoo. 
+
+                Frequently Asked Questions about zlib
+
+
+If your question is not there, please check the zlib home page
+http://zlib.net/ which may have more recent information.
+The lastest zlib FAQ is at http://zlib.net/zlib_faq.html
+
+
+ 1. Is zlib Y2K-compliant?
+
+    Yes. zlib doesn't handle dates.
+
+ 2. Where can I get a Windows DLL version?
+
+    The zlib sources can be compiled without change to produce a DLL.  See the
+    file win32/DLL_FAQ.txt in the zlib distribution.  Pointers to the
+    precompiled DLL are found in the zlib web site at http://zlib.net/ .
+
+ 3. Where can I get a Visual Basic interface to zlib?
+
+    See
+        * http://marknelson.us/1997/01/01/zlib-engine/
+        * win32/DLL_FAQ.txt in the zlib distribution
+
+ 4. compress() returns Z_BUF_ERROR.
+
+    Make sure that before the call of compress(), the length of the compressed
+    buffer is equal to the available size of the compressed buffer and not
+    zero.  For Visual Basic, check that this parameter is passed by reference
+    ("as any"), not by value ("as long").
+
+ 5. deflate() or inflate() returns Z_BUF_ERROR.
+
+    Before making the call, make sure that avail_in and avail_out are not zero.
+    When setting the parameter flush equal to Z_FINISH, also make sure that
+    avail_out is big enough to allow processing all pending input.  Note that a
+    Z_BUF_ERROR is not fatal--another call to deflate() or inflate() can be
+    made with more input or output space.  A Z_BUF_ERROR may in fact be
+    unavoidable depending on how the functions are used, since it is not
+    possible to tell whether or not there is more output pending when
+    strm.avail_out returns with zero.  See http://zlib.net/zlib_how.html for a
+    heavily annotated example.
+
+ 6. Where's the zlib documentation (man pages, etc.)?
+
+    It's in zlib.h .  Examples of zlib usage are in the files test/example.c
+    and test/minigzip.c, with more in examples/ .
+
+ 7. Why don't you use GNU autoconf or libtool or ...?
+
+    Because we would like to keep zlib as a very small and simple package.
+    zlib is rather portable and doesn't need much configuration.
+
+ 8. I found a bug in zlib.
+
+    Most of the time, such problems are due to an incorrect usage of zlib.
+    Please try to reproduce the problem with a small program and send the
+    corresponding source to us at zlib@gzip.org .  Do not send multi-megabyte
+    data files without prior agreement.
+
+ 9. Why do I get "undefined reference to gzputc"?
+
+    If "make test" produces something like
+
+       example.o(.text+0x154): undefined reference to `gzputc'
+
+    check that you don't have old files libz.* in /usr/lib, /usr/local/lib or
+    /usr/X11R6/lib. Remove any old versions, then do "make install".
+
+10. I need a Delphi interface to zlib.
+
+    See the contrib/delphi directory in the zlib distribution.
+
+11. Can zlib handle .zip archives?
+
+    Not by itself, no.  See the directory contrib/minizip in the zlib
+    distribution.
+
+12. Can zlib handle .Z files?
+
+    No, sorry.  You have to spawn an uncompress or gunzip subprocess, or adapt
+    the code of uncompress on your own.
+
+13. How can I make a Unix shared library?
+
+    By default a shared (and a static) library is built for Unix.  So:
+
+    make distclean
+    ./configure
+    make
+
+14. How do I install a shared zlib library on Unix?
+
+    After the above, then:
+
+    make install
+
+    However, many flavors of Unix come with a shared zlib already installed.
+    Before going to the trouble of compiling a shared version of zlib and
+    trying to install it, you may want to check if it's already there!  If you
+    can #include <zlib.h>, it's there.  The -lz option will probably link to
+    it.  You can check the version at the top of zlib.h or with the
+    ZLIB_VERSION symbol defined in zlib.h .
+
+15. I have a question about OttoPDF.
+
+    We are not the authors of OttoPDF. The real author is on the OttoPDF web
+    site: Joel Hainley, jhainley@myndkryme.com.
+
+16. Can zlib decode Flate data in an Adobe PDF file?
+
+    Yes. See http://www.pdflib.com/ . To modify PDF forms, see
+    http://sourceforge.net/projects/acroformtool/ .
+
+17. Why am I getting this "register_frame_info not found" error on Solaris?
+
+    After installing zlib 1.1.4 on Solaris 2.6, running applications using zlib
+    generates an error such as:
+
+        ld.so.1: rpm: fatal: relocation error: file /usr/local/lib/libz.so:
+        symbol __register_frame_info: referenced symbol not found
+
+    The symbol __register_frame_info is not part of zlib, it is generated by
+    the C compiler (cc or gcc).  You must recompile applications using zlib
+    which have this problem.  This problem is specific to Solaris.  See
+    http://www.sunfreeware.com for Solaris versions of zlib and applications
+    using zlib.
+
+18. Why does gzip give an error on a file I make with compress/deflate?
+
+    The compress and deflate functions produce data in the zlib format, which
+    is different and incompatible with the gzip format.  The gz* functions in
+    zlib on the other hand use the gzip format.  Both the zlib and gzip formats
+    use the same compressed data format internally, but have different headers
+    and trailers around the compressed data.
+
+19. Ok, so why are there two different formats?
+
+    The gzip format was designed to retain the directory information about a
+    single file, such as the name and last modification date.  The zlib format
+    on the other hand was designed for in-memory and communication channel
+    applications, and has a much more compact header and trailer and uses a
+    faster integrity check than gzip.
+
+20. Well that's nice, but how do I make a gzip file in memory?
+
+    You can request that deflate write the gzip format instead of the zlib
+    format using deflateInit2().  You can also request that inflate decode the
+    gzip format using inflateInit2().  Read zlib.h for more details.
+
+21. Is zlib thread-safe?
+
+    Yes.  However any library routines that zlib uses and any application-
+    provided memory allocation routines must also be thread-safe.  zlib's gz*
+    functions use stdio library routines, and most of zlib's functions use the
+    library memory allocation routines by default.  zlib's *Init* functions
+    allow for the application to provide custom memory allocation routines.
+
+    Of course, you should only operate on any given zlib or gzip stream from a
+    single thread at a time.
+
+22. Can I use zlib in my commercial application?
+
+    Yes.  Please read the license in zlib.h.
+
+23. Is zlib under the GNU license?
+
+    No.  Please read the license in zlib.h.
+
+24. The license says that altered source versions must be "plainly marked". So
+    what exactly do I need to do to meet that requirement?
+
+    You need to change the ZLIB_VERSION and ZLIB_VERNUM #defines in zlib.h.  In
+    particular, the final version number needs to be changed to "f", and an
+    identification string should be appended to ZLIB_VERSION.  Version numbers
+    x.x.x.f are reserved for modifications to zlib by others than the zlib
+    maintainers.  For example, if the version of the base zlib you are altering
+    is "1.2.3.4", then in zlib.h you should change ZLIB_VERNUM to 0x123f, and
+    ZLIB_VERSION to something like "1.2.3.f-zachary-mods-v3".  You can also
+    update the version strings in deflate.c and inftrees.c.
+
+    For altered source distributions, you should also note the origin and
+    nature of the changes in zlib.h, as well as in ChangeLog and README, along
+    with the dates of the alterations.  The origin should include at least your
+    name (or your company's name), and an email address to contact for help or
+    issues with the library.
+
+    Note that distributing a compiled zlib library along with zlib.h and
+    zconf.h is also a source distribution, and so you should change
+    ZLIB_VERSION and ZLIB_VERNUM and note the origin and nature of the changes
+    in zlib.h as you would for a full source distribution.
+
+25. Will zlib work on a big-endian or little-endian architecture, and can I
+    exchange compressed data between them?
+
+    Yes and yes.
+
+26. Will zlib work on a 64-bit machine?
+
+    Yes.  It has been tested on 64-bit machines, and has no dependence on any
+    data types being limited to 32-bits in length.  If you have any
+    difficulties, please provide a complete problem report to zlib@gzip.org
+
+27. Will zlib decompress data from the PKWare Data Compression Library?
+
+    No.  The PKWare DCL uses a completely different compressed data format than
+    does PKZIP and zlib.  However, you can look in zlib's contrib/blast
+    directory for a possible solution to your problem.
+
+28. Can I access data randomly in a compressed stream?
+
+    No, not without some preparation.  If when compressing you periodically use
+    Z_FULL_FLUSH, carefully write all the pending data at those points, and
+    keep an index of those locations, then you can start decompression at those
+    points.  You have to be careful to not use Z_FULL_FLUSH too often, since it
+    can significantly degrade compression.  Alternatively, you can scan a
+    deflate stream once to generate an index, and then use that index for
+    random access.  See examples/zran.c .
+
+29. Does zlib work on MVS, OS/390, CICS, etc.?
+
+    It has in the past, but we have not heard of any recent evidence.  There
+    were working ports of zlib 1.1.4 to MVS, but those links no longer work.
+    If you know of recent, successful applications of zlib on these operating
+    systems, please let us know.  Thanks.
+
+30. Is there some simpler, easier to read version of inflate I can look at to
+    understand the deflate format?
+
+    First off, you should read RFC 1951.  Second, yes.  Look in zlib's
+    contrib/puff directory.
+
+31. Does zlib infringe on any patents?
+
+    As far as we know, no.  In fact, that was originally the whole point behind
+    zlib.  Look here for some more information:
+
+    http://www.gzip.org/#faq11
+
+32. Can zlib work with greater than 4 GB of data?
+
+    Yes.  inflate() and deflate() will process any amount of data correctly.
+    Each call of inflate() or deflate() is limited to input and output chunks
+    of the maximum value that can be stored in the compiler's "unsigned int"
+    type, but there is no limit to the number of chunks.  Note however that the
+    strm.total_in and strm_total_out counters may be limited to 4 GB.  These
+    counters are provided as a convenience and are not used internally by
+    inflate() or deflate().  The application can easily set up its own counters
+    updated after each call of inflate() or deflate() to count beyond 4 GB.
+    compress() and uncompress() may be limited to 4 GB, since they operate in a
+    single call.  gzseek() and gztell() may be limited to 4 GB depending on how
+    zlib is compiled.  See the zlibCompileFlags() function in zlib.h.
+
+    The word "may" appears several times above since there is a 4 GB limit only
+    if the compiler's "long" type is 32 bits.  If the compiler's "long" type is
+    64 bits, then the limit is 16 exabytes.
+
+33. Does zlib have any security vulnerabilities?
+
+    The only one that we are aware of is potentially in gzprintf().  If zlib is
+    compiled to use sprintf() or vsprintf(), then there is no protection
+    against a buffer overflow of an 8K string space (or other value as set by
+    gzbuffer()), other than the caller of gzprintf() assuring that the output
+    will not exceed 8K.  On the other hand, if zlib is compiled to use
+    snprintf() or vsnprintf(), which should normally be the case, then there is
+    no vulnerability.  The ./configure script will display warnings if an
+    insecure variation of sprintf() will be used by gzprintf().  Also the
+    zlibCompileFlags() function will return information on what variant of
+    sprintf() is used by gzprintf().
+
+    If you don't have snprintf() or vsnprintf() and would like one, you can
+    find a portable implementation here:
+
+        http://www.ijs.si/software/snprintf/
+
+    Note that you should be using the most recent version of zlib.  Versions
+    1.1.3 and before were subject to a double-free vulnerability, and versions
+    1.2.1 and 1.2.2 were subject to an access exception when decompressing
+    invalid compressed data.
+
+34. Is there a Java version of zlib?
+
+    Probably what you want is to use zlib in Java. zlib is already included
+    as part of the Java SDK in the java.util.zip package. If you really want
+    a version of zlib written in the Java language, look on the zlib home
+    page for links: http://zlib.net/ .
+
+35. I get this or that compiler or source-code scanner warning when I crank it
+    up to maximally-pedantic. Can't you guys write proper code?
+
+    Many years ago, we gave up attempting to avoid warnings on every compiler
+    in the universe.  It just got to be a waste of time, and some compilers
+    were downright silly as well as contradicted each other.  So now, we simply
+    make sure that the code always works.
+
+36. Valgrind (or some similar memory access checker) says that deflate is
+    performing a conditional jump that depends on an uninitialized value.
+    Isn't that a bug?
+
+    No.  That is intentional for performance reasons, and the output of deflate
+    is not affected.  This only started showing up recently since zlib 1.2.x
+    uses malloc() by default for allocations, whereas earlier versions used
+    calloc(), which zeros out the allocated memory.  Even though the code was
+    correct, versions 1.2.4 and later was changed to not stimulate these
+    checkers.
+
+37. Will zlib read the (insert any ancient or arcane format here) compressed
+    data format?
+
+    Probably not. Look in the comp.compression FAQ for pointers to various
+    formats and associated software.
+
+38. How can I encrypt/decrypt zip files with zlib?
+
+    zlib doesn't support encryption.  The original PKZIP encryption is very
+    weak and can be broken with freely available programs.  To get strong
+    encryption, use GnuPG, http://www.gnupg.org/ , which already includes zlib
+    compression.  For PKZIP compatible "encryption", look at
+    http://www.info-zip.org/
+
+39. What's the difference between the "gzip" and "deflate" HTTP 1.1 encodings?
+
+    "gzip" is the gzip format, and "deflate" is the zlib format.  They should
+    probably have called the second one "zlib" instead to avoid confusion with
+    the raw deflate compressed data format.  While the HTTP 1.1 RFC 2616
+    correctly points to the zlib specification in RFC 1950 for the "deflate"
+    transfer encoding, there have been reports of servers and browsers that
+    incorrectly produce or expect raw deflate data per the deflate
+    specification in RFC 1951, most notably Microsoft.  So even though the
+    "deflate" transfer encoding using the zlib format would be the more
+    efficient approach (and in fact exactly what the zlib format was designed
+    for), using the "gzip" transfer encoding is probably more reliable due to
+    an unfortunate choice of name on the part of the HTTP 1.1 authors.
+
+    Bottom line: use the gzip format for HTTP 1.1 encoding.
+
+40. Does zlib support the new "Deflate64" format introduced by PKWare?
+
+    No.  PKWare has apparently decided to keep that format proprietary, since
+    they have not documented it as they have previous compression formats.  In
+    any case, the compression improvements are so modest compared to other more
+    modern approaches, that it's not worth the effort to implement.
+
+41. I'm having a problem with the zip functions in zlib, can you help?
+
+    There are no zip functions in zlib.  You are probably using minizip by
+    Giles Vollant, which is found in the contrib directory of zlib.  It is not
+    part of zlib.  In fact none of the stuff in contrib is part of zlib.  The
+    files in there are not supported by the zlib authors.  You need to contact
+    the authors of the respective contribution for help.
+
+42. The match.asm code in contrib is under the GNU General Public License.
+    Since it's part of zlib, doesn't that mean that all of zlib falls under the
+    GNU GPL?
+
+    No.  The files in contrib are not part of zlib.  They were contributed by
+    other authors and are provided as a convenience to the user within the zlib
+    distribution.  Each item in contrib has its own license.
+
+43. Is zlib subject to export controls?  What is its ECCN?
+
+    zlib is not subject to export controls, and so is classified as EAR99.
+
+44. Can you please sign these lengthy legal documents and fax them back to us
+    so that we can use your software in our product?
+
+    No. Go away. Shoo.
diff --git a/contrib/libs/zlib/INDEX b/contrib/libs/zlib/INDEX
index dd0cc5f496..2ba0641204 100644
--- a/contrib/libs/zlib/INDEX
+++ b/contrib/libs/zlib/INDEX
@@ -1,68 +1,68 @@
-CMakeLists.txt  cmake build file 
-ChangeLog       history of changes 
-FAQ             Frequently Asked Questions about zlib 
-INDEX           this file 
-Makefile        dummy Makefile that tells you to ./configure 
-Makefile.in     template for Unix Makefile 
-README          guess what 
-configure       configure script for Unix 
-make_vms.com    makefile for VMS 
-test/example.c  zlib usages examples for build testing 
-test/minigzip.c minimal gzip-like functionality for build testing 
-test/infcover.c inf*.c code coverage for build coverage testing 
-treebuild.xml   XML description of source file dependencies 
-zconf.h.cmakein zconf.h template for cmake 
-zconf.h.in      zconf.h template for configure 
-zlib.3          Man page for zlib 
-zlib.3.pdf      Man page in PDF format 
-zlib.map        Linux symbol information 
-zlib.pc.in      Template for pkg-config descriptor 
-zlib.pc.cmakein zlib.pc template for cmake 
-zlib2ansi       perl script to convert source files for C++ compilation 
- 
-amiga/          makefiles for Amiga SAS C 
-as400/          makefiles for AS/400 
-doc/            documentation for formats and algorithms 
-msdos/          makefiles for MSDOS 
-nintendods/     makefile for Nintendo DS 
-old/            makefiles for various architectures and zlib documentation 
-                files that have not yet been updated for zlib 1.2.x 
-qnx/            makefiles for QNX 
-watcom/         makefiles for OpenWatcom 
-win32/          makefiles for Windows 
- 
-                zlib public header files (required for library use): 
-zconf.h 
-zlib.h 
- 
-                private source files used to build the zlib library: 
-adler32.c 
-compress.c 
-crc32.c 
-crc32.h 
-deflate.c 
-deflate.h 
-gzclose.c 
-gzguts.h 
-gzlib.c 
-gzread.c 
-gzwrite.c 
-infback.c 
-inffast.c 
-inffast.h 
-inffixed.h 
-inflate.c 
-inflate.h 
-inftrees.c 
-inftrees.h 
-trees.c 
-trees.h 
-uncompr.c 
-zutil.c 
-zutil.h 
- 
-                source files for sample programs 
-See examples/README.examples 
- 
-                unsupported contributions by third parties 
-See contrib/README.contrib 
+CMakeLists.txt  cmake build file
+ChangeLog       history of changes
+FAQ             Frequently Asked Questions about zlib
+INDEX           this file
+Makefile        dummy Makefile that tells you to ./configure
+Makefile.in     template for Unix Makefile
+README          guess what
+configure       configure script for Unix
+make_vms.com    makefile for VMS
+test/example.c  zlib usages examples for build testing
+test/minigzip.c minimal gzip-like functionality for build testing
+test/infcover.c inf*.c code coverage for build coverage testing
+treebuild.xml   XML description of source file dependencies
+zconf.h.cmakein zconf.h template for cmake
+zconf.h.in      zconf.h template for configure
+zlib.3          Man page for zlib
+zlib.3.pdf      Man page in PDF format
+zlib.map        Linux symbol information
+zlib.pc.in      Template for pkg-config descriptor
+zlib.pc.cmakein zlib.pc template for cmake
+zlib2ansi       perl script to convert source files for C++ compilation
+
+amiga/          makefiles for Amiga SAS C
+as400/          makefiles for AS/400
+doc/            documentation for formats and algorithms
+msdos/          makefiles for MSDOS
+nintendods/     makefile for Nintendo DS
+old/            makefiles for various architectures and zlib documentation
+                files that have not yet been updated for zlib 1.2.x
+qnx/            makefiles for QNX
+watcom/         makefiles for OpenWatcom
+win32/          makefiles for Windows
+
+                zlib public header files (required for library use):
+zconf.h
+zlib.h
+
+                private source files used to build the zlib library:
+adler32.c
+compress.c
+crc32.c
+crc32.h
+deflate.c
+deflate.h
+gzclose.c
+gzguts.h
+gzlib.c
+gzread.c
+gzwrite.c
+infback.c
+inffast.c
+inffast.h
+inffixed.h
+inflate.c
+inflate.h
+inftrees.c
+inftrees.h
+trees.c
+trees.h
+uncompr.c
+zutil.c
+zutil.h
+
+                source files for sample programs
+See examples/README.examples
+
+                unsupported contributions by third parties
+See contrib/README.contrib
diff --git a/contrib/libs/zlib/README b/contrib/libs/zlib/README
index 6a71172c94..51106de475 100644
--- a/contrib/libs/zlib/README
+++ b/contrib/libs/zlib/README
@@ -1,115 +1,115 @@
-ZLIB DATA COMPRESSION LIBRARY 
- 
+ZLIB DATA COMPRESSION LIBRARY
+
 zlib 1.2.11 is a general purpose data compression library.  All the code is
-thread safe.  The data format used by the zlib library is described by RFCs 
-(Request for Comments) 1950 to 1952 in the files 
-http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and 
-rfc1952 (gzip format). 
- 
-All functions of the compression library are documented in the file zlib.h 
-(volunteer to write man pages welcome, contact zlib@gzip.org).  A usage example 
-of the library is given in the file test/example.c which also tests that 
-the library is working correctly.  Another example is given in the file 
-test/minigzip.c.  The compression library itself is composed of all source 
-files in the root directory. 
- 
-To compile all files and run the test program, follow the instructions given at 
-the top of Makefile.in.  In short "./configure; make test", and if that goes 
-well, "make install" should work for most flavors of Unix.  For Windows, use 
-one of the special makefiles in win32/ or contrib/vstudio/ .  For VMS, use 
-make_vms.com. 
- 
-Questions about zlib should be sent to <zlib@gzip.org>, or to Gilles Vollant 
-<info@winimage.com> for the Windows DLL version.  The zlib home page is 
-http://zlib.net/ .  Before reporting a problem, please check this site to 
-verify that you have the latest version of zlib; otherwise get the latest 
-version and check whether the problem still exists or not. 
- 
-PLEASE read the zlib FAQ http://zlib.net/zlib_faq.html before asking for help. 
- 
-Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan.  1997 
-issue of Dr.  Dobb's Journal; a copy of the article is available at 
-http://marknelson.us/1997/01/01/zlib-engine/ . 
- 
+thread safe.  The data format used by the zlib library is described by RFCs
+(Request for Comments) 1950 to 1952 in the files
+http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and
+rfc1952 (gzip format).
+
+All functions of the compression library are documented in the file zlib.h
+(volunteer to write man pages welcome, contact zlib@gzip.org).  A usage example
+of the library is given in the file test/example.c which also tests that
+the library is working correctly.  Another example is given in the file
+test/minigzip.c.  The compression library itself is composed of all source
+files in the root directory.
+
+To compile all files and run the test program, follow the instructions given at
+the top of Makefile.in.  In short "./configure; make test", and if that goes
+well, "make install" should work for most flavors of Unix.  For Windows, use
+one of the special makefiles in win32/ or contrib/vstudio/ .  For VMS, use
+make_vms.com.
+
+Questions about zlib should be sent to <zlib@gzip.org>, or to Gilles Vollant
+<info@winimage.com> for the Windows DLL version.  The zlib home page is
+http://zlib.net/ .  Before reporting a problem, please check this site to
+verify that you have the latest version of zlib; otherwise get the latest
+version and check whether the problem still exists or not.
+
+PLEASE read the zlib FAQ http://zlib.net/zlib_faq.html before asking for help.
+
+Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan.  1997
+issue of Dr.  Dobb's Journal; a copy of the article is available at
+http://marknelson.us/1997/01/01/zlib-engine/ .
+
 The changes made in version 1.2.11 are documented in the file ChangeLog.
- 
-Unsupported third party contributions are provided in directory contrib/ . 
- 
-zlib is available in Java using the java.util.zip package, documented at 
-http://java.sun.com/developer/technicalArticles/Programming/compression/ . 
- 
-A Perl interface to zlib written by Paul Marquess <pmqs@cpan.org> is available 
-at CPAN (Comprehensive Perl Archive Network) sites, including 
-http://search.cpan.org/~pmqs/IO-Compress-Zlib/ . 
- 
-A Python interface to zlib written by A.M. Kuchling <amk@amk.ca> is 
-available in Python 1.5 and later versions, see 
-http://docs.python.org/library/zlib.html . 
- 
-zlib is built into tcl: http://wiki.tcl.tk/4610 . 
- 
-An experimental package to read and write files in .zip format, written on top 
-of zlib by Gilles Vollant <info@winimage.com>, is available in the 
-contrib/minizip directory of zlib. 
- 
- 
-Notes for some targets: 
- 
-- For Windows DLL versions, please see win32/DLL_FAQ.txt 
- 
-- For 64-bit Irix, deflate.c must be compiled without any optimization. With 
-  -O, one libpng test fails. The test works in 32 bit mode (with the -n32 
-  compiler flag). The compiler bug has been reported to SGI. 
- 
-- zlib doesn't work with gcc 2.6.3 on a DEC 3000/300LX under OSF/1 2.1 it works 
-  when compiled with cc. 
- 
-- On Digital Unix 4.0D (formely OSF/1) on AlphaServer, the cc option -std1 is 
-  necessary to get gzprintf working correctly. This is done by configure. 
- 
-- zlib doesn't work on HP-UX 9.05 with some versions of /bin/cc. It works with 
-  other compilers. Use "make test" to check your compiler. 
- 
-- gzdopen is not supported on RISCOS or BEOS. 
- 
-- For PalmOs, see http://palmzlib.sourceforge.net/ 
- 
- 
-Acknowledgments: 
- 
-  The deflate format used by zlib was defined by Phil Katz.  The deflate and 
-  zlib specifications were written by L.  Peter Deutsch.  Thanks to all the 
-  people who reported problems and suggested various improvements in zlib; they 
-  are too numerous to cite here. 
- 
-Copyright notice: 
- 
+
+Unsupported third party contributions are provided in directory contrib/ .
+
+zlib is available in Java using the java.util.zip package, documented at
+http://java.sun.com/developer/technicalArticles/Programming/compression/ .
+
+A Perl interface to zlib written by Paul Marquess <pmqs@cpan.org> is available
+at CPAN (Comprehensive Perl Archive Network) sites, including
+http://search.cpan.org/~pmqs/IO-Compress-Zlib/ .
+
+A Python interface to zlib written by A.M. Kuchling <amk@amk.ca> is
+available in Python 1.5 and later versions, see
+http://docs.python.org/library/zlib.html .
+
+zlib is built into tcl: http://wiki.tcl.tk/4610 .
+
+An experimental package to read and write files in .zip format, written on top
+of zlib by Gilles Vollant <info@winimage.com>, is available in the
+contrib/minizip directory of zlib.
+
+
+Notes for some targets:
+
+- For Windows DLL versions, please see win32/DLL_FAQ.txt
+
+- For 64-bit Irix, deflate.c must be compiled without any optimization. With
+  -O, one libpng test fails. The test works in 32 bit mode (with the -n32
+  compiler flag). The compiler bug has been reported to SGI.
+
+- zlib doesn't work with gcc 2.6.3 on a DEC 3000/300LX under OSF/1 2.1 it works
+  when compiled with cc.
+
+- On Digital Unix 4.0D (formely OSF/1) on AlphaServer, the cc option -std1 is
+  necessary to get gzprintf working correctly. This is done by configure.
+
+- zlib doesn't work on HP-UX 9.05 with some versions of /bin/cc. It works with
+  other compilers. Use "make test" to check your compiler.
+
+- gzdopen is not supported on RISCOS or BEOS.
+
+- For PalmOs, see http://palmzlib.sourceforge.net/
+
+
+Acknowledgments:
+
+  The deflate format used by zlib was defined by Phil Katz.  The deflate and
+  zlib specifications were written by L.  Peter Deutsch.  Thanks to all the
+  people who reported problems and suggested various improvements in zlib; they
+  are too numerous to cite here.
+
+Copyright notice:
+
  (C) 1995-2017 Jean-loup Gailly and Mark Adler
- 
-  This software is provided 'as-is', without any express or implied 
-  warranty.  In no event will the authors be held liable for any damages 
-  arising from the use of this software. 
- 
-  Permission is granted to anyone to use this software for any purpose, 
-  including commercial applications, and to alter it and redistribute it 
-  freely, subject to the following restrictions: 
- 
-  1. The origin of this software must not be misrepresented; you must not 
-     claim that you wrote the original software. If you use this software 
-     in a product, an acknowledgment in the product documentation would be 
-     appreciated but is not required. 
-  2. Altered source versions must be plainly marked as such, and must not be 
-     misrepresented as being the original software. 
-  3. This notice may not be removed or altered from any source distribution. 
- 
-  Jean-loup Gailly        Mark Adler 
-  jloup@gzip.org          madler@alumni.caltech.edu 
- 
-If you use the zlib library in a product, we would appreciate *not* receiving 
-lengthy legal documents to sign.  The sources are provided for free but without 
-warranty of any kind.  The library has been entirely written by Jean-loup 
-Gailly and Mark Adler; it does not include third-party code. 
- 
-If you redistribute modified sources, we would appreciate that you include in 
-the file ChangeLog history information documenting your changes.  Please read 
-the FAQ for more information on the distribution of modified source versions. 
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Jean-loup Gailly        Mark Adler
+  jloup@gzip.org          madler@alumni.caltech.edu
+
+If you use the zlib library in a product, we would appreciate *not* receiving
+lengthy legal documents to sign.  The sources are provided for free but without
+warranty of any kind.  The library has been entirely written by Jean-loup
+Gailly and Mark Adler; it does not include third-party code.
+
+If you redistribute modified sources, we would appreciate that you include in
+the file ChangeLog history information documenting your changes.  Please read
+the FAQ for more information on the distribution of modified source versions.
diff --git a/contrib/libs/zlib/adler32.c b/contrib/libs/zlib/adler32.c
index f3d2dda97a..d0be4380a3 100644
--- a/contrib/libs/zlib/adler32.c
+++ b/contrib/libs/zlib/adler32.c
@@ -1,136 +1,136 @@
-/* adler32.c -- compute the Adler-32 checksum of a data stream 
+/* adler32.c -- compute the Adler-32 checksum of a data stream
  * Copyright (C) 1995-2011, 2016 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */ 
- 
-/* @(#) $Id$ */ 
- 
-#include "zutil.h" 
- 
-local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2)); 
- 
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
+#include "zutil.h"
+
+local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
+
 #define BASE 65521U     /* largest prime smaller than 65536 */
-#define NMAX 5552 
-/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */ 
- 
-#define DO1(buf,i)  {adler += (buf)[i]; sum2 += adler;} 
-#define DO2(buf,i)  DO1(buf,i); DO1(buf,i+1); 
-#define DO4(buf,i)  DO2(buf,i); DO2(buf,i+2); 
-#define DO8(buf,i)  DO4(buf,i); DO4(buf,i+4); 
-#define DO16(buf)   DO8(buf,0); DO8(buf,8); 
- 
-/* use NO_DIVIDE if your processor does not do division in hardware -- 
-   try it both ways to see which is faster */ 
-#ifdef NO_DIVIDE 
-/* note that this assumes BASE is 65521, where 65536 % 65521 == 15 
-   (thank you to John Reiser for pointing this out) */ 
-#  define CHOP(a) \ 
-    do { \ 
-        unsigned long tmp = a >> 16; \ 
-        a &= 0xffffUL; \ 
-        a += (tmp << 4) - tmp; \ 
-    } while (0) 
-#  define MOD28(a) \ 
-    do { \ 
-        CHOP(a); \ 
-        if (a >= BASE) a -= BASE; \ 
-    } while (0) 
-#  define MOD(a) \ 
-    do { \ 
-        CHOP(a); \ 
-        MOD28(a); \ 
-    } while (0) 
-#  define MOD63(a) \ 
-    do { /* this assumes a is not negative */ \ 
-        z_off64_t tmp = a >> 32; \ 
-        a &= 0xffffffffL; \ 
-        a += (tmp << 8) - (tmp << 5) + tmp; \ 
-        tmp = a >> 16; \ 
-        a &= 0xffffL; \ 
-        a += (tmp << 4) - tmp; \ 
-        tmp = a >> 16; \ 
-        a &= 0xffffL; \ 
-        a += (tmp << 4) - tmp; \ 
-        if (a >= BASE) a -= BASE; \ 
-    } while (0) 
-#else 
-#  define MOD(a) a %= BASE 
-#  define MOD28(a) a %= BASE 
-#  define MOD63(a) a %= BASE 
-#endif 
- 
-/* ========================================================================= */ 
+#define NMAX 5552
+/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
+
+#define DO1(buf,i)  {adler += (buf)[i]; sum2 += adler;}
+#define DO2(buf,i)  DO1(buf,i); DO1(buf,i+1);
+#define DO4(buf,i)  DO2(buf,i); DO2(buf,i+2);
+#define DO8(buf,i)  DO4(buf,i); DO4(buf,i+4);
+#define DO16(buf)   DO8(buf,0); DO8(buf,8);
+
+/* use NO_DIVIDE if your processor does not do division in hardware --
+   try it both ways to see which is faster */
+#ifdef NO_DIVIDE
+/* note that this assumes BASE is 65521, where 65536 % 65521 == 15
+   (thank you to John Reiser for pointing this out) */
+#  define CHOP(a) \
+    do { \
+        unsigned long tmp = a >> 16; \
+        a &= 0xffffUL; \
+        a += (tmp << 4) - tmp; \
+    } while (0)
+#  define MOD28(a) \
+    do { \
+        CHOP(a); \
+        if (a >= BASE) a -= BASE; \
+    } while (0)
+#  define MOD(a) \
+    do { \
+        CHOP(a); \
+        MOD28(a); \
+    } while (0)
+#  define MOD63(a) \
+    do { /* this assumes a is not negative */ \
+        z_off64_t tmp = a >> 32; \
+        a &= 0xffffffffL; \
+        a += (tmp << 8) - (tmp << 5) + tmp; \
+        tmp = a >> 16; \
+        a &= 0xffffL; \
+        a += (tmp << 4) - tmp; \
+        tmp = a >> 16; \
+        a &= 0xffffL; \
+        a += (tmp << 4) - tmp; \
+        if (a >= BASE) a -= BASE; \
+    } while (0)
+#else
+#  define MOD(a) a %= BASE
+#  define MOD28(a) a %= BASE
+#  define MOD63(a) a %= BASE
+#endif
+
+/* ========================================================================= */
 uLong ZEXPORT adler32_z(adler, buf, len)
-    uLong adler; 
-    const Bytef *buf; 
+    uLong adler;
+    const Bytef *buf;
     z_size_t len;
-{ 
-    unsigned long sum2; 
-    unsigned n; 
- 
-    /* split Adler-32 into component sums */ 
-    sum2 = (adler >> 16) & 0xffff; 
-    adler &= 0xffff; 
- 
-    /* in case user likes doing a byte at a time, keep it fast */ 
-    if (len == 1) { 
-        adler += buf[0]; 
-        if (adler >= BASE) 
-            adler -= BASE; 
-        sum2 += adler; 
-        if (sum2 >= BASE) 
-            sum2 -= BASE; 
-        return adler | (sum2 << 16); 
-    } 
- 
-    /* initial Adler-32 value (deferred check for len == 1 speed) */ 
-    if (buf == Z_NULL) 
-        return 1L; 
- 
-    /* in case short lengths are provided, keep it somewhat fast */ 
-    if (len < 16) { 
-        while (len--) { 
-            adler += *buf++; 
-            sum2 += adler; 
-        } 
-        if (adler >= BASE) 
-            adler -= BASE; 
-        MOD28(sum2);            /* only added so many BASE's */ 
-        return adler | (sum2 << 16); 
-    } 
- 
-    /* do length NMAX blocks -- requires just one modulo operation */ 
-    while (len >= NMAX) { 
-        len -= NMAX; 
-        n = NMAX / 16;          /* NMAX is divisible by 16 */ 
-        do { 
-            DO16(buf);          /* 16 sums unrolled */ 
-            buf += 16; 
-        } while (--n); 
-        MOD(adler); 
-        MOD(sum2); 
-    } 
- 
-    /* do remaining bytes (less than NMAX, still just one modulo) */ 
-    if (len) {                  /* avoid modulos if none remaining */ 
-        while (len >= 16) { 
-            len -= 16; 
-            DO16(buf); 
-            buf += 16; 
-        } 
-        while (len--) { 
-            adler += *buf++; 
-            sum2 += adler; 
-        } 
-        MOD(adler); 
-        MOD(sum2); 
-    } 
- 
-    /* return recombined sums */ 
-    return adler | (sum2 << 16); 
-} 
- 
-/* ========================================================================= */ 
+{
+    unsigned long sum2;
+    unsigned n;
+
+    /* split Adler-32 into component sums */
+    sum2 = (adler >> 16) & 0xffff;
+    adler &= 0xffff;
+
+    /* in case user likes doing a byte at a time, keep it fast */
+    if (len == 1) {
+        adler += buf[0];
+        if (adler >= BASE)
+            adler -= BASE;
+        sum2 += adler;
+        if (sum2 >= BASE)
+            sum2 -= BASE;
+        return adler | (sum2 << 16);
+    }
+
+    /* initial Adler-32 value (deferred check for len == 1 speed) */
+    if (buf == Z_NULL)
+        return 1L;
+
+    /* in case short lengths are provided, keep it somewhat fast */
+    if (len < 16) {
+        while (len--) {
+            adler += *buf++;
+            sum2 += adler;
+        }
+        if (adler >= BASE)
+            adler -= BASE;
+        MOD28(sum2);            /* only added so many BASE's */
+        return adler | (sum2 << 16);
+    }
+
+    /* do length NMAX blocks -- requires just one modulo operation */
+    while (len >= NMAX) {
+        len -= NMAX;
+        n = NMAX / 16;          /* NMAX is divisible by 16 */
+        do {
+            DO16(buf);          /* 16 sums unrolled */
+            buf += 16;
+        } while (--n);
+        MOD(adler);
+        MOD(sum2);
+    }
+
+    /* do remaining bytes (less than NMAX, still just one modulo) */
+    if (len) {                  /* avoid modulos if none remaining */
+        while (len >= 16) {
+            len -= 16;
+            DO16(buf);
+            buf += 16;
+        }
+        while (len--) {
+            adler += *buf++;
+            sum2 += adler;
+        }
+        MOD(adler);
+        MOD(sum2);
+    }
+
+    /* return recombined sums */
+    return adler | (sum2 << 16);
+}
+
+/* ========================================================================= */
 uLong ZEXPORT adler32(adler, buf, len)
     uLong adler;
     const Bytef *buf;
@@ -140,47 +140,47 @@ uLong ZEXPORT adler32(adler, buf, len)
 }
 
 /* ========================================================================= */
-local uLong adler32_combine_(adler1, adler2, len2) 
-    uLong adler1; 
-    uLong adler2; 
-    z_off64_t len2; 
-{ 
-    unsigned long sum1; 
-    unsigned long sum2; 
-    unsigned rem; 
- 
-    /* for negative len, return invalid adler32 as a clue for debugging */ 
-    if (len2 < 0) 
-        return 0xffffffffUL; 
- 
-    /* the derivation of this formula is left as an exercise for the reader */ 
-    MOD63(len2);                /* assumes len2 >= 0 */ 
-    rem = (unsigned)len2; 
-    sum1 = adler1 & 0xffff; 
-    sum2 = rem * sum1; 
-    MOD(sum2); 
-    sum1 += (adler2 & 0xffff) + BASE - 1; 
-    sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem; 
-    if (sum1 >= BASE) sum1 -= BASE; 
-    if (sum1 >= BASE) sum1 -= BASE; 
+local uLong adler32_combine_(adler1, adler2, len2)
+    uLong adler1;
+    uLong adler2;
+    z_off64_t len2;
+{
+    unsigned long sum1;
+    unsigned long sum2;
+    unsigned rem;
+
+    /* for negative len, return invalid adler32 as a clue for debugging */
+    if (len2 < 0)
+        return 0xffffffffUL;
+
+    /* the derivation of this formula is left as an exercise for the reader */
+    MOD63(len2);                /* assumes len2 >= 0 */
+    rem = (unsigned)len2;
+    sum1 = adler1 & 0xffff;
+    sum2 = rem * sum1;
+    MOD(sum2);
+    sum1 += (adler2 & 0xffff) + BASE - 1;
+    sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem;
+    if (sum1 >= BASE) sum1 -= BASE;
+    if (sum1 >= BASE) sum1 -= BASE;
     if (sum2 >= ((unsigned long)BASE << 1)) sum2 -= ((unsigned long)BASE << 1);
-    if (sum2 >= BASE) sum2 -= BASE; 
-    return sum1 | (sum2 << 16); 
-} 
- 
-/* ========================================================================= */ 
-uLong ZEXPORT adler32_combine(adler1, adler2, len2) 
-    uLong adler1; 
-    uLong adler2; 
-    z_off_t len2; 
-{ 
-    return adler32_combine_(adler1, adler2, len2); 
-} 
- 
-uLong ZEXPORT adler32_combine64(adler1, adler2, len2) 
-    uLong adler1; 
-    uLong adler2; 
-    z_off64_t len2; 
-{ 
-    return adler32_combine_(adler1, adler2, len2); 
-} 
+    if (sum2 >= BASE) sum2 -= BASE;
+    return sum1 | (sum2 << 16);
+}
+
+/* ========================================================================= */
+uLong ZEXPORT adler32_combine(adler1, adler2, len2)
+    uLong adler1;
+    uLong adler2;
+    z_off_t len2;
+{
+    return adler32_combine_(adler1, adler2, len2);
+}
+
+uLong ZEXPORT adler32_combine64(adler1, adler2, len2)
+    uLong adler1;
+    uLong adler2;
+    z_off64_t len2;
+{
+    return adler32_combine_(adler1, adler2, len2);
+}
diff --git a/contrib/libs/zlib/compress.c b/contrib/libs/zlib/compress.c
index 8aa1dfc443..e2db404abf 100644
--- a/contrib/libs/zlib/compress.c
+++ b/contrib/libs/zlib/compress.c
@@ -1,46 +1,46 @@
-/* compress.c -- compress a memory buffer 
+/* compress.c -- compress a memory buffer
  * Copyright (C) 1995-2005, 2014, 2016 Jean-loup Gailly, Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */ 
- 
-/* @(#) $Id$ */ 
- 
-#define ZLIB_INTERNAL 
-#include "zlib.h" 
- 
-/* =========================================================================== 
-     Compresses the source buffer into the destination buffer. The level 
-   parameter has the same meaning as in deflateInit.  sourceLen is the byte 
-   length of the source buffer. Upon entry, destLen is the total size of the 
-   destination buffer, which must be at least 0.1% larger than sourceLen plus 
-   12 bytes. Upon exit, destLen is the actual size of the compressed buffer. 
- 
-     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough 
-   memory, Z_BUF_ERROR if there was not enough room in the output buffer, 
-   Z_STREAM_ERROR if the level parameter is invalid. 
-*/ 
-int ZEXPORT compress2 (dest, destLen, source, sourceLen, level) 
-    Bytef *dest; 
-    uLongf *destLen; 
-    const Bytef *source; 
-    uLong sourceLen; 
-    int level; 
-{ 
-    z_stream stream; 
-    int err; 
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
+#define ZLIB_INTERNAL
+#include "zlib.h"
+
+/* ===========================================================================
+     Compresses the source buffer into the destination buffer. The level
+   parameter has the same meaning as in deflateInit.  sourceLen is the byte
+   length of the source buffer. Upon entry, destLen is the total size of the
+   destination buffer, which must be at least 0.1% larger than sourceLen plus
+   12 bytes. Upon exit, destLen is the actual size of the compressed buffer.
+
+     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
+   Z_STREAM_ERROR if the level parameter is invalid.
+*/
+int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
+    Bytef *dest;
+    uLongf *destLen;
+    const Bytef *source;
+    uLong sourceLen;
+    int level;
+{
+    z_stream stream;
+    int err;
     const uInt max = (uInt)-1;
     uLong left;
- 
+
     left = *destLen;
     *destLen = 0;
- 
-    stream.zalloc = (alloc_func)0; 
-    stream.zfree = (free_func)0; 
-    stream.opaque = (voidpf)0; 
- 
-    err = deflateInit(&stream, level); 
-    if (err != Z_OK) return err; 
- 
+
+    stream.zalloc = (alloc_func)0;
+    stream.zfree = (free_func)0;
+    stream.opaque = (voidpf)0;
+
+    err = deflateInit(&stream, level);
+    if (err != Z_OK) return err;
+
     stream.next_out = dest;
     stream.avail_out = 0;
     stream.next_in = (z_const Bytef *)source;
@@ -58,29 +58,29 @@ int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
         err = deflate(&stream, sourceLen ? Z_NO_FLUSH : Z_FINISH);
     } while (err == Z_OK);
 
-    *destLen = stream.total_out; 
+    *destLen = stream.total_out;
     deflateEnd(&stream);
     return err == Z_STREAM_END ? Z_OK : err;
-} 
- 
-/* =========================================================================== 
- */ 
-int ZEXPORT compress (dest, destLen, source, sourceLen) 
-    Bytef *dest; 
-    uLongf *destLen; 
-    const Bytef *source; 
-    uLong sourceLen; 
-{ 
-    return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION); 
-} 
- 
-/* =========================================================================== 
-     If the default memLevel or windowBits for deflateInit() is changed, then 
-   this function needs to be updated. 
- */ 
-uLong ZEXPORT compressBound (sourceLen) 
-    uLong sourceLen; 
-{ 
-    return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + 
-           (sourceLen >> 25) + 13; 
-} 
+}
+
+/* ===========================================================================
+ */
+int ZEXPORT compress (dest, destLen, source, sourceLen)
+    Bytef *dest;
+    uLongf *destLen;
+    const Bytef *source;
+    uLong sourceLen;
+{
+    return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION);
+}
+
+/* ===========================================================================
+     If the default memLevel or windowBits for deflateInit() is changed, then
+   this function needs to be updated.
+ */
+uLong ZEXPORT compressBound (sourceLen)
+    uLong sourceLen;
+{
+    return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
+           (sourceLen >> 25) + 13;
+}
diff --git a/contrib/libs/zlib/crc32.c b/contrib/libs/zlib/crc32.c
index cee620cb5c..9580440c0e 100644
--- a/contrib/libs/zlib/crc32.c
+++ b/contrib/libs/zlib/crc32.c
@@ -1,238 +1,238 @@
-/* crc32.c -- compute the CRC-32 of a data stream 
+/* crc32.c -- compute the CRC-32 of a data stream
  * Copyright (C) 1995-2006, 2010, 2011, 2012, 2016 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- * 
- * Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster 
- * CRC methods: exclusive-oring 32 bits of data at a time, and pre-computing 
- * tables for updating the shift register in one step with three exclusive-ors 
- * instead of four steps with four exclusive-ors.  This results in about a 
- * factor of two increase in speed on a Power PC G4 (PPC7455) using gcc -O3. 
- */ 
- 
-/* @(#) $Id$ */ 
- 
-/* 
-  Note on the use of DYNAMIC_CRC_TABLE: there is no mutex or semaphore 
-  protection on the static variables used to control the first-use generation 
-  of the crc tables.  Therefore, if you #define DYNAMIC_CRC_TABLE, you should 
-  first call get_crc_table() to initialize the tables before allowing more than 
-  one thread to use crc32(). 
- 
-  DYNAMIC_CRC_TABLE and MAKECRCH can be #defined to write out crc32.h. 
- */ 
- 
-#ifdef MAKECRCH 
-#  include <stdio.h> 
-#  ifndef DYNAMIC_CRC_TABLE 
-#    define DYNAMIC_CRC_TABLE 
-#  endif /* !DYNAMIC_CRC_TABLE */ 
-#endif /* MAKECRCH */ 
- 
-#include "zutil.h"      /* for STDC and FAR definitions */ 
- 
-/* Definitions for doing the crc four data bytes at a time. */ 
-#if !defined(NOBYFOUR) && defined(Z_U4) 
-#  define BYFOUR 
-#endif 
-#ifdef BYFOUR 
-   local unsigned long crc32_little OF((unsigned long, 
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ *
+ * Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster
+ * CRC methods: exclusive-oring 32 bits of data at a time, and pre-computing
+ * tables for updating the shift register in one step with three exclusive-ors
+ * instead of four steps with four exclusive-ors.  This results in about a
+ * factor of two increase in speed on a Power PC G4 (PPC7455) using gcc -O3.
+ */
+
+/* @(#) $Id$ */
+
+/*
+  Note on the use of DYNAMIC_CRC_TABLE: there is no mutex or semaphore
+  protection on the static variables used to control the first-use generation
+  of the crc tables.  Therefore, if you #define DYNAMIC_CRC_TABLE, you should
+  first call get_crc_table() to initialize the tables before allowing more than
+  one thread to use crc32().
+
+  DYNAMIC_CRC_TABLE and MAKECRCH can be #defined to write out crc32.h.
+ */
+
+#ifdef MAKECRCH
+#  include <stdio.h>
+#  ifndef DYNAMIC_CRC_TABLE
+#    define DYNAMIC_CRC_TABLE
+#  endif /* !DYNAMIC_CRC_TABLE */
+#endif /* MAKECRCH */
+
+#include "zutil.h"      /* for STDC and FAR definitions */
+
+/* Definitions for doing the crc four data bytes at a time. */
+#if !defined(NOBYFOUR) && defined(Z_U4)
+#  define BYFOUR
+#endif
+#ifdef BYFOUR
+   local unsigned long crc32_little OF((unsigned long,
                         const unsigned char FAR *, z_size_t));
-   local unsigned long crc32_big OF((unsigned long, 
+   local unsigned long crc32_big OF((unsigned long,
                         const unsigned char FAR *, z_size_t));
-#  define TBLS 8 
-#else 
-#  define TBLS 1 
-#endif /* BYFOUR */ 
- 
-/* Local functions for crc concatenation */ 
-local unsigned long gf2_matrix_times OF((unsigned long *mat, 
-                                         unsigned long vec)); 
-local void gf2_matrix_square OF((unsigned long *square, unsigned long *mat)); 
-local uLong crc32_combine_ OF((uLong crc1, uLong crc2, z_off64_t len2)); 
- 
- 
-#ifdef DYNAMIC_CRC_TABLE 
- 
-local volatile int crc_table_empty = 1; 
-local z_crc_t FAR crc_table[TBLS][256]; 
-local void make_crc_table OF((void)); 
-#ifdef MAKECRCH 
-   local void write_table OF((FILE *, const z_crc_t FAR *)); 
-#endif /* MAKECRCH */ 
-/* 
-  Generate tables for a byte-wise 32-bit CRC calculation on the polynomial: 
-  x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1. 
- 
-  Polynomials over GF(2) are represented in binary, one bit per coefficient, 
-  with the lowest powers in the most significant bit.  Then adding polynomials 
-  is just exclusive-or, and multiplying a polynomial by x is a right shift by 
-  one.  If we call the above polynomial p, and represent a byte as the 
-  polynomial q, also with the lowest power in the most significant bit (so the 
-  byte 0xb1 is the polynomial x^7+x^3+x+1), then the CRC is (q*x^32) mod p, 
-  where a mod b means the remainder after dividing a by b. 
- 
-  This calculation is done using the shift-register method of multiplying and 
-  taking the remainder.  The register is initialized to zero, and for each 
-  incoming bit, x^32 is added mod p to the register if the bit is a one (where 
-  x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by 
-  x (which is shifting right by one and adding x^32 mod p if the bit shifted 
-  out is a one).  We start with the highest power (least significant bit) of 
-  q and repeat for all eight bits of q. 
- 
-  The first table is simply the CRC of all possible eight bit values.  This is 
-  all the information needed to generate CRCs on data a byte at a time for all 
-  combinations of CRC register values and incoming bytes.  The remaining tables 
-  allow for word-at-a-time CRC calculation for both big-endian and little- 
-  endian machines, where a word is four bytes. 
-*/ 
-local void make_crc_table() 
-{ 
-    z_crc_t c; 
-    int n, k; 
-    z_crc_t poly;                       /* polynomial exclusive-or pattern */ 
-    /* terms of polynomial defining this crc (except x^32): */ 
-    static volatile int first = 1;      /* flag to limit concurrent making */ 
-    static const unsigned char p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26}; 
- 
-    /* See if another task is already doing this (not thread-safe, but better 
-       than nothing -- significantly reduces duration of vulnerability in 
-       case the advice about DYNAMIC_CRC_TABLE is ignored) */ 
-    if (first) { 
-        first = 0; 
- 
-        /* make exclusive-or pattern from polynomial (0xedb88320UL) */ 
-        poly = 0; 
-        for (n = 0; n < (int)(sizeof(p)/sizeof(unsigned char)); n++) 
-            poly |= (z_crc_t)1 << (31 - p[n]); 
- 
-        /* generate a crc for every 8-bit value */ 
-        for (n = 0; n < 256; n++) { 
-            c = (z_crc_t)n; 
-            for (k = 0; k < 8; k++) 
-                c = c & 1 ? poly ^ (c >> 1) : c >> 1; 
-            crc_table[0][n] = c; 
-        } 
- 
-#ifdef BYFOUR 
-        /* generate crc for each value followed by one, two, and three zeros, 
-           and then the byte reversal of those as well as the first table */ 
-        for (n = 0; n < 256; n++) { 
-            c = crc_table[0][n]; 
-            crc_table[4][n] = ZSWAP32(c); 
-            for (k = 1; k < 4; k++) { 
-                c = crc_table[0][c & 0xff] ^ (c >> 8); 
-                crc_table[k][n] = c; 
-                crc_table[k + 4][n] = ZSWAP32(c); 
-            } 
-        } 
-#endif /* BYFOUR */ 
- 
-        crc_table_empty = 0; 
-    } 
-    else {      /* not first */ 
-        /* wait for the other guy to finish (not efficient, but rare) */ 
-        while (crc_table_empty) 
-            ; 
-    } 
- 
-#ifdef MAKECRCH 
-    /* write out CRC tables to crc32.h */ 
-    { 
-        FILE *out; 
- 
-        out = fopen("crc32.h", "w"); 
-        if (out == NULL) return; 
-        fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n"); 
-        fprintf(out, " * Generated automatically by crc32.c\n */\n\n"); 
-        fprintf(out, "local const z_crc_t FAR "); 
-        fprintf(out, "crc_table[TBLS][256] =\n{\n  {\n"); 
-        write_table(out, crc_table[0]); 
-#  ifdef BYFOUR 
-        fprintf(out, "#ifdef BYFOUR\n"); 
-        for (k = 1; k < 8; k++) { 
-            fprintf(out, "  },\n  {\n"); 
-            write_table(out, crc_table[k]); 
-        } 
-        fprintf(out, "#endif\n"); 
-#  endif /* BYFOUR */ 
-        fprintf(out, "  }\n};\n"); 
-        fclose(out); 
-    } 
-#endif /* MAKECRCH */ 
-} 
- 
-#ifdef MAKECRCH 
-local void write_table(out, table) 
-    FILE *out; 
-    const z_crc_t FAR *table; 
-{ 
-    int n; 
- 
-    for (n = 0; n < 256; n++) 
-        fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : "    ", 
-                (unsigned long)(table[n]), 
-                n == 255 ? "\n" : (n % 5 == 4 ? ",\n" : ", ")); 
-} 
-#endif /* MAKECRCH */ 
- 
-#else /* !DYNAMIC_CRC_TABLE */ 
-/* ======================================================================== 
- * Tables of CRC-32s of all single-byte values, made by make_crc_table(). 
- */ 
-#include "crc32.h" 
-#endif /* DYNAMIC_CRC_TABLE */ 
- 
-/* ========================================================================= 
- * This function can be used by asm versions of crc32() 
- */ 
-const z_crc_t FAR * ZEXPORT get_crc_table() 
-{ 
-#ifdef DYNAMIC_CRC_TABLE 
-    if (crc_table_empty) 
-        make_crc_table(); 
-#endif /* DYNAMIC_CRC_TABLE */ 
-    return (const z_crc_t FAR *)crc_table; 
-} 
- 
-/* ========================================================================= */ 
-#define DO1 crc = crc_table[0][((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8) 
-#define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1 
- 
-/* ========================================================================= */ 
+#  define TBLS 8
+#else
+#  define TBLS 1
+#endif /* BYFOUR */
+
+/* Local functions for crc concatenation */
+local unsigned long gf2_matrix_times OF((unsigned long *mat,
+                                         unsigned long vec));
+local void gf2_matrix_square OF((unsigned long *square, unsigned long *mat));
+local uLong crc32_combine_ OF((uLong crc1, uLong crc2, z_off64_t len2));
+
+
+#ifdef DYNAMIC_CRC_TABLE
+
+local volatile int crc_table_empty = 1;
+local z_crc_t FAR crc_table[TBLS][256];
+local void make_crc_table OF((void));
+#ifdef MAKECRCH
+   local void write_table OF((FILE *, const z_crc_t FAR *));
+#endif /* MAKECRCH */
+/*
+  Generate tables for a byte-wise 32-bit CRC calculation on the polynomial:
+  x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1.
+
+  Polynomials over GF(2) are represented in binary, one bit per coefficient,
+  with the lowest powers in the most significant bit.  Then adding polynomials
+  is just exclusive-or, and multiplying a polynomial by x is a right shift by
+  one.  If we call the above polynomial p, and represent a byte as the
+  polynomial q, also with the lowest power in the most significant bit (so the
+  byte 0xb1 is the polynomial x^7+x^3+x+1), then the CRC is (q*x^32) mod p,
+  where a mod b means the remainder after dividing a by b.
+
+  This calculation is done using the shift-register method of multiplying and
+  taking the remainder.  The register is initialized to zero, and for each
+  incoming bit, x^32 is added mod p to the register if the bit is a one (where
+  x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by
+  x (which is shifting right by one and adding x^32 mod p if the bit shifted
+  out is a one).  We start with the highest power (least significant bit) of
+  q and repeat for all eight bits of q.
+
+  The first table is simply the CRC of all possible eight bit values.  This is
+  all the information needed to generate CRCs on data a byte at a time for all
+  combinations of CRC register values and incoming bytes.  The remaining tables
+  allow for word-at-a-time CRC calculation for both big-endian and little-
+  endian machines, where a word is four bytes.
+*/
+local void make_crc_table()
+{
+    z_crc_t c;
+    int n, k;
+    z_crc_t poly;                       /* polynomial exclusive-or pattern */
+    /* terms of polynomial defining this crc (except x^32): */
+    static volatile int first = 1;      /* flag to limit concurrent making */
+    static const unsigned char p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};
+
+    /* See if another task is already doing this (not thread-safe, but better
+       than nothing -- significantly reduces duration of vulnerability in
+       case the advice about DYNAMIC_CRC_TABLE is ignored) */
+    if (first) {
+        first = 0;
+
+        /* make exclusive-or pattern from polynomial (0xedb88320UL) */
+        poly = 0;
+        for (n = 0; n < (int)(sizeof(p)/sizeof(unsigned char)); n++)
+            poly |= (z_crc_t)1 << (31 - p[n]);
+
+        /* generate a crc for every 8-bit value */
+        for (n = 0; n < 256; n++) {
+            c = (z_crc_t)n;
+            for (k = 0; k < 8; k++)
+                c = c & 1 ? poly ^ (c >> 1) : c >> 1;
+            crc_table[0][n] = c;
+        }
+
+#ifdef BYFOUR
+        /* generate crc for each value followed by one, two, and three zeros,
+           and then the byte reversal of those as well as the first table */
+        for (n = 0; n < 256; n++) {
+            c = crc_table[0][n];
+            crc_table[4][n] = ZSWAP32(c);
+            for (k = 1; k < 4; k++) {
+                c = crc_table[0][c & 0xff] ^ (c >> 8);
+                crc_table[k][n] = c;
+                crc_table[k + 4][n] = ZSWAP32(c);
+            }
+        }
+#endif /* BYFOUR */
+
+        crc_table_empty = 0;
+    }
+    else {      /* not first */
+        /* wait for the other guy to finish (not efficient, but rare) */
+        while (crc_table_empty)
+            ;
+    }
+
+#ifdef MAKECRCH
+    /* write out CRC tables to crc32.h */
+    {
+        FILE *out;
+
+        out = fopen("crc32.h", "w");
+        if (out == NULL) return;
+        fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n");
+        fprintf(out, " * Generated automatically by crc32.c\n */\n\n");
+        fprintf(out, "local const z_crc_t FAR ");
+        fprintf(out, "crc_table[TBLS][256] =\n{\n  {\n");
+        write_table(out, crc_table[0]);
+#  ifdef BYFOUR
+        fprintf(out, "#ifdef BYFOUR\n");
+        for (k = 1; k < 8; k++) {
+            fprintf(out, "  },\n  {\n");
+            write_table(out, crc_table[k]);
+        }
+        fprintf(out, "#endif\n");
+#  endif /* BYFOUR */
+        fprintf(out, "  }\n};\n");
+        fclose(out);
+    }
+#endif /* MAKECRCH */
+}
+
+#ifdef MAKECRCH
+local void write_table(out, table)
+    FILE *out;
+    const z_crc_t FAR *table;
+{
+    int n;
+
+    for (n = 0; n < 256; n++)
+        fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : "    ",
+                (unsigned long)(table[n]),
+                n == 255 ? "\n" : (n % 5 == 4 ? ",\n" : ", "));
+}
+#endif /* MAKECRCH */
+
+#else /* !DYNAMIC_CRC_TABLE */
+/* ========================================================================
+ * Tables of CRC-32s of all single-byte values, made by make_crc_table().
+ */
+#include "crc32.h"
+#endif /* DYNAMIC_CRC_TABLE */
+
+/* =========================================================================
+ * This function can be used by asm versions of crc32()
+ */
+const z_crc_t FAR * ZEXPORT get_crc_table()
+{
+#ifdef DYNAMIC_CRC_TABLE
+    if (crc_table_empty)
+        make_crc_table();
+#endif /* DYNAMIC_CRC_TABLE */
+    return (const z_crc_t FAR *)crc_table;
+}
+
+/* ========================================================================= */
+#define DO1 crc = crc_table[0][((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8)
+#define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1
+
+/* ========================================================================= */
 unsigned long ZEXPORT crc32_z(crc, buf, len)
-    unsigned long crc; 
-    const unsigned char FAR *buf; 
+    unsigned long crc;
+    const unsigned char FAR *buf;
     z_size_t len;
-{ 
-    if (buf == Z_NULL) return 0UL; 
- 
-#ifdef DYNAMIC_CRC_TABLE 
-    if (crc_table_empty) 
-        make_crc_table(); 
-#endif /* DYNAMIC_CRC_TABLE */ 
- 
-#ifdef BYFOUR 
-    if (sizeof(void *) == sizeof(ptrdiff_t)) { 
-        z_crc_t endian; 
- 
-        endian = 1; 
-        if (*((unsigned char *)(&endian))) 
-            return crc32_little(crc, buf, len); 
-        else 
-            return crc32_big(crc, buf, len); 
-    } 
-#endif /* BYFOUR */ 
-    crc = crc ^ 0xffffffffUL; 
-    while (len >= 8) { 
-        DO8; 
-        len -= 8; 
-    } 
-    if (len) do { 
-        DO1; 
-    } while (--len); 
-    return crc ^ 0xffffffffUL; 
-} 
- 
+{
+    if (buf == Z_NULL) return 0UL;
+
+#ifdef DYNAMIC_CRC_TABLE
+    if (crc_table_empty)
+        make_crc_table();
+#endif /* DYNAMIC_CRC_TABLE */
+
+#ifdef BYFOUR
+    if (sizeof(void *) == sizeof(ptrdiff_t)) {
+        z_crc_t endian;
+
+        endian = 1;
+        if (*((unsigned char *)(&endian)))
+            return crc32_little(crc, buf, len);
+        else
+            return crc32_big(crc, buf, len);
+    }
+#endif /* BYFOUR */
+    crc = crc ^ 0xffffffffUL;
+    while (len >= 8) {
+        DO8;
+        len -= 8;
+    }
+    if (len) do {
+        DO1;
+    } while (--len);
+    return crc ^ 0xffffffffUL;
+}
+
 /* ========================================================================= */
 unsigned long ZEXPORT crc32(crc, buf, len)
     unsigned long crc;
@@ -242,8 +242,8 @@ unsigned long ZEXPORT crc32(crc, buf, len)
     return crc32_z(crc, buf, len);
 }
 
-#ifdef BYFOUR 
- 
+#ifdef BYFOUR
+
 /*
    This BYFOUR code accesses the passed unsigned char * buffer with a 32-bit
    integer pointer type. This violates the strict aliasing rule, where a
@@ -256,187 +256,187 @@ unsigned long ZEXPORT crc32(crc, buf, len)
    writes to the buffer that is passed to these routines.
  */
 
-/* ========================================================================= */ 
-#define DOLIT4 c ^= *buf4++; \ 
-        c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \ 
-            crc_table[1][(c >> 16) & 0xff] ^ crc_table[0][c >> 24] 
-#define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4 
- 
-/* ========================================================================= */ 
-local unsigned long crc32_little(crc, buf, len) 
-    unsigned long crc; 
-    const unsigned char FAR *buf; 
+/* ========================================================================= */
+#define DOLIT4 c ^= *buf4++; \
+        c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \
+            crc_table[1][(c >> 16) & 0xff] ^ crc_table[0][c >> 24]
+#define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4
+
+/* ========================================================================= */
+local unsigned long crc32_little(crc, buf, len)
+    unsigned long crc;
+    const unsigned char FAR *buf;
     z_size_t len;
-{ 
+{
     register z_crc_t c;
     register const z_crc_t FAR *buf4;
- 
-    c = (z_crc_t)crc; 
-    c = ~c; 
-    while (len && ((ptrdiff_t)buf & 3)) { 
-        c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8); 
-        len--; 
-    } 
- 
-    buf4 = (const z_crc_t FAR *)(const void FAR *)buf; 
-    while (len >= 32) { 
-        DOLIT32; 
-        len -= 32; 
-    } 
-    while (len >= 4) { 
-        DOLIT4; 
-        len -= 4; 
-    } 
-    buf = (const unsigned char FAR *)buf4; 
- 
-    if (len) do { 
-        c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8); 
-    } while (--len); 
-    c = ~c; 
-    return (unsigned long)c; 
-} 
- 
-/* ========================================================================= */ 
+
+    c = (z_crc_t)crc;
+    c = ~c;
+    while (len && ((ptrdiff_t)buf & 3)) {
+        c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
+        len--;
+    }
+
+    buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
+    while (len >= 32) {
+        DOLIT32;
+        len -= 32;
+    }
+    while (len >= 4) {
+        DOLIT4;
+        len -= 4;
+    }
+    buf = (const unsigned char FAR *)buf4;
+
+    if (len) do {
+        c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
+    } while (--len);
+    c = ~c;
+    return (unsigned long)c;
+}
+
+/* ========================================================================= */
 #define DOBIG4 c ^= *buf4++; \
-        c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \ 
-            crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24] 
-#define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4 
- 
-/* ========================================================================= */ 
-local unsigned long crc32_big(crc, buf, len) 
-    unsigned long crc; 
-    const unsigned char FAR *buf; 
+        c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \
+            crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24]
+#define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4
+
+/* ========================================================================= */
+local unsigned long crc32_big(crc, buf, len)
+    unsigned long crc;
+    const unsigned char FAR *buf;
     z_size_t len;
-{ 
+{
     register z_crc_t c;
     register const z_crc_t FAR *buf4;
- 
-    c = ZSWAP32((z_crc_t)crc); 
-    c = ~c; 
-    while (len && ((ptrdiff_t)buf & 3)) { 
-        c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8); 
-        len--; 
-    } 
- 
-    buf4 = (const z_crc_t FAR *)(const void FAR *)buf; 
-    while (len >= 32) { 
-        DOBIG32; 
-        len -= 32; 
-    } 
-    while (len >= 4) { 
-        DOBIG4; 
-        len -= 4; 
-    } 
-    buf = (const unsigned char FAR *)buf4; 
- 
-    if (len) do { 
-        c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8); 
-    } while (--len); 
-    c = ~c; 
-    return (unsigned long)(ZSWAP32(c)); 
-} 
- 
-#endif /* BYFOUR */ 
- 
-#define GF2_DIM 32      /* dimension of GF(2) vectors (length of CRC) */ 
- 
-/* ========================================================================= */ 
-local unsigned long gf2_matrix_times(mat, vec) 
-    unsigned long *mat; 
-    unsigned long vec; 
-{ 
-    unsigned long sum; 
- 
-    sum = 0; 
-    while (vec) { 
-        if (vec & 1) 
-            sum ^= *mat; 
-        vec >>= 1; 
-        mat++; 
-    } 
-    return sum; 
-} 
- 
-/* ========================================================================= */ 
-local void gf2_matrix_square(square, mat) 
-    unsigned long *square; 
-    unsigned long *mat; 
-{ 
-    int n; 
- 
-    for (n = 0; n < GF2_DIM; n++) 
-        square[n] = gf2_matrix_times(mat, mat[n]); 
-} 
- 
-/* ========================================================================= */ 
-local uLong crc32_combine_(crc1, crc2, len2) 
-    uLong crc1; 
-    uLong crc2; 
-    z_off64_t len2; 
-{ 
-    int n; 
-    unsigned long row; 
-    unsigned long even[GF2_DIM];    /* even-power-of-two zeros operator */ 
-    unsigned long odd[GF2_DIM];     /* odd-power-of-two zeros operator */ 
- 
-    /* degenerate case (also disallow negative lengths) */ 
-    if (len2 <= 0) 
-        return crc1; 
- 
-    /* put operator for one zero bit in odd */ 
-    odd[0] = 0xedb88320UL;          /* CRC-32 polynomial */ 
-    row = 1; 
-    for (n = 1; n < GF2_DIM; n++) { 
-        odd[n] = row; 
-        row <<= 1; 
-    } 
- 
-    /* put operator for two zero bits in even */ 
-    gf2_matrix_square(even, odd); 
- 
-    /* put operator for four zero bits in odd */ 
-    gf2_matrix_square(odd, even); 
- 
-    /* apply len2 zeros to crc1 (first square will put the operator for one 
-       zero byte, eight zero bits, in even) */ 
-    do { 
-        /* apply zeros operator for this bit of len2 */ 
-        gf2_matrix_square(even, odd); 
-        if (len2 & 1) 
-            crc1 = gf2_matrix_times(even, crc1); 
-        len2 >>= 1; 
- 
-        /* if no more bits set, then done */ 
-        if (len2 == 0) 
-            break; 
- 
-        /* another iteration of the loop with odd and even swapped */ 
-        gf2_matrix_square(odd, even); 
-        if (len2 & 1) 
-            crc1 = gf2_matrix_times(odd, crc1); 
-        len2 >>= 1; 
- 
-        /* if no more bits set, then done */ 
-    } while (len2 != 0); 
- 
-    /* return combined crc */ 
-    crc1 ^= crc2; 
-    return crc1; 
-} 
- 
-/* ========================================================================= */ 
-uLong ZEXPORT crc32_combine(crc1, crc2, len2) 
-    uLong crc1; 
-    uLong crc2; 
-    z_off_t len2; 
-{ 
-    return crc32_combine_(crc1, crc2, len2); 
-} 
- 
-uLong ZEXPORT crc32_combine64(crc1, crc2, len2) 
-    uLong crc1; 
-    uLong crc2; 
-    z_off64_t len2; 
-{ 
-    return crc32_combine_(crc1, crc2, len2); 
-} 
+
+    c = ZSWAP32((z_crc_t)crc);
+    c = ~c;
+    while (len && ((ptrdiff_t)buf & 3)) {
+        c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
+        len--;
+    }
+
+    buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
+    while (len >= 32) {
+        DOBIG32;
+        len -= 32;
+    }
+    while (len >= 4) {
+        DOBIG4;
+        len -= 4;
+    }
+    buf = (const unsigned char FAR *)buf4;
+
+    if (len) do {
+        c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
+    } while (--len);
+    c = ~c;
+    return (unsigned long)(ZSWAP32(c));
+}
+
+#endif /* BYFOUR */
+
+#define GF2_DIM 32      /* dimension of GF(2) vectors (length of CRC) */
+
+/* ========================================================================= */
+local unsigned long gf2_matrix_times(mat, vec)
+    unsigned long *mat;
+    unsigned long vec;
+{
+    unsigned long sum;
+
+    sum = 0;
+    while (vec) {
+        if (vec & 1)
+            sum ^= *mat;
+        vec >>= 1;
+        mat++;
+    }
+    return sum;
+}
+
+/* ========================================================================= */
+local void gf2_matrix_square(square, mat)
+    unsigned long *square;
+    unsigned long *mat;
+{
+    int n;
+
+    for (n = 0; n < GF2_DIM; n++)
+        square[n] = gf2_matrix_times(mat, mat[n]);
+}
+
+/* ========================================================================= */
+local uLong crc32_combine_(crc1, crc2, len2)
+    uLong crc1;
+    uLong crc2;
+    z_off64_t len2;
+{
+    int n;
+    unsigned long row;
+    unsigned long even[GF2_DIM];    /* even-power-of-two zeros operator */
+    unsigned long odd[GF2_DIM];     /* odd-power-of-two zeros operator */
+
+    /* degenerate case (also disallow negative lengths) */
+    if (len2 <= 0)
+        return crc1;
+
+    /* put operator for one zero bit in odd */
+    odd[0] = 0xedb88320UL;          /* CRC-32 polynomial */
+    row = 1;
+    for (n = 1; n < GF2_DIM; n++) {
+        odd[n] = row;
+        row <<= 1;
+    }
+
+    /* put operator for two zero bits in even */
+    gf2_matrix_square(even, odd);
+
+    /* put operator for four zero bits in odd */
+    gf2_matrix_square(odd, even);
+
+    /* apply len2 zeros to crc1 (first square will put the operator for one
+       zero byte, eight zero bits, in even) */
+    do {
+        /* apply zeros operator for this bit of len2 */
+        gf2_matrix_square(even, odd);
+        if (len2 & 1)
+            crc1 = gf2_matrix_times(even, crc1);
+        len2 >>= 1;
+
+        /* if no more bits set, then done */
+        if (len2 == 0)
+            break;
+
+        /* another iteration of the loop with odd and even swapped */
+        gf2_matrix_square(odd, even);
+        if (len2 & 1)
+            crc1 = gf2_matrix_times(odd, crc1);
+        len2 >>= 1;
+
+        /* if no more bits set, then done */
+    } while (len2 != 0);
+
+    /* return combined crc */
+    crc1 ^= crc2;
+    return crc1;
+}
+
+/* ========================================================================= */
+uLong ZEXPORT crc32_combine(crc1, crc2, len2)
+    uLong crc1;
+    uLong crc2;
+    z_off_t len2;
+{
+    return crc32_combine_(crc1, crc2, len2);
+}
+
+uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
+    uLong crc1;
+    uLong crc2;
+    z_off64_t len2;
+{
+    return crc32_combine_(crc1, crc2, len2);
+}
diff --git a/contrib/libs/zlib/crc32.h b/contrib/libs/zlib/crc32.h
index 28c0efb729..9e0c778102 100644
--- a/contrib/libs/zlib/crc32.h
+++ b/contrib/libs/zlib/crc32.h
@@ -1,441 +1,441 @@
-/* crc32.h -- tables for rapid CRC calculation 
- * Generated automatically by crc32.c 
- */ 
- 
-local const z_crc_t FAR crc_table[TBLS][256] = 
-{ 
-  { 
-    0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL, 
-    0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL, 0x79dcb8a4UL, 
-    0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL, 
-    0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL, 0xf3b97148UL, 0x84be41deUL, 
-    0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL, 
-    0x646ba8c0UL, 0xfd62f97aUL, 0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL, 
-    0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL, 
-    0xa2677172UL, 0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL, 
-    0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL, 
-    0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL, 
-    0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL, 0xcfba9599UL, 
-    0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL, 
-    0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL, 0xb6662d3dUL, 0x76dc4190UL, 
-    0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL, 
-    0x9fbfe4a5UL, 0xe8b8d433UL, 0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL, 
-    0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL, 
-    0x6b6b51f4UL, 0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL, 
-    0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL, 
-    0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL, 
-    0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL, 0xd4bb30e2UL, 
-    0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL, 
-    0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL, 0x44042d73UL, 0x33031de5UL, 
-    0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL, 
-    0xc90c2086UL, 0x5768b525UL, 0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL, 
-    0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL, 
-    0x2eb40d81UL, 0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL, 
-    0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL, 
-    0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL, 
-    0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL, 0xf00f9344UL, 
-    0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL, 
-    0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL, 0x89d32be0UL, 0x10da7a5aUL, 
-    0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL, 
-    0xd6d6a3e8UL, 0xa1d1937eUL, 0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL, 
-    0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL, 
-    0x36034af6UL, 0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL, 
-    0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL, 
-    0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL, 
-    0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL, 0xb5d0cf31UL, 
-    0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL, 
-    0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL, 0x72076785UL, 0x05005713UL, 
-    0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL, 
-    0xe5d5be0dUL, 0x7cdcefb7UL, 0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL, 
-    0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL, 
-    0x18b74777UL, 0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL, 
-    0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL, 
-    0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL, 
-    0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL, 0x40df0b66UL, 
-    0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL, 
-    0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL, 0x24b4a3a6UL, 0xbad03605UL, 
-    0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL, 
-    0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL, 
-    0x2d02ef8dUL 
-#ifdef BYFOUR 
-  }, 
-  { 
-    0x00000000UL, 0x191b3141UL, 0x32366282UL, 0x2b2d53c3UL, 0x646cc504UL, 
-    0x7d77f445UL, 0x565aa786UL, 0x4f4196c7UL, 0xc8d98a08UL, 0xd1c2bb49UL, 
-    0xfaefe88aUL, 0xe3f4d9cbUL, 0xacb54f0cUL, 0xb5ae7e4dUL, 0x9e832d8eUL, 
-    0x87981ccfUL, 0x4ac21251UL, 0x53d92310UL, 0x78f470d3UL, 0x61ef4192UL, 
-    0x2eaed755UL, 0x37b5e614UL, 0x1c98b5d7UL, 0x05838496UL, 0x821b9859UL, 
-    0x9b00a918UL, 0xb02dfadbUL, 0xa936cb9aUL, 0xe6775d5dUL, 0xff6c6c1cUL, 
-    0xd4413fdfUL, 0xcd5a0e9eUL, 0x958424a2UL, 0x8c9f15e3UL, 0xa7b24620UL, 
-    0xbea97761UL, 0xf1e8e1a6UL, 0xe8f3d0e7UL, 0xc3de8324UL, 0xdac5b265UL, 
-    0x5d5daeaaUL, 0x44469febUL, 0x6f6bcc28UL, 0x7670fd69UL, 0x39316baeUL, 
-    0x202a5aefUL, 0x0b07092cUL, 0x121c386dUL, 0xdf4636f3UL, 0xc65d07b2UL, 
-    0xed705471UL, 0xf46b6530UL, 0xbb2af3f7UL, 0xa231c2b6UL, 0x891c9175UL, 
-    0x9007a034UL, 0x179fbcfbUL, 0x0e848dbaUL, 0x25a9de79UL, 0x3cb2ef38UL, 
-    0x73f379ffUL, 0x6ae848beUL, 0x41c51b7dUL, 0x58de2a3cUL, 0xf0794f05UL, 
-    0xe9627e44UL, 0xc24f2d87UL, 0xdb541cc6UL, 0x94158a01UL, 0x8d0ebb40UL, 
-    0xa623e883UL, 0xbf38d9c2UL, 0x38a0c50dUL, 0x21bbf44cUL, 0x0a96a78fUL, 
-    0x138d96ceUL, 0x5ccc0009UL, 0x45d73148UL, 0x6efa628bUL, 0x77e153caUL, 
-    0xbabb5d54UL, 0xa3a06c15UL, 0x888d3fd6UL, 0x91960e97UL, 0xded79850UL, 
-    0xc7cca911UL, 0xece1fad2UL, 0xf5facb93UL, 0x7262d75cUL, 0x6b79e61dUL, 
-    0x4054b5deUL, 0x594f849fUL, 0x160e1258UL, 0x0f152319UL, 0x243870daUL, 
-    0x3d23419bUL, 0x65fd6ba7UL, 0x7ce65ae6UL, 0x57cb0925UL, 0x4ed03864UL, 
-    0x0191aea3UL, 0x188a9fe2UL, 0x33a7cc21UL, 0x2abcfd60UL, 0xad24e1afUL, 
-    0xb43fd0eeUL, 0x9f12832dUL, 0x8609b26cUL, 0xc94824abUL, 0xd05315eaUL, 
-    0xfb7e4629UL, 0xe2657768UL, 0x2f3f79f6UL, 0x362448b7UL, 0x1d091b74UL, 
-    0x04122a35UL, 0x4b53bcf2UL, 0x52488db3UL, 0x7965de70UL, 0x607eef31UL, 
-    0xe7e6f3feUL, 0xfefdc2bfUL, 0xd5d0917cUL, 0xcccba03dUL, 0x838a36faUL, 
-    0x9a9107bbUL, 0xb1bc5478UL, 0xa8a76539UL, 0x3b83984bUL, 0x2298a90aUL, 
-    0x09b5fac9UL, 0x10aecb88UL, 0x5fef5d4fUL, 0x46f46c0eUL, 0x6dd93fcdUL, 
-    0x74c20e8cUL, 0xf35a1243UL, 0xea412302UL, 0xc16c70c1UL, 0xd8774180UL, 
-    0x9736d747UL, 0x8e2de606UL, 0xa500b5c5UL, 0xbc1b8484UL, 0x71418a1aUL, 
-    0x685abb5bUL, 0x4377e898UL, 0x5a6cd9d9UL, 0x152d4f1eUL, 0x0c367e5fUL, 
-    0x271b2d9cUL, 0x3e001cddUL, 0xb9980012UL, 0xa0833153UL, 0x8bae6290UL, 
-    0x92b553d1UL, 0xddf4c516UL, 0xc4eff457UL, 0xefc2a794UL, 0xf6d996d5UL, 
-    0xae07bce9UL, 0xb71c8da8UL, 0x9c31de6bUL, 0x852aef2aUL, 0xca6b79edUL, 
-    0xd37048acUL, 0xf85d1b6fUL, 0xe1462a2eUL, 0x66de36e1UL, 0x7fc507a0UL, 
-    0x54e85463UL, 0x4df36522UL, 0x02b2f3e5UL, 0x1ba9c2a4UL, 0x30849167UL, 
-    0x299fa026UL, 0xe4c5aeb8UL, 0xfdde9ff9UL, 0xd6f3cc3aUL, 0xcfe8fd7bUL, 
-    0x80a96bbcUL, 0x99b25afdUL, 0xb29f093eUL, 0xab84387fUL, 0x2c1c24b0UL, 
-    0x350715f1UL, 0x1e2a4632UL, 0x07317773UL, 0x4870e1b4UL, 0x516bd0f5UL, 
-    0x7a468336UL, 0x635db277UL, 0xcbfad74eUL, 0xd2e1e60fUL, 0xf9ccb5ccUL, 
-    0xe0d7848dUL, 0xaf96124aUL, 0xb68d230bUL, 0x9da070c8UL, 0x84bb4189UL, 
-    0x03235d46UL, 0x1a386c07UL, 0x31153fc4UL, 0x280e0e85UL, 0x674f9842UL, 
-    0x7e54a903UL, 0x5579fac0UL, 0x4c62cb81UL, 0x8138c51fUL, 0x9823f45eUL, 
-    0xb30ea79dUL, 0xaa1596dcUL, 0xe554001bUL, 0xfc4f315aUL, 0xd7626299UL, 
-    0xce7953d8UL, 0x49e14f17UL, 0x50fa7e56UL, 0x7bd72d95UL, 0x62cc1cd4UL, 
-    0x2d8d8a13UL, 0x3496bb52UL, 0x1fbbe891UL, 0x06a0d9d0UL, 0x5e7ef3ecUL, 
-    0x4765c2adUL, 0x6c48916eUL, 0x7553a02fUL, 0x3a1236e8UL, 0x230907a9UL, 
-    0x0824546aUL, 0x113f652bUL, 0x96a779e4UL, 0x8fbc48a5UL, 0xa4911b66UL, 
-    0xbd8a2a27UL, 0xf2cbbce0UL, 0xebd08da1UL, 0xc0fdde62UL, 0xd9e6ef23UL, 
-    0x14bce1bdUL, 0x0da7d0fcUL, 0x268a833fUL, 0x3f91b27eUL, 0x70d024b9UL, 
-    0x69cb15f8UL, 0x42e6463bUL, 0x5bfd777aUL, 0xdc656bb5UL, 0xc57e5af4UL, 
-    0xee530937UL, 0xf7483876UL, 0xb809aeb1UL, 0xa1129ff0UL, 0x8a3fcc33UL, 
-    0x9324fd72UL 
-  }, 
-  { 
-    0x00000000UL, 0x01c26a37UL, 0x0384d46eUL, 0x0246be59UL, 0x0709a8dcUL, 
-    0x06cbc2ebUL, 0x048d7cb2UL, 0x054f1685UL, 0x0e1351b8UL, 0x0fd13b8fUL, 
-    0x0d9785d6UL, 0x0c55efe1UL, 0x091af964UL, 0x08d89353UL, 0x0a9e2d0aUL, 
-    0x0b5c473dUL, 0x1c26a370UL, 0x1de4c947UL, 0x1fa2771eUL, 0x1e601d29UL, 
-    0x1b2f0bacUL, 0x1aed619bUL, 0x18abdfc2UL, 0x1969b5f5UL, 0x1235f2c8UL, 
-    0x13f798ffUL, 0x11b126a6UL, 0x10734c91UL, 0x153c5a14UL, 0x14fe3023UL, 
-    0x16b88e7aUL, 0x177ae44dUL, 0x384d46e0UL, 0x398f2cd7UL, 0x3bc9928eUL, 
-    0x3a0bf8b9UL, 0x3f44ee3cUL, 0x3e86840bUL, 0x3cc03a52UL, 0x3d025065UL, 
-    0x365e1758UL, 0x379c7d6fUL, 0x35dac336UL, 0x3418a901UL, 0x3157bf84UL, 
-    0x3095d5b3UL, 0x32d36beaUL, 0x331101ddUL, 0x246be590UL, 0x25a98fa7UL, 
-    0x27ef31feUL, 0x262d5bc9UL, 0x23624d4cUL, 0x22a0277bUL, 0x20e69922UL, 
-    0x2124f315UL, 0x2a78b428UL, 0x2bbade1fUL, 0x29fc6046UL, 0x283e0a71UL, 
-    0x2d711cf4UL, 0x2cb376c3UL, 0x2ef5c89aUL, 0x2f37a2adUL, 0x709a8dc0UL, 
-    0x7158e7f7UL, 0x731e59aeUL, 0x72dc3399UL, 0x7793251cUL, 0x76514f2bUL, 
-    0x7417f172UL, 0x75d59b45UL, 0x7e89dc78UL, 0x7f4bb64fUL, 0x7d0d0816UL, 
-    0x7ccf6221UL, 0x798074a4UL, 0x78421e93UL, 0x7a04a0caUL, 0x7bc6cafdUL, 
-    0x6cbc2eb0UL, 0x6d7e4487UL, 0x6f38fadeUL, 0x6efa90e9UL, 0x6bb5866cUL, 
-    0x6a77ec5bUL, 0x68315202UL, 0x69f33835UL, 0x62af7f08UL, 0x636d153fUL, 
-    0x612bab66UL, 0x60e9c151UL, 0x65a6d7d4UL, 0x6464bde3UL, 0x662203baUL, 
-    0x67e0698dUL, 0x48d7cb20UL, 0x4915a117UL, 0x4b531f4eUL, 0x4a917579UL, 
-    0x4fde63fcUL, 0x4e1c09cbUL, 0x4c5ab792UL, 0x4d98dda5UL, 0x46c49a98UL, 
-    0x4706f0afUL, 0x45404ef6UL, 0x448224c1UL, 0x41cd3244UL, 0x400f5873UL, 
-    0x4249e62aUL, 0x438b8c1dUL, 0x54f16850UL, 0x55330267UL, 0x5775bc3eUL, 
-    0x56b7d609UL, 0x53f8c08cUL, 0x523aaabbUL, 0x507c14e2UL, 0x51be7ed5UL, 
-    0x5ae239e8UL, 0x5b2053dfUL, 0x5966ed86UL, 0x58a487b1UL, 0x5deb9134UL, 
-    0x5c29fb03UL, 0x5e6f455aUL, 0x5fad2f6dUL, 0xe1351b80UL, 0xe0f771b7UL, 
-    0xe2b1cfeeUL, 0xe373a5d9UL, 0xe63cb35cUL, 0xe7fed96bUL, 0xe5b86732UL, 
-    0xe47a0d05UL, 0xef264a38UL, 0xeee4200fUL, 0xeca29e56UL, 0xed60f461UL, 
-    0xe82fe2e4UL, 0xe9ed88d3UL, 0xebab368aUL, 0xea695cbdUL, 0xfd13b8f0UL, 
-    0xfcd1d2c7UL, 0xfe976c9eUL, 0xff5506a9UL, 0xfa1a102cUL, 0xfbd87a1bUL, 
-    0xf99ec442UL, 0xf85cae75UL, 0xf300e948UL, 0xf2c2837fUL, 0xf0843d26UL, 
-    0xf1465711UL, 0xf4094194UL, 0xf5cb2ba3UL, 0xf78d95faUL, 0xf64fffcdUL, 
-    0xd9785d60UL, 0xd8ba3757UL, 0xdafc890eUL, 0xdb3ee339UL, 0xde71f5bcUL, 
-    0xdfb39f8bUL, 0xddf521d2UL, 0xdc374be5UL, 0xd76b0cd8UL, 0xd6a966efUL, 
-    0xd4efd8b6UL, 0xd52db281UL, 0xd062a404UL, 0xd1a0ce33UL, 0xd3e6706aUL, 
-    0xd2241a5dUL, 0xc55efe10UL, 0xc49c9427UL, 0xc6da2a7eUL, 0xc7184049UL, 
-    0xc25756ccUL, 0xc3953cfbUL, 0xc1d382a2UL, 0xc011e895UL, 0xcb4dafa8UL, 
-    0xca8fc59fUL, 0xc8c97bc6UL, 0xc90b11f1UL, 0xcc440774UL, 0xcd866d43UL, 
-    0xcfc0d31aUL, 0xce02b92dUL, 0x91af9640UL, 0x906dfc77UL, 0x922b422eUL, 
-    0x93e92819UL, 0x96a63e9cUL, 0x976454abUL, 0x9522eaf2UL, 0x94e080c5UL, 
-    0x9fbcc7f8UL, 0x9e7eadcfUL, 0x9c381396UL, 0x9dfa79a1UL, 0x98b56f24UL, 
-    0x99770513UL, 0x9b31bb4aUL, 0x9af3d17dUL, 0x8d893530UL, 0x8c4b5f07UL, 
-    0x8e0de15eUL, 0x8fcf8b69UL, 0x8a809decUL, 0x8b42f7dbUL, 0x89044982UL, 
-    0x88c623b5UL, 0x839a6488UL, 0x82580ebfUL, 0x801eb0e6UL, 0x81dcdad1UL, 
-    0x8493cc54UL, 0x8551a663UL, 0x8717183aUL, 0x86d5720dUL, 0xa9e2d0a0UL, 
-    0xa820ba97UL, 0xaa6604ceUL, 0xaba46ef9UL, 0xaeeb787cUL, 0xaf29124bUL, 
-    0xad6fac12UL, 0xacadc625UL, 0xa7f18118UL, 0xa633eb2fUL, 0xa4755576UL, 
-    0xa5b73f41UL, 0xa0f829c4UL, 0xa13a43f3UL, 0xa37cfdaaUL, 0xa2be979dUL, 
-    0xb5c473d0UL, 0xb40619e7UL, 0xb640a7beUL, 0xb782cd89UL, 0xb2cddb0cUL, 
-    0xb30fb13bUL, 0xb1490f62UL, 0xb08b6555UL, 0xbbd72268UL, 0xba15485fUL, 
-    0xb853f606UL, 0xb9919c31UL, 0xbcde8ab4UL, 0xbd1ce083UL, 0xbf5a5edaUL, 
-    0xbe9834edUL 
-  }, 
-  { 
-    0x00000000UL, 0xb8bc6765UL, 0xaa09c88bUL, 0x12b5afeeUL, 0x8f629757UL, 
-    0x37def032UL, 0x256b5fdcUL, 0x9dd738b9UL, 0xc5b428efUL, 0x7d084f8aUL, 
-    0x6fbde064UL, 0xd7018701UL, 0x4ad6bfb8UL, 0xf26ad8ddUL, 0xe0df7733UL, 
-    0x58631056UL, 0x5019579fUL, 0xe8a530faUL, 0xfa109f14UL, 0x42acf871UL, 
-    0xdf7bc0c8UL, 0x67c7a7adUL, 0x75720843UL, 0xcdce6f26UL, 0x95ad7f70UL, 
-    0x2d111815UL, 0x3fa4b7fbUL, 0x8718d09eUL, 0x1acfe827UL, 0xa2738f42UL, 
-    0xb0c620acUL, 0x087a47c9UL, 0xa032af3eUL, 0x188ec85bUL, 0x0a3b67b5UL, 
-    0xb28700d0UL, 0x2f503869UL, 0x97ec5f0cUL, 0x8559f0e2UL, 0x3de59787UL, 
-    0x658687d1UL, 0xdd3ae0b4UL, 0xcf8f4f5aUL, 0x7733283fUL, 0xeae41086UL, 
-    0x525877e3UL, 0x40edd80dUL, 0xf851bf68UL, 0xf02bf8a1UL, 0x48979fc4UL, 
-    0x5a22302aUL, 0xe29e574fUL, 0x7f496ff6UL, 0xc7f50893UL, 0xd540a77dUL, 
-    0x6dfcc018UL, 0x359fd04eUL, 0x8d23b72bUL, 0x9f9618c5UL, 0x272a7fa0UL, 
-    0xbafd4719UL, 0x0241207cUL, 0x10f48f92UL, 0xa848e8f7UL, 0x9b14583dUL, 
-    0x23a83f58UL, 0x311d90b6UL, 0x89a1f7d3UL, 0x1476cf6aUL, 0xaccaa80fUL, 
-    0xbe7f07e1UL, 0x06c36084UL, 0x5ea070d2UL, 0xe61c17b7UL, 0xf4a9b859UL, 
-    0x4c15df3cUL, 0xd1c2e785UL, 0x697e80e0UL, 0x7bcb2f0eUL, 0xc377486bUL, 
-    0xcb0d0fa2UL, 0x73b168c7UL, 0x6104c729UL, 0xd9b8a04cUL, 0x446f98f5UL, 
-    0xfcd3ff90UL, 0xee66507eUL, 0x56da371bUL, 0x0eb9274dUL, 0xb6054028UL, 
-    0xa4b0efc6UL, 0x1c0c88a3UL, 0x81dbb01aUL, 0x3967d77fUL, 0x2bd27891UL, 
-    0x936e1ff4UL, 0x3b26f703UL, 0x839a9066UL, 0x912f3f88UL, 0x299358edUL, 
-    0xb4446054UL, 0x0cf80731UL, 0x1e4da8dfUL, 0xa6f1cfbaUL, 0xfe92dfecUL, 
-    0x462eb889UL, 0x549b1767UL, 0xec277002UL, 0x71f048bbUL, 0xc94c2fdeUL, 
-    0xdbf98030UL, 0x6345e755UL, 0x6b3fa09cUL, 0xd383c7f9UL, 0xc1366817UL, 
-    0x798a0f72UL, 0xe45d37cbUL, 0x5ce150aeUL, 0x4e54ff40UL, 0xf6e89825UL, 
-    0xae8b8873UL, 0x1637ef16UL, 0x048240f8UL, 0xbc3e279dUL, 0x21e91f24UL, 
-    0x99557841UL, 0x8be0d7afUL, 0x335cb0caUL, 0xed59b63bUL, 0x55e5d15eUL, 
-    0x47507eb0UL, 0xffec19d5UL, 0x623b216cUL, 0xda874609UL, 0xc832e9e7UL, 
-    0x708e8e82UL, 0x28ed9ed4UL, 0x9051f9b1UL, 0x82e4565fUL, 0x3a58313aUL, 
-    0xa78f0983UL, 0x1f336ee6UL, 0x0d86c108UL, 0xb53aa66dUL, 0xbd40e1a4UL, 
-    0x05fc86c1UL, 0x1749292fUL, 0xaff54e4aUL, 0x322276f3UL, 0x8a9e1196UL, 
-    0x982bbe78UL, 0x2097d91dUL, 0x78f4c94bUL, 0xc048ae2eUL, 0xd2fd01c0UL, 
-    0x6a4166a5UL, 0xf7965e1cUL, 0x4f2a3979UL, 0x5d9f9697UL, 0xe523f1f2UL, 
-    0x4d6b1905UL, 0xf5d77e60UL, 0xe762d18eUL, 0x5fdeb6ebUL, 0xc2098e52UL, 
-    0x7ab5e937UL, 0x680046d9UL, 0xd0bc21bcUL, 0x88df31eaUL, 0x3063568fUL, 
-    0x22d6f961UL, 0x9a6a9e04UL, 0x07bda6bdUL, 0xbf01c1d8UL, 0xadb46e36UL, 
-    0x15080953UL, 0x1d724e9aUL, 0xa5ce29ffUL, 0xb77b8611UL, 0x0fc7e174UL, 
-    0x9210d9cdUL, 0x2aacbea8UL, 0x38191146UL, 0x80a57623UL, 0xd8c66675UL, 
-    0x607a0110UL, 0x72cfaefeUL, 0xca73c99bUL, 0x57a4f122UL, 0xef189647UL, 
-    0xfdad39a9UL, 0x45115eccUL, 0x764dee06UL, 0xcef18963UL, 0xdc44268dUL, 
-    0x64f841e8UL, 0xf92f7951UL, 0x41931e34UL, 0x5326b1daUL, 0xeb9ad6bfUL, 
-    0xb3f9c6e9UL, 0x0b45a18cUL, 0x19f00e62UL, 0xa14c6907UL, 0x3c9b51beUL, 
-    0x842736dbUL, 0x96929935UL, 0x2e2efe50UL, 0x2654b999UL, 0x9ee8defcUL, 
-    0x8c5d7112UL, 0x34e11677UL, 0xa9362eceUL, 0x118a49abUL, 0x033fe645UL, 
-    0xbb838120UL, 0xe3e09176UL, 0x5b5cf613UL, 0x49e959fdUL, 0xf1553e98UL, 
-    0x6c820621UL, 0xd43e6144UL, 0xc68bceaaUL, 0x7e37a9cfUL, 0xd67f4138UL, 
-    0x6ec3265dUL, 0x7c7689b3UL, 0xc4caeed6UL, 0x591dd66fUL, 0xe1a1b10aUL, 
-    0xf3141ee4UL, 0x4ba87981UL, 0x13cb69d7UL, 0xab770eb2UL, 0xb9c2a15cUL, 
-    0x017ec639UL, 0x9ca9fe80UL, 0x241599e5UL, 0x36a0360bUL, 0x8e1c516eUL, 
-    0x866616a7UL, 0x3eda71c2UL, 0x2c6fde2cUL, 0x94d3b949UL, 0x090481f0UL, 
-    0xb1b8e695UL, 0xa30d497bUL, 0x1bb12e1eUL, 0x43d23e48UL, 0xfb6e592dUL, 
-    0xe9dbf6c3UL, 0x516791a6UL, 0xccb0a91fUL, 0x740cce7aUL, 0x66b96194UL, 
-    0xde0506f1UL 
-  }, 
-  { 
-    0x00000000UL, 0x96300777UL, 0x2c610eeeUL, 0xba510999UL, 0x19c46d07UL, 
-    0x8ff46a70UL, 0x35a563e9UL, 0xa395649eUL, 0x3288db0eUL, 0xa4b8dc79UL, 
-    0x1ee9d5e0UL, 0x88d9d297UL, 0x2b4cb609UL, 0xbd7cb17eUL, 0x072db8e7UL, 
-    0x911dbf90UL, 0x6410b71dUL, 0xf220b06aUL, 0x4871b9f3UL, 0xde41be84UL, 
-    0x7dd4da1aUL, 0xebe4dd6dUL, 0x51b5d4f4UL, 0xc785d383UL, 0x56986c13UL, 
-    0xc0a86b64UL, 0x7af962fdUL, 0xecc9658aUL, 0x4f5c0114UL, 0xd96c0663UL, 
-    0x633d0ffaUL, 0xf50d088dUL, 0xc8206e3bUL, 0x5e10694cUL, 0xe44160d5UL, 
-    0x727167a2UL, 0xd1e4033cUL, 0x47d4044bUL, 0xfd850dd2UL, 0x6bb50aa5UL, 
-    0xfaa8b535UL, 0x6c98b242UL, 0xd6c9bbdbUL, 0x40f9bcacUL, 0xe36cd832UL, 
-    0x755cdf45UL, 0xcf0dd6dcUL, 0x593dd1abUL, 0xac30d926UL, 0x3a00de51UL, 
-    0x8051d7c8UL, 0x1661d0bfUL, 0xb5f4b421UL, 0x23c4b356UL, 0x9995bacfUL, 
-    0x0fa5bdb8UL, 0x9eb80228UL, 0x0888055fUL, 0xb2d90cc6UL, 0x24e90bb1UL, 
-    0x877c6f2fUL, 0x114c6858UL, 0xab1d61c1UL, 0x3d2d66b6UL, 0x9041dc76UL, 
-    0x0671db01UL, 0xbc20d298UL, 0x2a10d5efUL, 0x8985b171UL, 0x1fb5b606UL, 
-    0xa5e4bf9fUL, 0x33d4b8e8UL, 0xa2c90778UL, 0x34f9000fUL, 0x8ea80996UL, 
-    0x18980ee1UL, 0xbb0d6a7fUL, 0x2d3d6d08UL, 0x976c6491UL, 0x015c63e6UL, 
-    0xf4516b6bUL, 0x62616c1cUL, 0xd8306585UL, 0x4e0062f2UL, 0xed95066cUL, 
-    0x7ba5011bUL, 0xc1f40882UL, 0x57c40ff5UL, 0xc6d9b065UL, 0x50e9b712UL, 
-    0xeab8be8bUL, 0x7c88b9fcUL, 0xdf1ddd62UL, 0x492dda15UL, 0xf37cd38cUL, 
-    0x654cd4fbUL, 0x5861b24dUL, 0xce51b53aUL, 0x7400bca3UL, 0xe230bbd4UL, 
-    0x41a5df4aUL, 0xd795d83dUL, 0x6dc4d1a4UL, 0xfbf4d6d3UL, 0x6ae96943UL, 
-    0xfcd96e34UL, 0x468867adUL, 0xd0b860daUL, 0x732d0444UL, 0xe51d0333UL, 
-    0x5f4c0aaaUL, 0xc97c0dddUL, 0x3c710550UL, 0xaa410227UL, 0x10100bbeUL, 
-    0x86200cc9UL, 0x25b56857UL, 0xb3856f20UL, 0x09d466b9UL, 0x9fe461ceUL, 
-    0x0ef9de5eUL, 0x98c9d929UL, 0x2298d0b0UL, 0xb4a8d7c7UL, 0x173db359UL, 
-    0x810db42eUL, 0x3b5cbdb7UL, 0xad6cbac0UL, 0x2083b8edUL, 0xb6b3bf9aUL, 
-    0x0ce2b603UL, 0x9ad2b174UL, 0x3947d5eaUL, 0xaf77d29dUL, 0x1526db04UL, 
-    0x8316dc73UL, 0x120b63e3UL, 0x843b6494UL, 0x3e6a6d0dUL, 0xa85a6a7aUL, 
-    0x0bcf0ee4UL, 0x9dff0993UL, 0x27ae000aUL, 0xb19e077dUL, 0x44930ff0UL, 
-    0xd2a30887UL, 0x68f2011eUL, 0xfec20669UL, 0x5d5762f7UL, 0xcb676580UL, 
-    0x71366c19UL, 0xe7066b6eUL, 0x761bd4feUL, 0xe02bd389UL, 0x5a7ada10UL, 
-    0xcc4add67UL, 0x6fdfb9f9UL, 0xf9efbe8eUL, 0x43beb717UL, 0xd58eb060UL, 
-    0xe8a3d6d6UL, 0x7e93d1a1UL, 0xc4c2d838UL, 0x52f2df4fUL, 0xf167bbd1UL, 
-    0x6757bca6UL, 0xdd06b53fUL, 0x4b36b248UL, 0xda2b0dd8UL, 0x4c1b0aafUL, 
-    0xf64a0336UL, 0x607a0441UL, 0xc3ef60dfUL, 0x55df67a8UL, 0xef8e6e31UL, 
-    0x79be6946UL, 0x8cb361cbUL, 0x1a8366bcUL, 0xa0d26f25UL, 0x36e26852UL, 
-    0x95770cccUL, 0x03470bbbUL, 0xb9160222UL, 0x2f260555UL, 0xbe3bbac5UL, 
-    0x280bbdb2UL, 0x925ab42bUL, 0x046ab35cUL, 0xa7ffd7c2UL, 0x31cfd0b5UL, 
-    0x8b9ed92cUL, 0x1daede5bUL, 0xb0c2649bUL, 0x26f263ecUL, 0x9ca36a75UL, 
-    0x0a936d02UL, 0xa906099cUL, 0x3f360eebUL, 0x85670772UL, 0x13570005UL, 
-    0x824abf95UL, 0x147ab8e2UL, 0xae2bb17bUL, 0x381bb60cUL, 0x9b8ed292UL, 
-    0x0dbed5e5UL, 0xb7efdc7cUL, 0x21dfdb0bUL, 0xd4d2d386UL, 0x42e2d4f1UL, 
-    0xf8b3dd68UL, 0x6e83da1fUL, 0xcd16be81UL, 0x5b26b9f6UL, 0xe177b06fUL, 
-    0x7747b718UL, 0xe65a0888UL, 0x706a0fffUL, 0xca3b0666UL, 0x5c0b0111UL, 
-    0xff9e658fUL, 0x69ae62f8UL, 0xd3ff6b61UL, 0x45cf6c16UL, 0x78e20aa0UL, 
-    0xeed20dd7UL, 0x5483044eUL, 0xc2b30339UL, 0x612667a7UL, 0xf71660d0UL, 
-    0x4d476949UL, 0xdb776e3eUL, 0x4a6ad1aeUL, 0xdc5ad6d9UL, 0x660bdf40UL, 
-    0xf03bd837UL, 0x53aebca9UL, 0xc59ebbdeUL, 0x7fcfb247UL, 0xe9ffb530UL, 
-    0x1cf2bdbdUL, 0x8ac2bacaUL, 0x3093b353UL, 0xa6a3b424UL, 0x0536d0baUL, 
-    0x9306d7cdUL, 0x2957de54UL, 0xbf67d923UL, 0x2e7a66b3UL, 0xb84a61c4UL, 
-    0x021b685dUL, 0x942b6f2aUL, 0x37be0bb4UL, 0xa18e0cc3UL, 0x1bdf055aUL, 
-    0x8def022dUL 
-  }, 
-  { 
-    0x00000000UL, 0x41311b19UL, 0x82623632UL, 0xc3532d2bUL, 0x04c56c64UL, 
-    0x45f4777dUL, 0x86a75a56UL, 0xc796414fUL, 0x088ad9c8UL, 0x49bbc2d1UL, 
-    0x8ae8effaUL, 0xcbd9f4e3UL, 0x0c4fb5acUL, 0x4d7eaeb5UL, 0x8e2d839eUL, 
-    0xcf1c9887UL, 0x5112c24aUL, 0x1023d953UL, 0xd370f478UL, 0x9241ef61UL, 
-    0x55d7ae2eUL, 0x14e6b537UL, 0xd7b5981cUL, 0x96848305UL, 0x59981b82UL, 
-    0x18a9009bUL, 0xdbfa2db0UL, 0x9acb36a9UL, 0x5d5d77e6UL, 0x1c6c6cffUL, 
-    0xdf3f41d4UL, 0x9e0e5acdUL, 0xa2248495UL, 0xe3159f8cUL, 0x2046b2a7UL, 
-    0x6177a9beUL, 0xa6e1e8f1UL, 0xe7d0f3e8UL, 0x2483dec3UL, 0x65b2c5daUL, 
-    0xaaae5d5dUL, 0xeb9f4644UL, 0x28cc6b6fUL, 0x69fd7076UL, 0xae6b3139UL, 
-    0xef5a2a20UL, 0x2c09070bUL, 0x6d381c12UL, 0xf33646dfUL, 0xb2075dc6UL, 
-    0x715470edUL, 0x30656bf4UL, 0xf7f32abbUL, 0xb6c231a2UL, 0x75911c89UL, 
-    0x34a00790UL, 0xfbbc9f17UL, 0xba8d840eUL, 0x79dea925UL, 0x38efb23cUL, 
-    0xff79f373UL, 0xbe48e86aUL, 0x7d1bc541UL, 0x3c2ade58UL, 0x054f79f0UL, 
-    0x447e62e9UL, 0x872d4fc2UL, 0xc61c54dbUL, 0x018a1594UL, 0x40bb0e8dUL, 
-    0x83e823a6UL, 0xc2d938bfUL, 0x0dc5a038UL, 0x4cf4bb21UL, 0x8fa7960aUL, 
-    0xce968d13UL, 0x0900cc5cUL, 0x4831d745UL, 0x8b62fa6eUL, 0xca53e177UL, 
-    0x545dbbbaUL, 0x156ca0a3UL, 0xd63f8d88UL, 0x970e9691UL, 0x5098d7deUL, 
-    0x11a9ccc7UL, 0xd2fae1ecUL, 0x93cbfaf5UL, 0x5cd76272UL, 0x1de6796bUL, 
-    0xdeb55440UL, 0x9f844f59UL, 0x58120e16UL, 0x1923150fUL, 0xda703824UL, 
-    0x9b41233dUL, 0xa76bfd65UL, 0xe65ae67cUL, 0x2509cb57UL, 0x6438d04eUL, 
-    0xa3ae9101UL, 0xe29f8a18UL, 0x21cca733UL, 0x60fdbc2aUL, 0xafe124adUL, 
-    0xeed03fb4UL, 0x2d83129fUL, 0x6cb20986UL, 0xab2448c9UL, 0xea1553d0UL, 
-    0x29467efbUL, 0x687765e2UL, 0xf6793f2fUL, 0xb7482436UL, 0x741b091dUL, 
-    0x352a1204UL, 0xf2bc534bUL, 0xb38d4852UL, 0x70de6579UL, 0x31ef7e60UL, 
-    0xfef3e6e7UL, 0xbfc2fdfeUL, 0x7c91d0d5UL, 0x3da0cbccUL, 0xfa368a83UL, 
-    0xbb07919aUL, 0x7854bcb1UL, 0x3965a7a8UL, 0x4b98833bUL, 0x0aa99822UL, 
-    0xc9fab509UL, 0x88cbae10UL, 0x4f5def5fUL, 0x0e6cf446UL, 0xcd3fd96dUL, 
-    0x8c0ec274UL, 0x43125af3UL, 0x022341eaUL, 0xc1706cc1UL, 0x804177d8UL, 
-    0x47d73697UL, 0x06e62d8eUL, 0xc5b500a5UL, 0x84841bbcUL, 0x1a8a4171UL, 
-    0x5bbb5a68UL, 0x98e87743UL, 0xd9d96c5aUL, 0x1e4f2d15UL, 0x5f7e360cUL, 
-    0x9c2d1b27UL, 0xdd1c003eUL, 0x120098b9UL, 0x533183a0UL, 0x9062ae8bUL, 
-    0xd153b592UL, 0x16c5f4ddUL, 0x57f4efc4UL, 0x94a7c2efUL, 0xd596d9f6UL, 
-    0xe9bc07aeUL, 0xa88d1cb7UL, 0x6bde319cUL, 0x2aef2a85UL, 0xed796bcaUL, 
-    0xac4870d3UL, 0x6f1b5df8UL, 0x2e2a46e1UL, 0xe136de66UL, 0xa007c57fUL, 
-    0x6354e854UL, 0x2265f34dUL, 0xe5f3b202UL, 0xa4c2a91bUL, 0x67918430UL, 
-    0x26a09f29UL, 0xb8aec5e4UL, 0xf99fdefdUL, 0x3accf3d6UL, 0x7bfde8cfUL, 
-    0xbc6ba980UL, 0xfd5ab299UL, 0x3e099fb2UL, 0x7f3884abUL, 0xb0241c2cUL, 
-    0xf1150735UL, 0x32462a1eUL, 0x73773107UL, 0xb4e17048UL, 0xf5d06b51UL, 
-    0x3683467aUL, 0x77b25d63UL, 0x4ed7facbUL, 0x0fe6e1d2UL, 0xccb5ccf9UL, 
-    0x8d84d7e0UL, 0x4a1296afUL, 0x0b238db6UL, 0xc870a09dUL, 0x8941bb84UL, 
-    0x465d2303UL, 0x076c381aUL, 0xc43f1531UL, 0x850e0e28UL, 0x42984f67UL, 
-    0x03a9547eUL, 0xc0fa7955UL, 0x81cb624cUL, 0x1fc53881UL, 0x5ef42398UL, 
-    0x9da70eb3UL, 0xdc9615aaUL, 0x1b0054e5UL, 0x5a314ffcUL, 0x996262d7UL, 
-    0xd85379ceUL, 0x174fe149UL, 0x567efa50UL, 0x952dd77bUL, 0xd41ccc62UL, 
-    0x138a8d2dUL, 0x52bb9634UL, 0x91e8bb1fUL, 0xd0d9a006UL, 0xecf37e5eUL, 
-    0xadc26547UL, 0x6e91486cUL, 0x2fa05375UL, 0xe836123aUL, 0xa9070923UL, 
-    0x6a542408UL, 0x2b653f11UL, 0xe479a796UL, 0xa548bc8fUL, 0x661b91a4UL, 
-    0x272a8abdUL, 0xe0bccbf2UL, 0xa18dd0ebUL, 0x62defdc0UL, 0x23efe6d9UL, 
-    0xbde1bc14UL, 0xfcd0a70dUL, 0x3f838a26UL, 0x7eb2913fUL, 0xb924d070UL, 
-    0xf815cb69UL, 0x3b46e642UL, 0x7a77fd5bUL, 0xb56b65dcUL, 0xf45a7ec5UL, 
-    0x370953eeUL, 0x763848f7UL, 0xb1ae09b8UL, 0xf09f12a1UL, 0x33cc3f8aUL, 
-    0x72fd2493UL 
-  }, 
-  { 
-    0x00000000UL, 0x376ac201UL, 0x6ed48403UL, 0x59be4602UL, 0xdca80907UL, 
-    0xebc2cb06UL, 0xb27c8d04UL, 0x85164f05UL, 0xb851130eUL, 0x8f3bd10fUL, 
-    0xd685970dUL, 0xe1ef550cUL, 0x64f91a09UL, 0x5393d808UL, 0x0a2d9e0aUL, 
-    0x3d475c0bUL, 0x70a3261cUL, 0x47c9e41dUL, 0x1e77a21fUL, 0x291d601eUL, 
-    0xac0b2f1bUL, 0x9b61ed1aUL, 0xc2dfab18UL, 0xf5b56919UL, 0xc8f23512UL, 
-    0xff98f713UL, 0xa626b111UL, 0x914c7310UL, 0x145a3c15UL, 0x2330fe14UL, 
-    0x7a8eb816UL, 0x4de47a17UL, 0xe0464d38UL, 0xd72c8f39UL, 0x8e92c93bUL, 
-    0xb9f80b3aUL, 0x3cee443fUL, 0x0b84863eUL, 0x523ac03cUL, 0x6550023dUL, 
-    0x58175e36UL, 0x6f7d9c37UL, 0x36c3da35UL, 0x01a91834UL, 0x84bf5731UL, 
-    0xb3d59530UL, 0xea6bd332UL, 0xdd011133UL, 0x90e56b24UL, 0xa78fa925UL, 
-    0xfe31ef27UL, 0xc95b2d26UL, 0x4c4d6223UL, 0x7b27a022UL, 0x2299e620UL, 
-    0x15f32421UL, 0x28b4782aUL, 0x1fdeba2bUL, 0x4660fc29UL, 0x710a3e28UL, 
-    0xf41c712dUL, 0xc376b32cUL, 0x9ac8f52eUL, 0xada2372fUL, 0xc08d9a70UL, 
-    0xf7e75871UL, 0xae591e73UL, 0x9933dc72UL, 0x1c259377UL, 0x2b4f5176UL, 
-    0x72f11774UL, 0x459bd575UL, 0x78dc897eUL, 0x4fb64b7fUL, 0x16080d7dUL, 
-    0x2162cf7cUL, 0xa4748079UL, 0x931e4278UL, 0xcaa0047aUL, 0xfdcac67bUL, 
-    0xb02ebc6cUL, 0x87447e6dUL, 0xdefa386fUL, 0xe990fa6eUL, 0x6c86b56bUL, 
-    0x5bec776aUL, 0x02523168UL, 0x3538f369UL, 0x087faf62UL, 0x3f156d63UL, 
-    0x66ab2b61UL, 0x51c1e960UL, 0xd4d7a665UL, 0xe3bd6464UL, 0xba032266UL, 
-    0x8d69e067UL, 0x20cbd748UL, 0x17a11549UL, 0x4e1f534bUL, 0x7975914aUL, 
-    0xfc63de4fUL, 0xcb091c4eUL, 0x92b75a4cUL, 0xa5dd984dUL, 0x989ac446UL, 
-    0xaff00647UL, 0xf64e4045UL, 0xc1248244UL, 0x4432cd41UL, 0x73580f40UL, 
-    0x2ae64942UL, 0x1d8c8b43UL, 0x5068f154UL, 0x67023355UL, 0x3ebc7557UL, 
-    0x09d6b756UL, 0x8cc0f853UL, 0xbbaa3a52UL, 0xe2147c50UL, 0xd57ebe51UL, 
-    0xe839e25aUL, 0xdf53205bUL, 0x86ed6659UL, 0xb187a458UL, 0x3491eb5dUL, 
-    0x03fb295cUL, 0x5a456f5eUL, 0x6d2fad5fUL, 0x801b35e1UL, 0xb771f7e0UL, 
-    0xeecfb1e2UL, 0xd9a573e3UL, 0x5cb33ce6UL, 0x6bd9fee7UL, 0x3267b8e5UL, 
-    0x050d7ae4UL, 0x384a26efUL, 0x0f20e4eeUL, 0x569ea2ecUL, 0x61f460edUL, 
-    0xe4e22fe8UL, 0xd388ede9UL, 0x8a36abebUL, 0xbd5c69eaUL, 0xf0b813fdUL, 
-    0xc7d2d1fcUL, 0x9e6c97feUL, 0xa90655ffUL, 0x2c101afaUL, 0x1b7ad8fbUL, 
-    0x42c49ef9UL, 0x75ae5cf8UL, 0x48e900f3UL, 0x7f83c2f2UL, 0x263d84f0UL, 
-    0x115746f1UL, 0x944109f4UL, 0xa32bcbf5UL, 0xfa958df7UL, 0xcdff4ff6UL, 
-    0x605d78d9UL, 0x5737bad8UL, 0x0e89fcdaUL, 0x39e33edbUL, 0xbcf571deUL, 
-    0x8b9fb3dfUL, 0xd221f5ddUL, 0xe54b37dcUL, 0xd80c6bd7UL, 0xef66a9d6UL, 
-    0xb6d8efd4UL, 0x81b22dd5UL, 0x04a462d0UL, 0x33cea0d1UL, 0x6a70e6d3UL, 
-    0x5d1a24d2UL, 0x10fe5ec5UL, 0x27949cc4UL, 0x7e2adac6UL, 0x494018c7UL, 
-    0xcc5657c2UL, 0xfb3c95c3UL, 0xa282d3c1UL, 0x95e811c0UL, 0xa8af4dcbUL, 
-    0x9fc58fcaUL, 0xc67bc9c8UL, 0xf1110bc9UL, 0x740744ccUL, 0x436d86cdUL, 
-    0x1ad3c0cfUL, 0x2db902ceUL, 0x4096af91UL, 0x77fc6d90UL, 0x2e422b92UL, 
-    0x1928e993UL, 0x9c3ea696UL, 0xab546497UL, 0xf2ea2295UL, 0xc580e094UL, 
-    0xf8c7bc9fUL, 0xcfad7e9eUL, 0x9613389cUL, 0xa179fa9dUL, 0x246fb598UL, 
-    0x13057799UL, 0x4abb319bUL, 0x7dd1f39aUL, 0x3035898dUL, 0x075f4b8cUL, 
-    0x5ee10d8eUL, 0x698bcf8fUL, 0xec9d808aUL, 0xdbf7428bUL, 0x82490489UL, 
-    0xb523c688UL, 0x88649a83UL, 0xbf0e5882UL, 0xe6b01e80UL, 0xd1dadc81UL, 
-    0x54cc9384UL, 0x63a65185UL, 0x3a181787UL, 0x0d72d586UL, 0xa0d0e2a9UL, 
-    0x97ba20a8UL, 0xce0466aaUL, 0xf96ea4abUL, 0x7c78ebaeUL, 0x4b1229afUL, 
-    0x12ac6fadUL, 0x25c6adacUL, 0x1881f1a7UL, 0x2feb33a6UL, 0x765575a4UL, 
-    0x413fb7a5UL, 0xc429f8a0UL, 0xf3433aa1UL, 0xaafd7ca3UL, 0x9d97bea2UL, 
-    0xd073c4b5UL, 0xe71906b4UL, 0xbea740b6UL, 0x89cd82b7UL, 0x0cdbcdb2UL, 
-    0x3bb10fb3UL, 0x620f49b1UL, 0x55658bb0UL, 0x6822d7bbUL, 0x5f4815baUL, 
-    0x06f653b8UL, 0x319c91b9UL, 0xb48adebcUL, 0x83e01cbdUL, 0xda5e5abfUL, 
-    0xed3498beUL 
-  }, 
-  { 
-    0x00000000UL, 0x6567bcb8UL, 0x8bc809aaUL, 0xeeafb512UL, 0x5797628fUL, 
-    0x32f0de37UL, 0xdc5f6b25UL, 0xb938d79dUL, 0xef28b4c5UL, 0x8a4f087dUL, 
-    0x64e0bd6fUL, 0x018701d7UL, 0xb8bfd64aUL, 0xddd86af2UL, 0x3377dfe0UL, 
-    0x56106358UL, 0x9f571950UL, 0xfa30a5e8UL, 0x149f10faUL, 0x71f8ac42UL, 
-    0xc8c07bdfUL, 0xada7c767UL, 0x43087275UL, 0x266fcecdUL, 0x707fad95UL, 
-    0x1518112dUL, 0xfbb7a43fUL, 0x9ed01887UL, 0x27e8cf1aUL, 0x428f73a2UL, 
-    0xac20c6b0UL, 0xc9477a08UL, 0x3eaf32a0UL, 0x5bc88e18UL, 0xb5673b0aUL, 
-    0xd00087b2UL, 0x6938502fUL, 0x0c5fec97UL, 0xe2f05985UL, 0x8797e53dUL, 
-    0xd1878665UL, 0xb4e03addUL, 0x5a4f8fcfUL, 0x3f283377UL, 0x8610e4eaUL, 
-    0xe3775852UL, 0x0dd8ed40UL, 0x68bf51f8UL, 0xa1f82bf0UL, 0xc49f9748UL, 
-    0x2a30225aUL, 0x4f579ee2UL, 0xf66f497fUL, 0x9308f5c7UL, 0x7da740d5UL, 
-    0x18c0fc6dUL, 0x4ed09f35UL, 0x2bb7238dUL, 0xc518969fUL, 0xa07f2a27UL, 
-    0x1947fdbaUL, 0x7c204102UL, 0x928ff410UL, 0xf7e848a8UL, 0x3d58149bUL, 
-    0x583fa823UL, 0xb6901d31UL, 0xd3f7a189UL, 0x6acf7614UL, 0x0fa8caacUL, 
-    0xe1077fbeUL, 0x8460c306UL, 0xd270a05eUL, 0xb7171ce6UL, 0x59b8a9f4UL, 
-    0x3cdf154cUL, 0x85e7c2d1UL, 0xe0807e69UL, 0x0e2fcb7bUL, 0x6b4877c3UL, 
-    0xa20f0dcbUL, 0xc768b173UL, 0x29c70461UL, 0x4ca0b8d9UL, 0xf5986f44UL, 
-    0x90ffd3fcUL, 0x7e5066eeUL, 0x1b37da56UL, 0x4d27b90eUL, 0x284005b6UL, 
-    0xc6efb0a4UL, 0xa3880c1cUL, 0x1ab0db81UL, 0x7fd76739UL, 0x9178d22bUL, 
-    0xf41f6e93UL, 0x03f7263bUL, 0x66909a83UL, 0x883f2f91UL, 0xed589329UL, 
-    0x546044b4UL, 0x3107f80cUL, 0xdfa84d1eUL, 0xbacff1a6UL, 0xecdf92feUL, 
-    0x89b82e46UL, 0x67179b54UL, 0x027027ecUL, 0xbb48f071UL, 0xde2f4cc9UL, 
-    0x3080f9dbUL, 0x55e74563UL, 0x9ca03f6bUL, 0xf9c783d3UL, 0x176836c1UL, 
-    0x720f8a79UL, 0xcb375de4UL, 0xae50e15cUL, 0x40ff544eUL, 0x2598e8f6UL, 
-    0x73888baeUL, 0x16ef3716UL, 0xf8408204UL, 0x9d273ebcUL, 0x241fe921UL, 
-    0x41785599UL, 0xafd7e08bUL, 0xcab05c33UL, 0x3bb659edUL, 0x5ed1e555UL, 
-    0xb07e5047UL, 0xd519ecffUL, 0x6c213b62UL, 0x094687daUL, 0xe7e932c8UL, 
-    0x828e8e70UL, 0xd49eed28UL, 0xb1f95190UL, 0x5f56e482UL, 0x3a31583aUL, 
-    0x83098fa7UL, 0xe66e331fUL, 0x08c1860dUL, 0x6da63ab5UL, 0xa4e140bdUL, 
-    0xc186fc05UL, 0x2f294917UL, 0x4a4ef5afUL, 0xf3762232UL, 0x96119e8aUL, 
-    0x78be2b98UL, 0x1dd99720UL, 0x4bc9f478UL, 0x2eae48c0UL, 0xc001fdd2UL, 
-    0xa566416aUL, 0x1c5e96f7UL, 0x79392a4fUL, 0x97969f5dUL, 0xf2f123e5UL, 
-    0x05196b4dUL, 0x607ed7f5UL, 0x8ed162e7UL, 0xebb6de5fUL, 0x528e09c2UL, 
-    0x37e9b57aUL, 0xd9460068UL, 0xbc21bcd0UL, 0xea31df88UL, 0x8f566330UL, 
-    0x61f9d622UL, 0x049e6a9aUL, 0xbda6bd07UL, 0xd8c101bfUL, 0x366eb4adUL, 
-    0x53090815UL, 0x9a4e721dUL, 0xff29cea5UL, 0x11867bb7UL, 0x74e1c70fUL, 
-    0xcdd91092UL, 0xa8beac2aUL, 0x46111938UL, 0x2376a580UL, 0x7566c6d8UL, 
-    0x10017a60UL, 0xfeaecf72UL, 0x9bc973caUL, 0x22f1a457UL, 0x479618efUL, 
-    0xa939adfdUL, 0xcc5e1145UL, 0x06ee4d76UL, 0x6389f1ceUL, 0x8d2644dcUL, 
-    0xe841f864UL, 0x51792ff9UL, 0x341e9341UL, 0xdab12653UL, 0xbfd69aebUL, 
-    0xe9c6f9b3UL, 0x8ca1450bUL, 0x620ef019UL, 0x07694ca1UL, 0xbe519b3cUL, 
-    0xdb362784UL, 0x35999296UL, 0x50fe2e2eUL, 0x99b95426UL, 0xfcdee89eUL, 
-    0x12715d8cUL, 0x7716e134UL, 0xce2e36a9UL, 0xab498a11UL, 0x45e63f03UL, 
-    0x208183bbUL, 0x7691e0e3UL, 0x13f65c5bUL, 0xfd59e949UL, 0x983e55f1UL, 
-    0x2106826cUL, 0x44613ed4UL, 0xaace8bc6UL, 0xcfa9377eUL, 0x38417fd6UL, 
-    0x5d26c36eUL, 0xb389767cUL, 0xd6eecac4UL, 0x6fd61d59UL, 0x0ab1a1e1UL, 
-    0xe41e14f3UL, 0x8179a84bUL, 0xd769cb13UL, 0xb20e77abUL, 0x5ca1c2b9UL, 
-    0x39c67e01UL, 0x80fea99cUL, 0xe5991524UL, 0x0b36a036UL, 0x6e511c8eUL, 
-    0xa7166686UL, 0xc271da3eUL, 0x2cde6f2cUL, 0x49b9d394UL, 0xf0810409UL, 
-    0x95e6b8b1UL, 0x7b490da3UL, 0x1e2eb11bUL, 0x483ed243UL, 0x2d596efbUL, 
-    0xc3f6dbe9UL, 0xa6916751UL, 0x1fa9b0ccUL, 0x7ace0c74UL, 0x9461b966UL, 
-    0xf10605deUL 
-#endif 
-  } 
-}; 
+/* crc32.h -- tables for rapid CRC calculation
+ * Generated automatically by crc32.c
+ */
+
+local const z_crc_t FAR crc_table[TBLS][256] =
+{
+  {
+    0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL,
+    0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL, 0x79dcb8a4UL,
+    0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL,
+    0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL, 0xf3b97148UL, 0x84be41deUL,
+    0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL,
+    0x646ba8c0UL, 0xfd62f97aUL, 0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL,
+    0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL,
+    0xa2677172UL, 0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL,
+    0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL,
+    0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL,
+    0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL, 0xcfba9599UL,
+    0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL,
+    0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL, 0xb6662d3dUL, 0x76dc4190UL,
+    0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL,
+    0x9fbfe4a5UL, 0xe8b8d433UL, 0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL,
+    0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL,
+    0x6b6b51f4UL, 0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL,
+    0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL,
+    0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL,
+    0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL, 0xd4bb30e2UL,
+    0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL,
+    0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL, 0x44042d73UL, 0x33031de5UL,
+    0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL,
+    0xc90c2086UL, 0x5768b525UL, 0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL,
+    0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL,
+    0x2eb40d81UL, 0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL,
+    0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL,
+    0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL,
+    0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL, 0xf00f9344UL,
+    0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL,
+    0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL, 0x89d32be0UL, 0x10da7a5aUL,
+    0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL,
+    0xd6d6a3e8UL, 0xa1d1937eUL, 0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL,
+    0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL,
+    0x36034af6UL, 0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL,
+    0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL,
+    0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL,
+    0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL, 0xb5d0cf31UL,
+    0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL,
+    0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL, 0x72076785UL, 0x05005713UL,
+    0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL,
+    0xe5d5be0dUL, 0x7cdcefb7UL, 0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL,
+    0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL,
+    0x18b74777UL, 0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL,
+    0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL,
+    0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL,
+    0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL, 0x40df0b66UL,
+    0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL,
+    0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL, 0x24b4a3a6UL, 0xbad03605UL,
+    0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,
+    0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,
+    0x2d02ef8dUL
+#ifdef BYFOUR
+  },
+  {
+    0x00000000UL, 0x191b3141UL, 0x32366282UL, 0x2b2d53c3UL, 0x646cc504UL,
+    0x7d77f445UL, 0x565aa786UL, 0x4f4196c7UL, 0xc8d98a08UL, 0xd1c2bb49UL,
+    0xfaefe88aUL, 0xe3f4d9cbUL, 0xacb54f0cUL, 0xb5ae7e4dUL, 0x9e832d8eUL,
+    0x87981ccfUL, 0x4ac21251UL, 0x53d92310UL, 0x78f470d3UL, 0x61ef4192UL,
+    0x2eaed755UL, 0x37b5e614UL, 0x1c98b5d7UL, 0x05838496UL, 0x821b9859UL,
+    0x9b00a918UL, 0xb02dfadbUL, 0xa936cb9aUL, 0xe6775d5dUL, 0xff6c6c1cUL,
+    0xd4413fdfUL, 0xcd5a0e9eUL, 0x958424a2UL, 0x8c9f15e3UL, 0xa7b24620UL,
+    0xbea97761UL, 0xf1e8e1a6UL, 0xe8f3d0e7UL, 0xc3de8324UL, 0xdac5b265UL,
+    0x5d5daeaaUL, 0x44469febUL, 0x6f6bcc28UL, 0x7670fd69UL, 0x39316baeUL,
+    0x202a5aefUL, 0x0b07092cUL, 0x121c386dUL, 0xdf4636f3UL, 0xc65d07b2UL,
+    0xed705471UL, 0xf46b6530UL, 0xbb2af3f7UL, 0xa231c2b6UL, 0x891c9175UL,
+    0x9007a034UL, 0x179fbcfbUL, 0x0e848dbaUL, 0x25a9de79UL, 0x3cb2ef38UL,
+    0x73f379ffUL, 0x6ae848beUL, 0x41c51b7dUL, 0x58de2a3cUL, 0xf0794f05UL,
+    0xe9627e44UL, 0xc24f2d87UL, 0xdb541cc6UL, 0x94158a01UL, 0x8d0ebb40UL,
+    0xa623e883UL, 0xbf38d9c2UL, 0x38a0c50dUL, 0x21bbf44cUL, 0x0a96a78fUL,
+    0x138d96ceUL, 0x5ccc0009UL, 0x45d73148UL, 0x6efa628bUL, 0x77e153caUL,
+    0xbabb5d54UL, 0xa3a06c15UL, 0x888d3fd6UL, 0x91960e97UL, 0xded79850UL,
+    0xc7cca911UL, 0xece1fad2UL, 0xf5facb93UL, 0x7262d75cUL, 0x6b79e61dUL,
+    0x4054b5deUL, 0x594f849fUL, 0x160e1258UL, 0x0f152319UL, 0x243870daUL,
+    0x3d23419bUL, 0x65fd6ba7UL, 0x7ce65ae6UL, 0x57cb0925UL, 0x4ed03864UL,
+    0x0191aea3UL, 0x188a9fe2UL, 0x33a7cc21UL, 0x2abcfd60UL, 0xad24e1afUL,
+    0xb43fd0eeUL, 0x9f12832dUL, 0x8609b26cUL, 0xc94824abUL, 0xd05315eaUL,
+    0xfb7e4629UL, 0xe2657768UL, 0x2f3f79f6UL, 0x362448b7UL, 0x1d091b74UL,
+    0x04122a35UL, 0x4b53bcf2UL, 0x52488db3UL, 0x7965de70UL, 0x607eef31UL,
+    0xe7e6f3feUL, 0xfefdc2bfUL, 0xd5d0917cUL, 0xcccba03dUL, 0x838a36faUL,
+    0x9a9107bbUL, 0xb1bc5478UL, 0xa8a76539UL, 0x3b83984bUL, 0x2298a90aUL,
+    0x09b5fac9UL, 0x10aecb88UL, 0x5fef5d4fUL, 0x46f46c0eUL, 0x6dd93fcdUL,
+    0x74c20e8cUL, 0xf35a1243UL, 0xea412302UL, 0xc16c70c1UL, 0xd8774180UL,
+    0x9736d747UL, 0x8e2de606UL, 0xa500b5c5UL, 0xbc1b8484UL, 0x71418a1aUL,
+    0x685abb5bUL, 0x4377e898UL, 0x5a6cd9d9UL, 0x152d4f1eUL, 0x0c367e5fUL,
+    0x271b2d9cUL, 0x3e001cddUL, 0xb9980012UL, 0xa0833153UL, 0x8bae6290UL,
+    0x92b553d1UL, 0xddf4c516UL, 0xc4eff457UL, 0xefc2a794UL, 0xf6d996d5UL,
+    0xae07bce9UL, 0xb71c8da8UL, 0x9c31de6bUL, 0x852aef2aUL, 0xca6b79edUL,
+    0xd37048acUL, 0xf85d1b6fUL, 0xe1462a2eUL, 0x66de36e1UL, 0x7fc507a0UL,
+    0x54e85463UL, 0x4df36522UL, 0x02b2f3e5UL, 0x1ba9c2a4UL, 0x30849167UL,
+    0x299fa026UL, 0xe4c5aeb8UL, 0xfdde9ff9UL, 0xd6f3cc3aUL, 0xcfe8fd7bUL,
+    0x80a96bbcUL, 0x99b25afdUL, 0xb29f093eUL, 0xab84387fUL, 0x2c1c24b0UL,
+    0x350715f1UL, 0x1e2a4632UL, 0x07317773UL, 0x4870e1b4UL, 0x516bd0f5UL,
+    0x7a468336UL, 0x635db277UL, 0xcbfad74eUL, 0xd2e1e60fUL, 0xf9ccb5ccUL,
+    0xe0d7848dUL, 0xaf96124aUL, 0xb68d230bUL, 0x9da070c8UL, 0x84bb4189UL,
+    0x03235d46UL, 0x1a386c07UL, 0x31153fc4UL, 0x280e0e85UL, 0x674f9842UL,
+    0x7e54a903UL, 0x5579fac0UL, 0x4c62cb81UL, 0x8138c51fUL, 0x9823f45eUL,
+    0xb30ea79dUL, 0xaa1596dcUL, 0xe554001bUL, 0xfc4f315aUL, 0xd7626299UL,
+    0xce7953d8UL, 0x49e14f17UL, 0x50fa7e56UL, 0x7bd72d95UL, 0x62cc1cd4UL,
+    0x2d8d8a13UL, 0x3496bb52UL, 0x1fbbe891UL, 0x06a0d9d0UL, 0x5e7ef3ecUL,
+    0x4765c2adUL, 0x6c48916eUL, 0x7553a02fUL, 0x3a1236e8UL, 0x230907a9UL,
+    0x0824546aUL, 0x113f652bUL, 0x96a779e4UL, 0x8fbc48a5UL, 0xa4911b66UL,
+    0xbd8a2a27UL, 0xf2cbbce0UL, 0xebd08da1UL, 0xc0fdde62UL, 0xd9e6ef23UL,
+    0x14bce1bdUL, 0x0da7d0fcUL, 0x268a833fUL, 0x3f91b27eUL, 0x70d024b9UL,
+    0x69cb15f8UL, 0x42e6463bUL, 0x5bfd777aUL, 0xdc656bb5UL, 0xc57e5af4UL,
+    0xee530937UL, 0xf7483876UL, 0xb809aeb1UL, 0xa1129ff0UL, 0x8a3fcc33UL,
+    0x9324fd72UL
+  },
+  {
+    0x00000000UL, 0x01c26a37UL, 0x0384d46eUL, 0x0246be59UL, 0x0709a8dcUL,
+    0x06cbc2ebUL, 0x048d7cb2UL, 0x054f1685UL, 0x0e1351b8UL, 0x0fd13b8fUL,
+    0x0d9785d6UL, 0x0c55efe1UL, 0x091af964UL, 0x08d89353UL, 0x0a9e2d0aUL,
+    0x0b5c473dUL, 0x1c26a370UL, 0x1de4c947UL, 0x1fa2771eUL, 0x1e601d29UL,
+    0x1b2f0bacUL, 0x1aed619bUL, 0x18abdfc2UL, 0x1969b5f5UL, 0x1235f2c8UL,
+    0x13f798ffUL, 0x11b126a6UL, 0x10734c91UL, 0x153c5a14UL, 0x14fe3023UL,
+    0x16b88e7aUL, 0x177ae44dUL, 0x384d46e0UL, 0x398f2cd7UL, 0x3bc9928eUL,
+    0x3a0bf8b9UL, 0x3f44ee3cUL, 0x3e86840bUL, 0x3cc03a52UL, 0x3d025065UL,
+    0x365e1758UL, 0x379c7d6fUL, 0x35dac336UL, 0x3418a901UL, 0x3157bf84UL,
+    0x3095d5b3UL, 0x32d36beaUL, 0x331101ddUL, 0x246be590UL, 0x25a98fa7UL,
+    0x27ef31feUL, 0x262d5bc9UL, 0x23624d4cUL, 0x22a0277bUL, 0x20e69922UL,
+    0x2124f315UL, 0x2a78b428UL, 0x2bbade1fUL, 0x29fc6046UL, 0x283e0a71UL,
+    0x2d711cf4UL, 0x2cb376c3UL, 0x2ef5c89aUL, 0x2f37a2adUL, 0x709a8dc0UL,
+    0x7158e7f7UL, 0x731e59aeUL, 0x72dc3399UL, 0x7793251cUL, 0x76514f2bUL,
+    0x7417f172UL, 0x75d59b45UL, 0x7e89dc78UL, 0x7f4bb64fUL, 0x7d0d0816UL,
+    0x7ccf6221UL, 0x798074a4UL, 0x78421e93UL, 0x7a04a0caUL, 0x7bc6cafdUL,
+    0x6cbc2eb0UL, 0x6d7e4487UL, 0x6f38fadeUL, 0x6efa90e9UL, 0x6bb5866cUL,
+    0x6a77ec5bUL, 0x68315202UL, 0x69f33835UL, 0x62af7f08UL, 0x636d153fUL,
+    0x612bab66UL, 0x60e9c151UL, 0x65a6d7d4UL, 0x6464bde3UL, 0x662203baUL,
+    0x67e0698dUL, 0x48d7cb20UL, 0x4915a117UL, 0x4b531f4eUL, 0x4a917579UL,
+    0x4fde63fcUL, 0x4e1c09cbUL, 0x4c5ab792UL, 0x4d98dda5UL, 0x46c49a98UL,
+    0x4706f0afUL, 0x45404ef6UL, 0x448224c1UL, 0x41cd3244UL, 0x400f5873UL,
+    0x4249e62aUL, 0x438b8c1dUL, 0x54f16850UL, 0x55330267UL, 0x5775bc3eUL,
+    0x56b7d609UL, 0x53f8c08cUL, 0x523aaabbUL, 0x507c14e2UL, 0x51be7ed5UL,
+    0x5ae239e8UL, 0x5b2053dfUL, 0x5966ed86UL, 0x58a487b1UL, 0x5deb9134UL,
+    0x5c29fb03UL, 0x5e6f455aUL, 0x5fad2f6dUL, 0xe1351b80UL, 0xe0f771b7UL,
+    0xe2b1cfeeUL, 0xe373a5d9UL, 0xe63cb35cUL, 0xe7fed96bUL, 0xe5b86732UL,
+    0xe47a0d05UL, 0xef264a38UL, 0xeee4200fUL, 0xeca29e56UL, 0xed60f461UL,
+    0xe82fe2e4UL, 0xe9ed88d3UL, 0xebab368aUL, 0xea695cbdUL, 0xfd13b8f0UL,
+    0xfcd1d2c7UL, 0xfe976c9eUL, 0xff5506a9UL, 0xfa1a102cUL, 0xfbd87a1bUL,
+    0xf99ec442UL, 0xf85cae75UL, 0xf300e948UL, 0xf2c2837fUL, 0xf0843d26UL,
+    0xf1465711UL, 0xf4094194UL, 0xf5cb2ba3UL, 0xf78d95faUL, 0xf64fffcdUL,
+    0xd9785d60UL, 0xd8ba3757UL, 0xdafc890eUL, 0xdb3ee339UL, 0xde71f5bcUL,
+    0xdfb39f8bUL, 0xddf521d2UL, 0xdc374be5UL, 0xd76b0cd8UL, 0xd6a966efUL,
+    0xd4efd8b6UL, 0xd52db281UL, 0xd062a404UL, 0xd1a0ce33UL, 0xd3e6706aUL,
+    0xd2241a5dUL, 0xc55efe10UL, 0xc49c9427UL, 0xc6da2a7eUL, 0xc7184049UL,
+    0xc25756ccUL, 0xc3953cfbUL, 0xc1d382a2UL, 0xc011e895UL, 0xcb4dafa8UL,
+    0xca8fc59fUL, 0xc8c97bc6UL, 0xc90b11f1UL, 0xcc440774UL, 0xcd866d43UL,
+    0xcfc0d31aUL, 0xce02b92dUL, 0x91af9640UL, 0x906dfc77UL, 0x922b422eUL,
+    0x93e92819UL, 0x96a63e9cUL, 0x976454abUL, 0x9522eaf2UL, 0x94e080c5UL,
+    0x9fbcc7f8UL, 0x9e7eadcfUL, 0x9c381396UL, 0x9dfa79a1UL, 0x98b56f24UL,
+    0x99770513UL, 0x9b31bb4aUL, 0x9af3d17dUL, 0x8d893530UL, 0x8c4b5f07UL,
+    0x8e0de15eUL, 0x8fcf8b69UL, 0x8a809decUL, 0x8b42f7dbUL, 0x89044982UL,
+    0x88c623b5UL, 0x839a6488UL, 0x82580ebfUL, 0x801eb0e6UL, 0x81dcdad1UL,
+    0x8493cc54UL, 0x8551a663UL, 0x8717183aUL, 0x86d5720dUL, 0xa9e2d0a0UL,
+    0xa820ba97UL, 0xaa6604ceUL, 0xaba46ef9UL, 0xaeeb787cUL, 0xaf29124bUL,
+    0xad6fac12UL, 0xacadc625UL, 0xa7f18118UL, 0xa633eb2fUL, 0xa4755576UL,
+    0xa5b73f41UL, 0xa0f829c4UL, 0xa13a43f3UL, 0xa37cfdaaUL, 0xa2be979dUL,
+    0xb5c473d0UL, 0xb40619e7UL, 0xb640a7beUL, 0xb782cd89UL, 0xb2cddb0cUL,
+    0xb30fb13bUL, 0xb1490f62UL, 0xb08b6555UL, 0xbbd72268UL, 0xba15485fUL,
+    0xb853f606UL, 0xb9919c31UL, 0xbcde8ab4UL, 0xbd1ce083UL, 0xbf5a5edaUL,
+    0xbe9834edUL
+  },
+  {
+    0x00000000UL, 0xb8bc6765UL, 0xaa09c88bUL, 0x12b5afeeUL, 0x8f629757UL,
+    0x37def032UL, 0x256b5fdcUL, 0x9dd738b9UL, 0xc5b428efUL, 0x7d084f8aUL,
+    0x6fbde064UL, 0xd7018701UL, 0x4ad6bfb8UL, 0xf26ad8ddUL, 0xe0df7733UL,
+    0x58631056UL, 0x5019579fUL, 0xe8a530faUL, 0xfa109f14UL, 0x42acf871UL,
+    0xdf7bc0c8UL, 0x67c7a7adUL, 0x75720843UL, 0xcdce6f26UL, 0x95ad7f70UL,
+    0x2d111815UL, 0x3fa4b7fbUL, 0x8718d09eUL, 0x1acfe827UL, 0xa2738f42UL,
+    0xb0c620acUL, 0x087a47c9UL, 0xa032af3eUL, 0x188ec85bUL, 0x0a3b67b5UL,
+    0xb28700d0UL, 0x2f503869UL, 0x97ec5f0cUL, 0x8559f0e2UL, 0x3de59787UL,
+    0x658687d1UL, 0xdd3ae0b4UL, 0xcf8f4f5aUL, 0x7733283fUL, 0xeae41086UL,
+    0x525877e3UL, 0x40edd80dUL, 0xf851bf68UL, 0xf02bf8a1UL, 0x48979fc4UL,
+    0x5a22302aUL, 0xe29e574fUL, 0x7f496ff6UL, 0xc7f50893UL, 0xd540a77dUL,
+    0x6dfcc018UL, 0x359fd04eUL, 0x8d23b72bUL, 0x9f9618c5UL, 0x272a7fa0UL,
+    0xbafd4719UL, 0x0241207cUL, 0x10f48f92UL, 0xa848e8f7UL, 0x9b14583dUL,
+    0x23a83f58UL, 0x311d90b6UL, 0x89a1f7d3UL, 0x1476cf6aUL, 0xaccaa80fUL,
+    0xbe7f07e1UL, 0x06c36084UL, 0x5ea070d2UL, 0xe61c17b7UL, 0xf4a9b859UL,
+    0x4c15df3cUL, 0xd1c2e785UL, 0x697e80e0UL, 0x7bcb2f0eUL, 0xc377486bUL,
+    0xcb0d0fa2UL, 0x73b168c7UL, 0x6104c729UL, 0xd9b8a04cUL, 0x446f98f5UL,
+    0xfcd3ff90UL, 0xee66507eUL, 0x56da371bUL, 0x0eb9274dUL, 0xb6054028UL,
+    0xa4b0efc6UL, 0x1c0c88a3UL, 0x81dbb01aUL, 0x3967d77fUL, 0x2bd27891UL,
+    0x936e1ff4UL, 0x3b26f703UL, 0x839a9066UL, 0x912f3f88UL, 0x299358edUL,
+    0xb4446054UL, 0x0cf80731UL, 0x1e4da8dfUL, 0xa6f1cfbaUL, 0xfe92dfecUL,
+    0x462eb889UL, 0x549b1767UL, 0xec277002UL, 0x71f048bbUL, 0xc94c2fdeUL,
+    0xdbf98030UL, 0x6345e755UL, 0x6b3fa09cUL, 0xd383c7f9UL, 0xc1366817UL,
+    0x798a0f72UL, 0xe45d37cbUL, 0x5ce150aeUL, 0x4e54ff40UL, 0xf6e89825UL,
+    0xae8b8873UL, 0x1637ef16UL, 0x048240f8UL, 0xbc3e279dUL, 0x21e91f24UL,
+    0x99557841UL, 0x8be0d7afUL, 0x335cb0caUL, 0xed59b63bUL, 0x55e5d15eUL,
+    0x47507eb0UL, 0xffec19d5UL, 0x623b216cUL, 0xda874609UL, 0xc832e9e7UL,
+    0x708e8e82UL, 0x28ed9ed4UL, 0x9051f9b1UL, 0x82e4565fUL, 0x3a58313aUL,
+    0xa78f0983UL, 0x1f336ee6UL, 0x0d86c108UL, 0xb53aa66dUL, 0xbd40e1a4UL,
+    0x05fc86c1UL, 0x1749292fUL, 0xaff54e4aUL, 0x322276f3UL, 0x8a9e1196UL,
+    0x982bbe78UL, 0x2097d91dUL, 0x78f4c94bUL, 0xc048ae2eUL, 0xd2fd01c0UL,
+    0x6a4166a5UL, 0xf7965e1cUL, 0x4f2a3979UL, 0x5d9f9697UL, 0xe523f1f2UL,
+    0x4d6b1905UL, 0xf5d77e60UL, 0xe762d18eUL, 0x5fdeb6ebUL, 0xc2098e52UL,
+    0x7ab5e937UL, 0x680046d9UL, 0xd0bc21bcUL, 0x88df31eaUL, 0x3063568fUL,
+    0x22d6f961UL, 0x9a6a9e04UL, 0x07bda6bdUL, 0xbf01c1d8UL, 0xadb46e36UL,
+    0x15080953UL, 0x1d724e9aUL, 0xa5ce29ffUL, 0xb77b8611UL, 0x0fc7e174UL,
+    0x9210d9cdUL, 0x2aacbea8UL, 0x38191146UL, 0x80a57623UL, 0xd8c66675UL,
+    0x607a0110UL, 0x72cfaefeUL, 0xca73c99bUL, 0x57a4f122UL, 0xef189647UL,
+    0xfdad39a9UL, 0x45115eccUL, 0x764dee06UL, 0xcef18963UL, 0xdc44268dUL,
+    0x64f841e8UL, 0xf92f7951UL, 0x41931e34UL, 0x5326b1daUL, 0xeb9ad6bfUL,
+    0xb3f9c6e9UL, 0x0b45a18cUL, 0x19f00e62UL, 0xa14c6907UL, 0x3c9b51beUL,
+    0x842736dbUL, 0x96929935UL, 0x2e2efe50UL, 0x2654b999UL, 0x9ee8defcUL,
+    0x8c5d7112UL, 0x34e11677UL, 0xa9362eceUL, 0x118a49abUL, 0x033fe645UL,
+    0xbb838120UL, 0xe3e09176UL, 0x5b5cf613UL, 0x49e959fdUL, 0xf1553e98UL,
+    0x6c820621UL, 0xd43e6144UL, 0xc68bceaaUL, 0x7e37a9cfUL, 0xd67f4138UL,
+    0x6ec3265dUL, 0x7c7689b3UL, 0xc4caeed6UL, 0x591dd66fUL, 0xe1a1b10aUL,
+    0xf3141ee4UL, 0x4ba87981UL, 0x13cb69d7UL, 0xab770eb2UL, 0xb9c2a15cUL,
+    0x017ec639UL, 0x9ca9fe80UL, 0x241599e5UL, 0x36a0360bUL, 0x8e1c516eUL,
+    0x866616a7UL, 0x3eda71c2UL, 0x2c6fde2cUL, 0x94d3b949UL, 0x090481f0UL,
+    0xb1b8e695UL, 0xa30d497bUL, 0x1bb12e1eUL, 0x43d23e48UL, 0xfb6e592dUL,
+    0xe9dbf6c3UL, 0x516791a6UL, 0xccb0a91fUL, 0x740cce7aUL, 0x66b96194UL,
+    0xde0506f1UL
+  },
+  {
+    0x00000000UL, 0x96300777UL, 0x2c610eeeUL, 0xba510999UL, 0x19c46d07UL,
+    0x8ff46a70UL, 0x35a563e9UL, 0xa395649eUL, 0x3288db0eUL, 0xa4b8dc79UL,
+    0x1ee9d5e0UL, 0x88d9d297UL, 0x2b4cb609UL, 0xbd7cb17eUL, 0x072db8e7UL,
+    0x911dbf90UL, 0x6410b71dUL, 0xf220b06aUL, 0x4871b9f3UL, 0xde41be84UL,
+    0x7dd4da1aUL, 0xebe4dd6dUL, 0x51b5d4f4UL, 0xc785d383UL, 0x56986c13UL,
+    0xc0a86b64UL, 0x7af962fdUL, 0xecc9658aUL, 0x4f5c0114UL, 0xd96c0663UL,
+    0x633d0ffaUL, 0xf50d088dUL, 0xc8206e3bUL, 0x5e10694cUL, 0xe44160d5UL,
+    0x727167a2UL, 0xd1e4033cUL, 0x47d4044bUL, 0xfd850dd2UL, 0x6bb50aa5UL,
+    0xfaa8b535UL, 0x6c98b242UL, 0xd6c9bbdbUL, 0x40f9bcacUL, 0xe36cd832UL,
+    0x755cdf45UL, 0xcf0dd6dcUL, 0x593dd1abUL, 0xac30d926UL, 0x3a00de51UL,
+    0x8051d7c8UL, 0x1661d0bfUL, 0xb5f4b421UL, 0x23c4b356UL, 0x9995bacfUL,
+    0x0fa5bdb8UL, 0x9eb80228UL, 0x0888055fUL, 0xb2d90cc6UL, 0x24e90bb1UL,
+    0x877c6f2fUL, 0x114c6858UL, 0xab1d61c1UL, 0x3d2d66b6UL, 0x9041dc76UL,
+    0x0671db01UL, 0xbc20d298UL, 0x2a10d5efUL, 0x8985b171UL, 0x1fb5b606UL,
+    0xa5e4bf9fUL, 0x33d4b8e8UL, 0xa2c90778UL, 0x34f9000fUL, 0x8ea80996UL,
+    0x18980ee1UL, 0xbb0d6a7fUL, 0x2d3d6d08UL, 0x976c6491UL, 0x015c63e6UL,
+    0xf4516b6bUL, 0x62616c1cUL, 0xd8306585UL, 0x4e0062f2UL, 0xed95066cUL,
+    0x7ba5011bUL, 0xc1f40882UL, 0x57c40ff5UL, 0xc6d9b065UL, 0x50e9b712UL,
+    0xeab8be8bUL, 0x7c88b9fcUL, 0xdf1ddd62UL, 0x492dda15UL, 0xf37cd38cUL,
+    0x654cd4fbUL, 0x5861b24dUL, 0xce51b53aUL, 0x7400bca3UL, 0xe230bbd4UL,
+    0x41a5df4aUL, 0xd795d83dUL, 0x6dc4d1a4UL, 0xfbf4d6d3UL, 0x6ae96943UL,
+    0xfcd96e34UL, 0x468867adUL, 0xd0b860daUL, 0x732d0444UL, 0xe51d0333UL,
+    0x5f4c0aaaUL, 0xc97c0dddUL, 0x3c710550UL, 0xaa410227UL, 0x10100bbeUL,
+    0x86200cc9UL, 0x25b56857UL, 0xb3856f20UL, 0x09d466b9UL, 0x9fe461ceUL,
+    0x0ef9de5eUL, 0x98c9d929UL, 0x2298d0b0UL, 0xb4a8d7c7UL, 0x173db359UL,
+    0x810db42eUL, 0x3b5cbdb7UL, 0xad6cbac0UL, 0x2083b8edUL, 0xb6b3bf9aUL,
+    0x0ce2b603UL, 0x9ad2b174UL, 0x3947d5eaUL, 0xaf77d29dUL, 0x1526db04UL,
+    0x8316dc73UL, 0x120b63e3UL, 0x843b6494UL, 0x3e6a6d0dUL, 0xa85a6a7aUL,
+    0x0bcf0ee4UL, 0x9dff0993UL, 0x27ae000aUL, 0xb19e077dUL, 0x44930ff0UL,
+    0xd2a30887UL, 0x68f2011eUL, 0xfec20669UL, 0x5d5762f7UL, 0xcb676580UL,
+    0x71366c19UL, 0xe7066b6eUL, 0x761bd4feUL, 0xe02bd389UL, 0x5a7ada10UL,
+    0xcc4add67UL, 0x6fdfb9f9UL, 0xf9efbe8eUL, 0x43beb717UL, 0xd58eb060UL,
+    0xe8a3d6d6UL, 0x7e93d1a1UL, 0xc4c2d838UL, 0x52f2df4fUL, 0xf167bbd1UL,
+    0x6757bca6UL, 0xdd06b53fUL, 0x4b36b248UL, 0xda2b0dd8UL, 0x4c1b0aafUL,
+    0xf64a0336UL, 0x607a0441UL, 0xc3ef60dfUL, 0x55df67a8UL, 0xef8e6e31UL,
+    0x79be6946UL, 0x8cb361cbUL, 0x1a8366bcUL, 0xa0d26f25UL, 0x36e26852UL,
+    0x95770cccUL, 0x03470bbbUL, 0xb9160222UL, 0x2f260555UL, 0xbe3bbac5UL,
+    0x280bbdb2UL, 0x925ab42bUL, 0x046ab35cUL, 0xa7ffd7c2UL, 0x31cfd0b5UL,
+    0x8b9ed92cUL, 0x1daede5bUL, 0xb0c2649bUL, 0x26f263ecUL, 0x9ca36a75UL,
+    0x0a936d02UL, 0xa906099cUL, 0x3f360eebUL, 0x85670772UL, 0x13570005UL,
+    0x824abf95UL, 0x147ab8e2UL, 0xae2bb17bUL, 0x381bb60cUL, 0x9b8ed292UL,
+    0x0dbed5e5UL, 0xb7efdc7cUL, 0x21dfdb0bUL, 0xd4d2d386UL, 0x42e2d4f1UL,
+    0xf8b3dd68UL, 0x6e83da1fUL, 0xcd16be81UL, 0x5b26b9f6UL, 0xe177b06fUL,
+    0x7747b718UL, 0xe65a0888UL, 0x706a0fffUL, 0xca3b0666UL, 0x5c0b0111UL,
+    0xff9e658fUL, 0x69ae62f8UL, 0xd3ff6b61UL, 0x45cf6c16UL, 0x78e20aa0UL,
+    0xeed20dd7UL, 0x5483044eUL, 0xc2b30339UL, 0x612667a7UL, 0xf71660d0UL,
+    0x4d476949UL, 0xdb776e3eUL, 0x4a6ad1aeUL, 0xdc5ad6d9UL, 0x660bdf40UL,
+    0xf03bd837UL, 0x53aebca9UL, 0xc59ebbdeUL, 0x7fcfb247UL, 0xe9ffb530UL,
+    0x1cf2bdbdUL, 0x8ac2bacaUL, 0x3093b353UL, 0xa6a3b424UL, 0x0536d0baUL,
+    0x9306d7cdUL, 0x2957de54UL, 0xbf67d923UL, 0x2e7a66b3UL, 0xb84a61c4UL,
+    0x021b685dUL, 0x942b6f2aUL, 0x37be0bb4UL, 0xa18e0cc3UL, 0x1bdf055aUL,
+    0x8def022dUL
+  },
+  {
+    0x00000000UL, 0x41311b19UL, 0x82623632UL, 0xc3532d2bUL, 0x04c56c64UL,
+    0x45f4777dUL, 0x86a75a56UL, 0xc796414fUL, 0x088ad9c8UL, 0x49bbc2d1UL,
+    0x8ae8effaUL, 0xcbd9f4e3UL, 0x0c4fb5acUL, 0x4d7eaeb5UL, 0x8e2d839eUL,
+    0xcf1c9887UL, 0x5112c24aUL, 0x1023d953UL, 0xd370f478UL, 0x9241ef61UL,
+    0x55d7ae2eUL, 0x14e6b537UL, 0xd7b5981cUL, 0x96848305UL, 0x59981b82UL,
+    0x18a9009bUL, 0xdbfa2db0UL, 0x9acb36a9UL, 0x5d5d77e6UL, 0x1c6c6cffUL,
+    0xdf3f41d4UL, 0x9e0e5acdUL, 0xa2248495UL, 0xe3159f8cUL, 0x2046b2a7UL,
+    0x6177a9beUL, 0xa6e1e8f1UL, 0xe7d0f3e8UL, 0x2483dec3UL, 0x65b2c5daUL,
+    0xaaae5d5dUL, 0xeb9f4644UL, 0x28cc6b6fUL, 0x69fd7076UL, 0xae6b3139UL,
+    0xef5a2a20UL, 0x2c09070bUL, 0x6d381c12UL, 0xf33646dfUL, 0xb2075dc6UL,
+    0x715470edUL, 0x30656bf4UL, 0xf7f32abbUL, 0xb6c231a2UL, 0x75911c89UL,
+    0x34a00790UL, 0xfbbc9f17UL, 0xba8d840eUL, 0x79dea925UL, 0x38efb23cUL,
+    0xff79f373UL, 0xbe48e86aUL, 0x7d1bc541UL, 0x3c2ade58UL, 0x054f79f0UL,
+    0x447e62e9UL, 0x872d4fc2UL, 0xc61c54dbUL, 0x018a1594UL, 0x40bb0e8dUL,
+    0x83e823a6UL, 0xc2d938bfUL, 0x0dc5a038UL, 0x4cf4bb21UL, 0x8fa7960aUL,
+    0xce968d13UL, 0x0900cc5cUL, 0x4831d745UL, 0x8b62fa6eUL, 0xca53e177UL,
+    0x545dbbbaUL, 0x156ca0a3UL, 0xd63f8d88UL, 0x970e9691UL, 0x5098d7deUL,
+    0x11a9ccc7UL, 0xd2fae1ecUL, 0x93cbfaf5UL, 0x5cd76272UL, 0x1de6796bUL,
+    0xdeb55440UL, 0x9f844f59UL, 0x58120e16UL, 0x1923150fUL, 0xda703824UL,
+    0x9b41233dUL, 0xa76bfd65UL, 0xe65ae67cUL, 0x2509cb57UL, 0x6438d04eUL,
+    0xa3ae9101UL, 0xe29f8a18UL, 0x21cca733UL, 0x60fdbc2aUL, 0xafe124adUL,
+    0xeed03fb4UL, 0x2d83129fUL, 0x6cb20986UL, 0xab2448c9UL, 0xea1553d0UL,
+    0x29467efbUL, 0x687765e2UL, 0xf6793f2fUL, 0xb7482436UL, 0x741b091dUL,
+    0x352a1204UL, 0xf2bc534bUL, 0xb38d4852UL, 0x70de6579UL, 0x31ef7e60UL,
+    0xfef3e6e7UL, 0xbfc2fdfeUL, 0x7c91d0d5UL, 0x3da0cbccUL, 0xfa368a83UL,
+    0xbb07919aUL, 0x7854bcb1UL, 0x3965a7a8UL, 0x4b98833bUL, 0x0aa99822UL,
+    0xc9fab509UL, 0x88cbae10UL, 0x4f5def5fUL, 0x0e6cf446UL, 0xcd3fd96dUL,
+    0x8c0ec274UL, 0x43125af3UL, 0x022341eaUL, 0xc1706cc1UL, 0x804177d8UL,
+    0x47d73697UL, 0x06e62d8eUL, 0xc5b500a5UL, 0x84841bbcUL, 0x1a8a4171UL,
+    0x5bbb5a68UL, 0x98e87743UL, 0xd9d96c5aUL, 0x1e4f2d15UL, 0x5f7e360cUL,
+    0x9c2d1b27UL, 0xdd1c003eUL, 0x120098b9UL, 0x533183a0UL, 0x9062ae8bUL,
+    0xd153b592UL, 0x16c5f4ddUL, 0x57f4efc4UL, 0x94a7c2efUL, 0xd596d9f6UL,
+    0xe9bc07aeUL, 0xa88d1cb7UL, 0x6bde319cUL, 0x2aef2a85UL, 0xed796bcaUL,
+    0xac4870d3UL, 0x6f1b5df8UL, 0x2e2a46e1UL, 0xe136de66UL, 0xa007c57fUL,
+    0x6354e854UL, 0x2265f34dUL, 0xe5f3b202UL, 0xa4c2a91bUL, 0x67918430UL,
+    0x26a09f29UL, 0xb8aec5e4UL, 0xf99fdefdUL, 0x3accf3d6UL, 0x7bfde8cfUL,
+    0xbc6ba980UL, 0xfd5ab299UL, 0x3e099fb2UL, 0x7f3884abUL, 0xb0241c2cUL,
+    0xf1150735UL, 0x32462a1eUL, 0x73773107UL, 0xb4e17048UL, 0xf5d06b51UL,
+    0x3683467aUL, 0x77b25d63UL, 0x4ed7facbUL, 0x0fe6e1d2UL, 0xccb5ccf9UL,
+    0x8d84d7e0UL, 0x4a1296afUL, 0x0b238db6UL, 0xc870a09dUL, 0x8941bb84UL,
+    0x465d2303UL, 0x076c381aUL, 0xc43f1531UL, 0x850e0e28UL, 0x42984f67UL,
+    0x03a9547eUL, 0xc0fa7955UL, 0x81cb624cUL, 0x1fc53881UL, 0x5ef42398UL,
+    0x9da70eb3UL, 0xdc9615aaUL, 0x1b0054e5UL, 0x5a314ffcUL, 0x996262d7UL,
+    0xd85379ceUL, 0x174fe149UL, 0x567efa50UL, 0x952dd77bUL, 0xd41ccc62UL,
+    0x138a8d2dUL, 0x52bb9634UL, 0x91e8bb1fUL, 0xd0d9a006UL, 0xecf37e5eUL,
+    0xadc26547UL, 0x6e91486cUL, 0x2fa05375UL, 0xe836123aUL, 0xa9070923UL,
+    0x6a542408UL, 0x2b653f11UL, 0xe479a796UL, 0xa548bc8fUL, 0x661b91a4UL,
+    0x272a8abdUL, 0xe0bccbf2UL, 0xa18dd0ebUL, 0x62defdc0UL, 0x23efe6d9UL,
+    0xbde1bc14UL, 0xfcd0a70dUL, 0x3f838a26UL, 0x7eb2913fUL, 0xb924d070UL,
+    0xf815cb69UL, 0x3b46e642UL, 0x7a77fd5bUL, 0xb56b65dcUL, 0xf45a7ec5UL,
+    0x370953eeUL, 0x763848f7UL, 0xb1ae09b8UL, 0xf09f12a1UL, 0x33cc3f8aUL,
+    0x72fd2493UL
+  },
+  {
+    0x00000000UL, 0x376ac201UL, 0x6ed48403UL, 0x59be4602UL, 0xdca80907UL,
+    0xebc2cb06UL, 0xb27c8d04UL, 0x85164f05UL, 0xb851130eUL, 0x8f3bd10fUL,
+    0xd685970dUL, 0xe1ef550cUL, 0x64f91a09UL, 0x5393d808UL, 0x0a2d9e0aUL,
+    0x3d475c0bUL, 0x70a3261cUL, 0x47c9e41dUL, 0x1e77a21fUL, 0x291d601eUL,
+    0xac0b2f1bUL, 0x9b61ed1aUL, 0xc2dfab18UL, 0xf5b56919UL, 0xc8f23512UL,
+    0xff98f713UL, 0xa626b111UL, 0x914c7310UL, 0x145a3c15UL, 0x2330fe14UL,
+    0x7a8eb816UL, 0x4de47a17UL, 0xe0464d38UL, 0xd72c8f39UL, 0x8e92c93bUL,
+    0xb9f80b3aUL, 0x3cee443fUL, 0x0b84863eUL, 0x523ac03cUL, 0x6550023dUL,
+    0x58175e36UL, 0x6f7d9c37UL, 0x36c3da35UL, 0x01a91834UL, 0x84bf5731UL,
+    0xb3d59530UL, 0xea6bd332UL, 0xdd011133UL, 0x90e56b24UL, 0xa78fa925UL,
+    0xfe31ef27UL, 0xc95b2d26UL, 0x4c4d6223UL, 0x7b27a022UL, 0x2299e620UL,
+    0x15f32421UL, 0x28b4782aUL, 0x1fdeba2bUL, 0x4660fc29UL, 0x710a3e28UL,
+    0xf41c712dUL, 0xc376b32cUL, 0x9ac8f52eUL, 0xada2372fUL, 0xc08d9a70UL,
+    0xf7e75871UL, 0xae591e73UL, 0x9933dc72UL, 0x1c259377UL, 0x2b4f5176UL,
+    0x72f11774UL, 0x459bd575UL, 0x78dc897eUL, 0x4fb64b7fUL, 0x16080d7dUL,
+    0x2162cf7cUL, 0xa4748079UL, 0x931e4278UL, 0xcaa0047aUL, 0xfdcac67bUL,
+    0xb02ebc6cUL, 0x87447e6dUL, 0xdefa386fUL, 0xe990fa6eUL, 0x6c86b56bUL,
+    0x5bec776aUL, 0x02523168UL, 0x3538f369UL, 0x087faf62UL, 0x3f156d63UL,
+    0x66ab2b61UL, 0x51c1e960UL, 0xd4d7a665UL, 0xe3bd6464UL, 0xba032266UL,
+    0x8d69e067UL, 0x20cbd748UL, 0x17a11549UL, 0x4e1f534bUL, 0x7975914aUL,
+    0xfc63de4fUL, 0xcb091c4eUL, 0x92b75a4cUL, 0xa5dd984dUL, 0x989ac446UL,
+    0xaff00647UL, 0xf64e4045UL, 0xc1248244UL, 0x4432cd41UL, 0x73580f40UL,
+    0x2ae64942UL, 0x1d8c8b43UL, 0x5068f154UL, 0x67023355UL, 0x3ebc7557UL,
+    0x09d6b756UL, 0x8cc0f853UL, 0xbbaa3a52UL, 0xe2147c50UL, 0xd57ebe51UL,
+    0xe839e25aUL, 0xdf53205bUL, 0x86ed6659UL, 0xb187a458UL, 0x3491eb5dUL,
+    0x03fb295cUL, 0x5a456f5eUL, 0x6d2fad5fUL, 0x801b35e1UL, 0xb771f7e0UL,
+    0xeecfb1e2UL, 0xd9a573e3UL, 0x5cb33ce6UL, 0x6bd9fee7UL, 0x3267b8e5UL,
+    0x050d7ae4UL, 0x384a26efUL, 0x0f20e4eeUL, 0x569ea2ecUL, 0x61f460edUL,
+    0xe4e22fe8UL, 0xd388ede9UL, 0x8a36abebUL, 0xbd5c69eaUL, 0xf0b813fdUL,
+    0xc7d2d1fcUL, 0x9e6c97feUL, 0xa90655ffUL, 0x2c101afaUL, 0x1b7ad8fbUL,
+    0x42c49ef9UL, 0x75ae5cf8UL, 0x48e900f3UL, 0x7f83c2f2UL, 0x263d84f0UL,
+    0x115746f1UL, 0x944109f4UL, 0xa32bcbf5UL, 0xfa958df7UL, 0xcdff4ff6UL,
+    0x605d78d9UL, 0x5737bad8UL, 0x0e89fcdaUL, 0x39e33edbUL, 0xbcf571deUL,
+    0x8b9fb3dfUL, 0xd221f5ddUL, 0xe54b37dcUL, 0xd80c6bd7UL, 0xef66a9d6UL,
+    0xb6d8efd4UL, 0x81b22dd5UL, 0x04a462d0UL, 0x33cea0d1UL, 0x6a70e6d3UL,
+    0x5d1a24d2UL, 0x10fe5ec5UL, 0x27949cc4UL, 0x7e2adac6UL, 0x494018c7UL,
+    0xcc5657c2UL, 0xfb3c95c3UL, 0xa282d3c1UL, 0x95e811c0UL, 0xa8af4dcbUL,
+    0x9fc58fcaUL, 0xc67bc9c8UL, 0xf1110bc9UL, 0x740744ccUL, 0x436d86cdUL,
+    0x1ad3c0cfUL, 0x2db902ceUL, 0x4096af91UL, 0x77fc6d90UL, 0x2e422b92UL,
+    0x1928e993UL, 0x9c3ea696UL, 0xab546497UL, 0xf2ea2295UL, 0xc580e094UL,
+    0xf8c7bc9fUL, 0xcfad7e9eUL, 0x9613389cUL, 0xa179fa9dUL, 0x246fb598UL,
+    0x13057799UL, 0x4abb319bUL, 0x7dd1f39aUL, 0x3035898dUL, 0x075f4b8cUL,
+    0x5ee10d8eUL, 0x698bcf8fUL, 0xec9d808aUL, 0xdbf7428bUL, 0x82490489UL,
+    0xb523c688UL, 0x88649a83UL, 0xbf0e5882UL, 0xe6b01e80UL, 0xd1dadc81UL,
+    0x54cc9384UL, 0x63a65185UL, 0x3a181787UL, 0x0d72d586UL, 0xa0d0e2a9UL,
+    0x97ba20a8UL, 0xce0466aaUL, 0xf96ea4abUL, 0x7c78ebaeUL, 0x4b1229afUL,
+    0x12ac6fadUL, 0x25c6adacUL, 0x1881f1a7UL, 0x2feb33a6UL, 0x765575a4UL,
+    0x413fb7a5UL, 0xc429f8a0UL, 0xf3433aa1UL, 0xaafd7ca3UL, 0x9d97bea2UL,
+    0xd073c4b5UL, 0xe71906b4UL, 0xbea740b6UL, 0x89cd82b7UL, 0x0cdbcdb2UL,
+    0x3bb10fb3UL, 0x620f49b1UL, 0x55658bb0UL, 0x6822d7bbUL, 0x5f4815baUL,
+    0x06f653b8UL, 0x319c91b9UL, 0xb48adebcUL, 0x83e01cbdUL, 0xda5e5abfUL,
+    0xed3498beUL
+  },
+  {
+    0x00000000UL, 0x6567bcb8UL, 0x8bc809aaUL, 0xeeafb512UL, 0x5797628fUL,
+    0x32f0de37UL, 0xdc5f6b25UL, 0xb938d79dUL, 0xef28b4c5UL, 0x8a4f087dUL,
+    0x64e0bd6fUL, 0x018701d7UL, 0xb8bfd64aUL, 0xddd86af2UL, 0x3377dfe0UL,
+    0x56106358UL, 0x9f571950UL, 0xfa30a5e8UL, 0x149f10faUL, 0x71f8ac42UL,
+    0xc8c07bdfUL, 0xada7c767UL, 0x43087275UL, 0x266fcecdUL, 0x707fad95UL,
+    0x1518112dUL, 0xfbb7a43fUL, 0x9ed01887UL, 0x27e8cf1aUL, 0x428f73a2UL,
+    0xac20c6b0UL, 0xc9477a08UL, 0x3eaf32a0UL, 0x5bc88e18UL, 0xb5673b0aUL,
+    0xd00087b2UL, 0x6938502fUL, 0x0c5fec97UL, 0xe2f05985UL, 0x8797e53dUL,
+    0xd1878665UL, 0xb4e03addUL, 0x5a4f8fcfUL, 0x3f283377UL, 0x8610e4eaUL,
+    0xe3775852UL, 0x0dd8ed40UL, 0x68bf51f8UL, 0xa1f82bf0UL, 0xc49f9748UL,
+    0x2a30225aUL, 0x4f579ee2UL, 0xf66f497fUL, 0x9308f5c7UL, 0x7da740d5UL,
+    0x18c0fc6dUL, 0x4ed09f35UL, 0x2bb7238dUL, 0xc518969fUL, 0xa07f2a27UL,
+    0x1947fdbaUL, 0x7c204102UL, 0x928ff410UL, 0xf7e848a8UL, 0x3d58149bUL,
+    0x583fa823UL, 0xb6901d31UL, 0xd3f7a189UL, 0x6acf7614UL, 0x0fa8caacUL,
+    0xe1077fbeUL, 0x8460c306UL, 0xd270a05eUL, 0xb7171ce6UL, 0x59b8a9f4UL,
+    0x3cdf154cUL, 0x85e7c2d1UL, 0xe0807e69UL, 0x0e2fcb7bUL, 0x6b4877c3UL,
+    0xa20f0dcbUL, 0xc768b173UL, 0x29c70461UL, 0x4ca0b8d9UL, 0xf5986f44UL,
+    0x90ffd3fcUL, 0x7e5066eeUL, 0x1b37da56UL, 0x4d27b90eUL, 0x284005b6UL,
+    0xc6efb0a4UL, 0xa3880c1cUL, 0x1ab0db81UL, 0x7fd76739UL, 0x9178d22bUL,
+    0xf41f6e93UL, 0x03f7263bUL, 0x66909a83UL, 0x883f2f91UL, 0xed589329UL,
+    0x546044b4UL, 0x3107f80cUL, 0xdfa84d1eUL, 0xbacff1a6UL, 0xecdf92feUL,
+    0x89b82e46UL, 0x67179b54UL, 0x027027ecUL, 0xbb48f071UL, 0xde2f4cc9UL,
+    0x3080f9dbUL, 0x55e74563UL, 0x9ca03f6bUL, 0xf9c783d3UL, 0x176836c1UL,
+    0x720f8a79UL, 0xcb375de4UL, 0xae50e15cUL, 0x40ff544eUL, 0x2598e8f6UL,
+    0x73888baeUL, 0x16ef3716UL, 0xf8408204UL, 0x9d273ebcUL, 0x241fe921UL,
+    0x41785599UL, 0xafd7e08bUL, 0xcab05c33UL, 0x3bb659edUL, 0x5ed1e555UL,
+    0xb07e5047UL, 0xd519ecffUL, 0x6c213b62UL, 0x094687daUL, 0xe7e932c8UL,
+    0x828e8e70UL, 0xd49eed28UL, 0xb1f95190UL, 0x5f56e482UL, 0x3a31583aUL,
+    0x83098fa7UL, 0xe66e331fUL, 0x08c1860dUL, 0x6da63ab5UL, 0xa4e140bdUL,
+    0xc186fc05UL, 0x2f294917UL, 0x4a4ef5afUL, 0xf3762232UL, 0x96119e8aUL,
+    0x78be2b98UL, 0x1dd99720UL, 0x4bc9f478UL, 0x2eae48c0UL, 0xc001fdd2UL,
+    0xa566416aUL, 0x1c5e96f7UL, 0x79392a4fUL, 0x97969f5dUL, 0xf2f123e5UL,
+    0x05196b4dUL, 0x607ed7f5UL, 0x8ed162e7UL, 0xebb6de5fUL, 0x528e09c2UL,
+    0x37e9b57aUL, 0xd9460068UL, 0xbc21bcd0UL, 0xea31df88UL, 0x8f566330UL,
+    0x61f9d622UL, 0x049e6a9aUL, 0xbda6bd07UL, 0xd8c101bfUL, 0x366eb4adUL,
+    0x53090815UL, 0x9a4e721dUL, 0xff29cea5UL, 0x11867bb7UL, 0x74e1c70fUL,
+    0xcdd91092UL, 0xa8beac2aUL, 0x46111938UL, 0x2376a580UL, 0x7566c6d8UL,
+    0x10017a60UL, 0xfeaecf72UL, 0x9bc973caUL, 0x22f1a457UL, 0x479618efUL,
+    0xa939adfdUL, 0xcc5e1145UL, 0x06ee4d76UL, 0x6389f1ceUL, 0x8d2644dcUL,
+    0xe841f864UL, 0x51792ff9UL, 0x341e9341UL, 0xdab12653UL, 0xbfd69aebUL,
+    0xe9c6f9b3UL, 0x8ca1450bUL, 0x620ef019UL, 0x07694ca1UL, 0xbe519b3cUL,
+    0xdb362784UL, 0x35999296UL, 0x50fe2e2eUL, 0x99b95426UL, 0xfcdee89eUL,
+    0x12715d8cUL, 0x7716e134UL, 0xce2e36a9UL, 0xab498a11UL, 0x45e63f03UL,
+    0x208183bbUL, 0x7691e0e3UL, 0x13f65c5bUL, 0xfd59e949UL, 0x983e55f1UL,
+    0x2106826cUL, 0x44613ed4UL, 0xaace8bc6UL, 0xcfa9377eUL, 0x38417fd6UL,
+    0x5d26c36eUL, 0xb389767cUL, 0xd6eecac4UL, 0x6fd61d59UL, 0x0ab1a1e1UL,
+    0xe41e14f3UL, 0x8179a84bUL, 0xd769cb13UL, 0xb20e77abUL, 0x5ca1c2b9UL,
+    0x39c67e01UL, 0x80fea99cUL, 0xe5991524UL, 0x0b36a036UL, 0x6e511c8eUL,
+    0xa7166686UL, 0xc271da3eUL, 0x2cde6f2cUL, 0x49b9d394UL, 0xf0810409UL,
+    0x95e6b8b1UL, 0x7b490da3UL, 0x1e2eb11bUL, 0x483ed243UL, 0x2d596efbUL,
+    0xc3f6dbe9UL, 0xa6916751UL, 0x1fa9b0ccUL, 0x7ace0c74UL, 0x9461b966UL,
+    0xf10605deUL
+#endif
+  }
+};
diff --git a/contrib/libs/zlib/deflate.c b/contrib/libs/zlib/deflate.c
index 24ccb3b999..7318b1e2fb 100644
--- a/contrib/libs/zlib/deflate.c
+++ b/contrib/libs/zlib/deflate.c
@@ -1,199 +1,199 @@
-/* deflate.c -- compress data using the deflation algorithm 
+/* deflate.c -- compress data using the deflation algorithm
  * Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */ 
- 
-/* 
- *  ALGORITHM 
- * 
- *      The "deflation" process depends on being able to identify portions 
- *      of the input text which are identical to earlier input (within a 
- *      sliding window trailing behind the input currently being processed). 
- * 
- *      The most straightforward technique turns out to be the fastest for 
- *      most input files: try all possible matches and select the longest. 
- *      The key feature of this algorithm is that insertions into the string 
- *      dictionary are very simple and thus fast, and deletions are avoided 
- *      completely. Insertions are performed at each input character, whereas 
- *      string matches are performed only when the previous match ends. So it 
- *      is preferable to spend more time in matches to allow very fast string 
- *      insertions and avoid deletions. The matching algorithm for small 
- *      strings is inspired from that of Rabin & Karp. A brute force approach 
- *      is used to find longer strings when a small match has been found. 
- *      A similar algorithm is used in comic (by Jan-Mark Wams) and freeze 
- *      (by Leonid Broukhis). 
- *         A previous version of this file used a more sophisticated algorithm 
- *      (by Fiala and Greene) which is guaranteed to run in linear amortized 
- *      time, but has a larger average cost, uses more memory and is patented. 
- *      However the F&G algorithm may be faster for some highly redundant 
- *      files if the parameter max_chain_length (described below) is too large. 
- * 
- *  ACKNOWLEDGEMENTS 
- * 
- *      The idea of lazy evaluation of matches is due to Jan-Mark Wams, and 
- *      I found it in 'freeze' written by Leonid Broukhis. 
- *      Thanks to many people for bug reports and testing. 
- * 
- *  REFERENCES 
- * 
- *      Deutsch, L.P.,"DEFLATE Compressed Data Format Specification". 
- *      Available in http://tools.ietf.org/html/rfc1951 
- * 
- *      A description of the Rabin and Karp algorithm is given in the book 
- *         "Algorithms" by R. Sedgewick, Addison-Wesley, p252. 
- * 
- *      Fiala,E.R., and Greene,D.H. 
- *         Data Compression with Finite Windows, Comm.ACM, 32,4 (1989) 490-595 
- * 
- */ 
- 
-/* @(#) $Id$ */ 
- 
-#include "deflate.h" 
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/*
+ *  ALGORITHM
+ *
+ *      The "deflation" process depends on being able to identify portions
+ *      of the input text which are identical to earlier input (within a
+ *      sliding window trailing behind the input currently being processed).
+ *
+ *      The most straightforward technique turns out to be the fastest for
+ *      most input files: try all possible matches and select the longest.
+ *      The key feature of this algorithm is that insertions into the string
+ *      dictionary are very simple and thus fast, and deletions are avoided
+ *      completely. Insertions are performed at each input character, whereas
+ *      string matches are performed only when the previous match ends. So it
+ *      is preferable to spend more time in matches to allow very fast string
+ *      insertions and avoid deletions. The matching algorithm for small
+ *      strings is inspired from that of Rabin & Karp. A brute force approach
+ *      is used to find longer strings when a small match has been found.
+ *      A similar algorithm is used in comic (by Jan-Mark Wams) and freeze
+ *      (by Leonid Broukhis).
+ *         A previous version of this file used a more sophisticated algorithm
+ *      (by Fiala and Greene) which is guaranteed to run in linear amortized
+ *      time, but has a larger average cost, uses more memory and is patented.
+ *      However the F&G algorithm may be faster for some highly redundant
+ *      files if the parameter max_chain_length (described below) is too large.
+ *
+ *  ACKNOWLEDGEMENTS
+ *
+ *      The idea of lazy evaluation of matches is due to Jan-Mark Wams, and
+ *      I found it in 'freeze' written by Leonid Broukhis.
+ *      Thanks to many people for bug reports and testing.
+ *
+ *  REFERENCES
+ *
+ *      Deutsch, L.P.,"DEFLATE Compressed Data Format Specification".
+ *      Available in http://tools.ietf.org/html/rfc1951
+ *
+ *      A description of the Rabin and Karp algorithm is given in the book
+ *         "Algorithms" by R. Sedgewick, Addison-Wesley, p252.
+ *
+ *      Fiala,E.R., and Greene,D.H.
+ *         Data Compression with Finite Windows, Comm.ACM, 32,4 (1989) 490-595
+ *
+ */
+
+/* @(#) $Id$ */
+
+#include "deflate.h"
 #include <util/system/compiler.h>
- 
-const char deflate_copyright[] = 
+
+const char deflate_copyright[] =
    " deflate 1.2.11 Copyright 1995-2017 Jean-loup Gailly and Mark Adler ";
-/* 
-  If you use the zlib library in a product, an acknowledgment is welcome 
-  in the documentation of your product. If for some reason you cannot 
-  include such an acknowledgment, I would appreciate that you keep this 
-  copyright string in the executable of your product. 
- */ 
- 
-/* =========================================================================== 
- *  Function prototypes. 
- */ 
-typedef enum { 
-    need_more,      /* block not completed, need more input or more output */ 
-    block_done,     /* block flush performed */ 
-    finish_started, /* finish started, need only more output at next deflate */ 
-    finish_done     /* finish done, accept no more input or output */ 
-} block_state; 
- 
-typedef block_state (*compress_func) OF((deflate_state *s, int flush)); 
-/* Compression function. Returns the block state after the call. */ 
- 
+/*
+  If you use the zlib library in a product, an acknowledgment is welcome
+  in the documentation of your product. If for some reason you cannot
+  include such an acknowledgment, I would appreciate that you keep this
+  copyright string in the executable of your product.
+ */
+
+/* ===========================================================================
+ *  Function prototypes.
+ */
+typedef enum {
+    need_more,      /* block not completed, need more input or more output */
+    block_done,     /* block flush performed */
+    finish_started, /* finish started, need only more output at next deflate */
+    finish_done     /* finish done, accept no more input or output */
+} block_state;
+
+typedef block_state (*compress_func) OF((deflate_state *s, int flush));
+/* Compression function. Returns the block state after the call. */
+
 local int deflateStateCheck      OF((z_streamp strm));
 local void slide_hash     OF((deflate_state *s));
-local void fill_window    OF((deflate_state *s)); 
-local block_state deflate_stored OF((deflate_state *s, int flush)); 
-local block_state deflate_fast   OF((deflate_state *s, int flush)); 
-#ifndef FASTEST 
-local block_state deflate_slow   OF((deflate_state *s, int flush)); 
-#endif 
-local block_state deflate_rle    OF((deflate_state *s, int flush)); 
-local block_state deflate_huff   OF((deflate_state *s, int flush)); 
-local void lm_init        OF((deflate_state *s)); 
-local void putShortMSB    OF((deflate_state *s, uInt b)); 
-local void flush_pending  OF((z_streamp strm)); 
+local void fill_window    OF((deflate_state *s));
+local block_state deflate_stored OF((deflate_state *s, int flush));
+local block_state deflate_fast   OF((deflate_state *s, int flush));
+#ifndef FASTEST
+local block_state deflate_slow   OF((deflate_state *s, int flush));
+#endif
+local block_state deflate_rle    OF((deflate_state *s, int flush));
+local block_state deflate_huff   OF((deflate_state *s, int flush));
+local void lm_init        OF((deflate_state *s));
+local void putShortMSB    OF((deflate_state *s, uInt b));
+local void flush_pending  OF((z_streamp strm));
 local unsigned read_buf   OF((z_streamp strm, Bytef *buf, unsigned size));
-#ifdef ASMV 
+#ifdef ASMV
 #  pragma message("Assembler code may have bugs -- use at your own risk")
-      void match_init OF((void)); /* asm code initialization */ 
-      uInt longest_match  OF((deflate_state *s, IPos cur_match)); 
-#else 
-local uInt longest_match  OF((deflate_state *s, IPos cur_match)); 
-#endif 
- 
+      void match_init OF((void)); /* asm code initialization */
+      uInt longest_match  OF((deflate_state *s, IPos cur_match));
+#else
+local uInt longest_match  OF((deflate_state *s, IPos cur_match));
+#endif
+
 #ifdef ZLIB_DEBUG
-local  void check_match OF((deflate_state *s, IPos start, IPos match, 
-                            int length)); 
-#endif 
- 
-/* =========================================================================== 
- * Local data 
- */ 
- 
-#define NIL 0 
-/* Tail of hash chains */ 
- 
-#ifndef TOO_FAR 
-#  define TOO_FAR 4096 
-#endif 
-/* Matches of length 3 are discarded if their distance exceeds TOO_FAR */ 
- 
-/* Values for max_lazy_match, good_match and max_chain_length, depending on 
- * the desired pack level (0..9). The values given below have been tuned to 
- * exclude worst case performance for pathological files. Better values may be 
- * found for specific files. 
- */ 
-typedef struct config_s { 
-   ush good_length; /* reduce lazy search above this match length */ 
-   ush max_lazy;    /* do not perform lazy search above this match length */ 
-   ush nice_length; /* quit search above this match length */ 
-   ush max_chain; 
-   compress_func func; 
-} config; 
- 
-#ifdef FASTEST 
-local const config configuration_table[2] = { 
-/*      good lazy nice chain */ 
-/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */ 
-/* 1 */ {4,    4,  8,    4, deflate_fast}}; /* max speed, no lazy matches */ 
-#else 
-local const config configuration_table[10] = { 
-/*      good lazy nice chain */ 
-/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */ 
-/* 1 */ {4,    4,  8,    4, deflate_fast}, /* max speed, no lazy matches */ 
-/* 2 */ {4,    5, 16,    8, deflate_fast}, 
-/* 3 */ {4,    6, 32,   32, deflate_fast}, 
- 
-/* 4 */ {4,    4, 16,   16, deflate_slow},  /* lazy matches */ 
-/* 5 */ {8,   16, 32,   32, deflate_slow}, 
-/* 6 */ {8,   16, 128, 128, deflate_slow}, 
-/* 7 */ {8,   32, 128, 256, deflate_slow}, 
-/* 8 */ {32, 128, 258, 1024, deflate_slow}, 
-/* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* max compression */ 
-#endif 
- 
-/* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4 
- * For deflate_fast() (levels <= 3) good is ignored and lazy has a different 
- * meaning. 
- */ 
- 
-/* rank Z_BLOCK between Z_NO_FLUSH and Z_PARTIAL_FLUSH */ 
+local  void check_match OF((deflate_state *s, IPos start, IPos match,
+                            int length));
+#endif
+
+/* ===========================================================================
+ * Local data
+ */
+
+#define NIL 0
+/* Tail of hash chains */
+
+#ifndef TOO_FAR
+#  define TOO_FAR 4096
+#endif
+/* Matches of length 3 are discarded if their distance exceeds TOO_FAR */
+
+/* Values for max_lazy_match, good_match and max_chain_length, depending on
+ * the desired pack level (0..9). The values given below have been tuned to
+ * exclude worst case performance for pathological files. Better values may be
+ * found for specific files.
+ */
+typedef struct config_s {
+   ush good_length; /* reduce lazy search above this match length */
+   ush max_lazy;    /* do not perform lazy search above this match length */
+   ush nice_length; /* quit search above this match length */
+   ush max_chain;
+   compress_func func;
+} config;
+
+#ifdef FASTEST
+local const config configuration_table[2] = {
+/*      good lazy nice chain */
+/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */
+/* 1 */ {4,    4,  8,    4, deflate_fast}}; /* max speed, no lazy matches */
+#else
+local const config configuration_table[10] = {
+/*      good lazy nice chain */
+/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */
+/* 1 */ {4,    4,  8,    4, deflate_fast}, /* max speed, no lazy matches */
+/* 2 */ {4,    5, 16,    8, deflate_fast},
+/* 3 */ {4,    6, 32,   32, deflate_fast},
+
+/* 4 */ {4,    4, 16,   16, deflate_slow},  /* lazy matches */
+/* 5 */ {8,   16, 32,   32, deflate_slow},
+/* 6 */ {8,   16, 128, 128, deflate_slow},
+/* 7 */ {8,   32, 128, 256, deflate_slow},
+/* 8 */ {32, 128, 258, 1024, deflate_slow},
+/* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* max compression */
+#endif
+
+/* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4
+ * For deflate_fast() (levels <= 3) good is ignored and lazy has a different
+ * meaning.
+ */
+
+/* rank Z_BLOCK between Z_NO_FLUSH and Z_PARTIAL_FLUSH */
 #define RANK(f) (((f) * 2) - ((f) > 4 ? 9 : 0))
- 
-/* =========================================================================== 
- * Update a hash value with the given input byte 
+
+/* ===========================================================================
+ * Update a hash value with the given input byte
  * IN  assertion: all calls to UPDATE_HASH are made with consecutive input
  *    characters, so that a running hash key can be computed from the previous
  *    key instead of complete recalculation each time.
- */ 
-#define UPDATE_HASH(s,h,c) (h = (((h)<<s->hash_shift) ^ (c)) & s->hash_mask) 
- 
- 
-/* =========================================================================== 
- * Insert string str in the dictionary and set match_head to the previous head 
- * of the hash chain (the most recent string with same hash key). Return 
- * the previous length of the hash chain. 
- * If this file is compiled with -DFASTEST, the compression level is forced 
- * to 1, and no hash chains are maintained. 
+ */
+#define UPDATE_HASH(s,h,c) (h = (((h)<<s->hash_shift) ^ (c)) & s->hash_mask)
+
+
+/* ===========================================================================
+ * Insert string str in the dictionary and set match_head to the previous head
+ * of the hash chain (the most recent string with same hash key). Return
+ * the previous length of the hash chain.
+ * If this file is compiled with -DFASTEST, the compression level is forced
+ * to 1, and no hash chains are maintained.
  * IN  assertion: all calls to INSERT_STRING are made with consecutive input
  *    characters and the first MIN_MATCH bytes of str are valid (except for
  *    the last MIN_MATCH-1 bytes of the input file).
- */ 
-#ifdef FASTEST 
-#define INSERT_STRING(s, str, match_head) \ 
-   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \ 
-    match_head = s->head[s->ins_h], \ 
-    s->head[s->ins_h] = (Pos)(str)) 
-#else 
-#define INSERT_STRING(s, str, match_head) \ 
-   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \ 
-    match_head = s->prev[(str) & s->w_mask] = s->head[s->ins_h], \ 
-    s->head[s->ins_h] = (Pos)(str)) 
-#endif 
- 
-/* =========================================================================== 
- * Initialize the hash table (avoiding 64K overflow for 16 bit systems). 
- * prev[] will be initialized on the fly. 
- */ 
-#define CLEAR_HASH(s) \ 
-    s->head[s->hash_size-1] = NIL; \ 
-    zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head)); 
- 
+ */
+#ifdef FASTEST
+#define INSERT_STRING(s, str, match_head) \
+   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
+    match_head = s->head[s->ins_h], \
+    s->head[s->ins_h] = (Pos)(str))
+#else
+#define INSERT_STRING(s, str, match_head) \
+   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
+    match_head = s->prev[(str) & s->w_mask] = s->head[s->ins_h], \
+    s->head[s->ins_h] = (Pos)(str))
+#endif
+
+/* ===========================================================================
+ * Initialize the hash table (avoiding 64K overflow for 16 bit systems).
+ * prev[] will be initialized on the fly.
+ */
+#define CLEAR_HASH(s) \
+    s->head[s->hash_size-1] = NIL; \
+    zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));
+
 /* ===========================================================================
  * Slide the hash table when sliding the window down (could be avoided with 32
  * bit values at the expense of memory usage). We slide even when level == 0 to
@@ -225,131 +225,131 @@ local void slide_hash(s)
 #endif
 }
 
-/* ========================================================================= */ 
-int ZEXPORT deflateInit_(strm, level, version, stream_size) 
-    z_streamp strm; 
-    int level; 
-    const char *version; 
-    int stream_size; 
-{ 
-    return deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL, 
-                         Z_DEFAULT_STRATEGY, version, stream_size); 
-    /* To do: ignore strm->next_in if we use it as window */ 
-} 
- 
-/* ========================================================================= */ 
-int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, 
-                  version, stream_size) 
-    z_streamp strm; 
-    int  level; 
-    int  method; 
-    int  windowBits; 
-    int  memLevel; 
-    int  strategy; 
-    const char *version; 
-    int stream_size; 
-{ 
-    deflate_state *s; 
-    int wrap = 1; 
-    static const char my_version[] = ZLIB_VERSION; 
- 
-    ushf *overlay; 
-    /* We overlay pending_buf and d_buf+l_buf. This works since the average 
-     * output size for (length,distance) codes is <= 24 bits. 
-     */ 
- 
-    if (version == Z_NULL || version[0] != my_version[0] || 
-        stream_size != sizeof(z_stream)) { 
-        return Z_VERSION_ERROR; 
-    } 
-    if (strm == Z_NULL) return Z_STREAM_ERROR; 
- 
-    strm->msg = Z_NULL; 
-    if (strm->zalloc == (alloc_func)0) { 
-#ifdef Z_SOLO 
-        return Z_STREAM_ERROR; 
-#else 
-        strm->zalloc = zcalloc; 
-        strm->opaque = (voidpf)0; 
-#endif 
-    } 
-    if (strm->zfree == (free_func)0) 
-#ifdef Z_SOLO 
-        return Z_STREAM_ERROR; 
-#else 
-        strm->zfree = zcfree; 
-#endif 
- 
-#ifdef FASTEST 
-    if (level != 0) level = 1; 
-#else 
-    if (level == Z_DEFAULT_COMPRESSION) level = 6; 
-#endif 
- 
-    if (windowBits < 0) { /* suppress zlib wrapper */ 
-        wrap = 0; 
-        windowBits = -windowBits; 
-    } 
-#ifdef GZIP 
-    else if (windowBits > 15) { 
-        wrap = 2;       /* write gzip wrapper instead */ 
-        windowBits -= 16; 
-    } 
-#endif 
-    if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED || 
-        windowBits < 8 || windowBits > 15 || level < 0 || level > 9 || 
+/* ========================================================================= */
+int ZEXPORT deflateInit_(strm, level, version, stream_size)
+    z_streamp strm;
+    int level;
+    const char *version;
+    int stream_size;
+{
+    return deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL,
+                         Z_DEFAULT_STRATEGY, version, stream_size);
+    /* To do: ignore strm->next_in if we use it as window */
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
+                  version, stream_size)
+    z_streamp strm;
+    int  level;
+    int  method;
+    int  windowBits;
+    int  memLevel;
+    int  strategy;
+    const char *version;
+    int stream_size;
+{
+    deflate_state *s;
+    int wrap = 1;
+    static const char my_version[] = ZLIB_VERSION;
+
+    ushf *overlay;
+    /* We overlay pending_buf and d_buf+l_buf. This works since the average
+     * output size for (length,distance) codes is <= 24 bits.
+     */
+
+    if (version == Z_NULL || version[0] != my_version[0] ||
+        stream_size != sizeof(z_stream)) {
+        return Z_VERSION_ERROR;
+    }
+    if (strm == Z_NULL) return Z_STREAM_ERROR;
+
+    strm->msg = Z_NULL;
+    if (strm->zalloc == (alloc_func)0) {
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
+        strm->zalloc = zcalloc;
+        strm->opaque = (voidpf)0;
+#endif
+    }
+    if (strm->zfree == (free_func)0)
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
+        strm->zfree = zcfree;
+#endif
+
+#ifdef FASTEST
+    if (level != 0) level = 1;
+#else
+    if (level == Z_DEFAULT_COMPRESSION) level = 6;
+#endif
+
+    if (windowBits < 0) { /* suppress zlib wrapper */
+        wrap = 0;
+        windowBits = -windowBits;
+    }
+#ifdef GZIP
+    else if (windowBits > 15) {
+        wrap = 2;       /* write gzip wrapper instead */
+        windowBits -= 16;
+    }
+#endif
+    if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED ||
+        windowBits < 8 || windowBits > 15 || level < 0 || level > 9 ||
         strategy < 0 || strategy > Z_FIXED || (windowBits == 8 && wrap != 1)) {
-        return Z_STREAM_ERROR; 
-    } 
-    if (windowBits == 8) windowBits = 9;  /* until 256-byte window bug fixed */ 
-    s = (deflate_state *) ZALLOC(strm, 1, sizeof(deflate_state)); 
-    if (s == Z_NULL) return Z_MEM_ERROR; 
-    strm->state = (struct internal_state FAR *)s; 
-    s->strm = strm; 
+        return Z_STREAM_ERROR;
+    }
+    if (windowBits == 8) windowBits = 9;  /* until 256-byte window bug fixed */
+    s = (deflate_state *) ZALLOC(strm, 1, sizeof(deflate_state));
+    if (s == Z_NULL) return Z_MEM_ERROR;
+    strm->state = (struct internal_state FAR *)s;
+    s->strm = strm;
     s->status = INIT_STATE;     /* to pass state test in deflateReset() */
- 
-    s->wrap = wrap; 
-    s->gzhead = Z_NULL; 
+
+    s->wrap = wrap;
+    s->gzhead = Z_NULL;
     s->w_bits = (uInt)windowBits;
-    s->w_size = 1 << s->w_bits; 
-    s->w_mask = s->w_size - 1; 
- 
+    s->w_size = 1 << s->w_bits;
+    s->w_mask = s->w_size - 1;
+
     s->hash_bits = (uInt)memLevel + 7;
-    s->hash_size = 1 << s->hash_bits; 
-    s->hash_mask = s->hash_size - 1; 
-    s->hash_shift =  ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH); 
- 
-    s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte)); 
-    memset(s->window, 0, s->w_size * 2*sizeof(Byte)); 
-    s->prev   = (Posf *)  ZALLOC(strm, s->w_size, sizeof(Pos)); 
-    memset(s->prev, 0, s->w_size * sizeof(Pos)); 
-    s->head   = (Posf *)  ZALLOC(strm, s->hash_size, sizeof(Pos)); 
- 
-    s->high_water = 0;      /* nothing written to s->window yet */ 
- 
-    s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */ 
- 
-    overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2); 
-    s->pending_buf = (uchf *) overlay; 
-    s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L); 
- 
-    if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL || 
-        s->pending_buf == Z_NULL) { 
-        s->status = FINISH_STATE; 
-        strm->msg = ERR_MSG(Z_MEM_ERROR); 
-        deflateEnd (strm); 
-        return Z_MEM_ERROR; 
-    } 
-    s->d_buf = overlay + s->lit_bufsize/sizeof(ush); 
-    s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize; 
- 
-    s->level = level; 
-    s->strategy = strategy; 
-    s->method = (Byte)method; 
- 
-    return deflateReset(strm); 
-} 
- 
+    s->hash_size = 1 << s->hash_bits;
+    s->hash_mask = s->hash_size - 1;
+    s->hash_shift =  ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH);
+
+    s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte));
+    memset(s->window, 0, s->w_size * 2*sizeof(Byte));
+    s->prev   = (Posf *)  ZALLOC(strm, s->w_size, sizeof(Pos));
+    memset(s->prev, 0, s->w_size * sizeof(Pos));
+    s->head   = (Posf *)  ZALLOC(strm, s->hash_size, sizeof(Pos));
+
+    s->high_water = 0;      /* nothing written to s->window yet */
+
+    s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */
+
+    overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2);
+    s->pending_buf = (uchf *) overlay;
+    s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L);
+
+    if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
+        s->pending_buf == Z_NULL) {
+        s->status = FINISH_STATE;
+        strm->msg = ERR_MSG(Z_MEM_ERROR);
+        deflateEnd (strm);
+        return Z_MEM_ERROR;
+    }
+    s->d_buf = overlay + s->lit_bufsize/sizeof(ush);
+    s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize;
+
+    s->level = level;
+    s->strategy = strategy;
+    s->method = (Byte)method;
+
+    return deflateReset(strm);
+}
+
 /* =========================================================================
  * Check for a valid deflate stream state. Return 0 if ok, 1 if not.
  */
@@ -375,76 +375,76 @@ local int deflateStateCheck (strm)
     return 0;
 }
 
-/* ========================================================================= */ 
-int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength) 
-    z_streamp strm; 
-    const Bytef *dictionary; 
-    uInt  dictLength; 
-{ 
-    deflate_state *s; 
-    uInt str, n; 
-    int wrap; 
-    unsigned avail; 
-    z_const unsigned char *next; 
- 
+/* ========================================================================= */
+int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
+    z_streamp strm;
+    const Bytef *dictionary;
+    uInt  dictLength;
+{
+    deflate_state *s;
+    uInt str, n;
+    int wrap;
+    unsigned avail;
+    z_const unsigned char *next;
+
     if (deflateStateCheck(strm) || dictionary == Z_NULL)
-        return Z_STREAM_ERROR; 
-    s = strm->state; 
-    wrap = s->wrap; 
-    if (wrap == 2 || (wrap == 1 && s->status != INIT_STATE) || s->lookahead) 
-        return Z_STREAM_ERROR; 
- 
-    /* when using zlib wrappers, compute Adler-32 for provided dictionary */ 
-    if (wrap == 1) 
-        strm->adler = adler32(strm->adler, dictionary, dictLength); 
-    s->wrap = 0;                    /* avoid computing Adler-32 in read_buf */ 
- 
-    /* if dictionary would fill window, just replace the history */ 
-    if (dictLength >= s->w_size) { 
-        if (wrap == 0) {            /* already empty otherwise */ 
-            CLEAR_HASH(s); 
-            s->strstart = 0; 
-            s->block_start = 0L; 
-            s->insert = 0; 
-        } 
-        dictionary += dictLength - s->w_size;  /* use the tail */ 
-        dictLength = s->w_size; 
-    } 
- 
-    /* insert dictionary into window and hash */ 
-    avail = strm->avail_in; 
-    next = strm->next_in; 
-    strm->avail_in = dictLength; 
-    strm->next_in = (z_const Bytef *)dictionary; 
-    fill_window(s); 
-    while (s->lookahead >= MIN_MATCH) { 
-        str = s->strstart; 
-        n = s->lookahead - (MIN_MATCH-1); 
-        do { 
-            UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]); 
-#ifndef FASTEST 
-            s->prev[str & s->w_mask] = s->head[s->ins_h]; 
-#endif 
-            s->head[s->ins_h] = (Pos)str; 
-            str++; 
-        } while (--n); 
-        s->strstart = str; 
-        s->lookahead = MIN_MATCH-1; 
-        fill_window(s); 
-    } 
-    s->strstart += s->lookahead; 
-    s->block_start = (long)s->strstart; 
-    s->insert = s->lookahead; 
-    s->lookahead = 0; 
-    s->match_length = s->prev_length = MIN_MATCH-1; 
-    s->match_available = 0; 
-    strm->next_in = next; 
-    strm->avail_in = avail; 
-    s->wrap = wrap; 
-    return Z_OK; 
-} 
- 
-/* ========================================================================= */ 
+        return Z_STREAM_ERROR;
+    s = strm->state;
+    wrap = s->wrap;
+    if (wrap == 2 || (wrap == 1 && s->status != INIT_STATE) || s->lookahead)
+        return Z_STREAM_ERROR;
+
+    /* when using zlib wrappers, compute Adler-32 for provided dictionary */
+    if (wrap == 1)
+        strm->adler = adler32(strm->adler, dictionary, dictLength);
+    s->wrap = 0;                    /* avoid computing Adler-32 in read_buf */
+
+    /* if dictionary would fill window, just replace the history */
+    if (dictLength >= s->w_size) {
+        if (wrap == 0) {            /* already empty otherwise */
+            CLEAR_HASH(s);
+            s->strstart = 0;
+            s->block_start = 0L;
+            s->insert = 0;
+        }
+        dictionary += dictLength - s->w_size;  /* use the tail */
+        dictLength = s->w_size;
+    }
+
+    /* insert dictionary into window and hash */
+    avail = strm->avail_in;
+    next = strm->next_in;
+    strm->avail_in = dictLength;
+    strm->next_in = (z_const Bytef *)dictionary;
+    fill_window(s);
+    while (s->lookahead >= MIN_MATCH) {
+        str = s->strstart;
+        n = s->lookahead - (MIN_MATCH-1);
+        do {
+            UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]);
+#ifndef FASTEST
+            s->prev[str & s->w_mask] = s->head[s->ins_h];
+#endif
+            s->head[s->ins_h] = (Pos)str;
+            str++;
+        } while (--n);
+        s->strstart = str;
+        s->lookahead = MIN_MATCH-1;
+        fill_window(s);
+    }
+    s->strstart += s->lookahead;
+    s->block_start = (long)s->strstart;
+    s->insert = s->lookahead;
+    s->lookahead = 0;
+    s->match_length = s->prev_length = MIN_MATCH-1;
+    s->match_available = 0;
+    strm->next_in = next;
+    strm->avail_in = avail;
+    s->wrap = wrap;
+    return Z_OK;
+}
+
+/* ========================================================================= */
 int ZEXPORT deflateGetDictionary (strm, dictionary, dictLength)
     z_streamp strm;
     Bytef *dictionary;
@@ -467,138 +467,138 @@ int ZEXPORT deflateGetDictionary (strm, dictionary, dictLength)
 }
 
 /* ========================================================================= */
-int ZEXPORT deflateResetKeep (strm) 
-    z_streamp strm; 
-{ 
-    deflate_state *s; 
- 
+int ZEXPORT deflateResetKeep (strm)
+    z_streamp strm;
+{
+    deflate_state *s;
+
     if (deflateStateCheck(strm)) {
-        return Z_STREAM_ERROR; 
-    } 
- 
-    strm->total_in = strm->total_out = 0; 
-    strm->msg = Z_NULL; /* use zfree if we ever allocate msg dynamically */ 
-    strm->data_type = Z_UNKNOWN; 
- 
-    s = (deflate_state *)strm->state; 
-    s->pending = 0; 
-    s->pending_out = s->pending_buf; 
- 
-    if (s->wrap < 0) { 
-        s->wrap = -s->wrap; /* was made negative by deflate(..., Z_FINISH); */ 
-    } 
+        return Z_STREAM_ERROR;
+    }
+
+    strm->total_in = strm->total_out = 0;
+    strm->msg = Z_NULL; /* use zfree if we ever allocate msg dynamically */
+    strm->data_type = Z_UNKNOWN;
+
+    s = (deflate_state *)strm->state;
+    s->pending = 0;
+    s->pending_out = s->pending_buf;
+
+    if (s->wrap < 0) {
+        s->wrap = -s->wrap; /* was made negative by deflate(..., Z_FINISH); */
+    }
     s->status =
 #ifdef GZIP
         s->wrap == 2 ? GZIP_STATE :
 #endif
         s->wrap ? INIT_STATE : BUSY_STATE;
-    strm->adler = 
-#ifdef GZIP 
-        s->wrap == 2 ? crc32(0L, Z_NULL, 0) : 
-#endif 
-        adler32(0L, Z_NULL, 0); 
-    s->last_flush = Z_NO_FLUSH; 
- 
-    _tr_init(s); 
- 
-    return Z_OK; 
-} 
- 
-/* ========================================================================= */ 
-int ZEXPORT deflateReset (strm) 
-    z_streamp strm; 
-{ 
-    int ret; 
- 
-    ret = deflateResetKeep(strm); 
-    if (ret == Z_OK) 
-        lm_init(strm->state); 
-    return ret; 
-} 
- 
-/* ========================================================================= */ 
-int ZEXPORT deflateSetHeader (strm, head) 
-    z_streamp strm; 
-    gz_headerp head; 
-{ 
+    strm->adler =
+#ifdef GZIP
+        s->wrap == 2 ? crc32(0L, Z_NULL, 0) :
+#endif
+        adler32(0L, Z_NULL, 0);
+    s->last_flush = Z_NO_FLUSH;
+
+    _tr_init(s);
+
+    return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateReset (strm)
+    z_streamp strm;
+{
+    int ret;
+
+    ret = deflateResetKeep(strm);
+    if (ret == Z_OK)
+        lm_init(strm->state);
+    return ret;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateSetHeader (strm, head)
+    z_streamp strm;
+    gz_headerp head;
+{
     if (deflateStateCheck(strm) || strm->state->wrap != 2)
         return Z_STREAM_ERROR;
-    strm->state->gzhead = head; 
-    return Z_OK; 
-} 
- 
-/* ========================================================================= */ 
-int ZEXPORT deflatePending (strm, pending, bits) 
-    unsigned *pending; 
-    int *bits; 
-    z_streamp strm; 
-{ 
+    strm->state->gzhead = head;
+    return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflatePending (strm, pending, bits)
+    unsigned *pending;
+    int *bits;
+    z_streamp strm;
+{
     if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
-    if (pending != Z_NULL) 
-        *pending = strm->state->pending; 
-    if (bits != Z_NULL) 
-        *bits = strm->state->bi_valid; 
-    return Z_OK; 
-} 
- 
-/* ========================================================================= */ 
-int ZEXPORT deflatePrime (strm, bits, value) 
-    z_streamp strm; 
-    int bits; 
-    int value; 
-{ 
-    deflate_state *s; 
-    int put; 
- 
+    if (pending != Z_NULL)
+        *pending = strm->state->pending;
+    if (bits != Z_NULL)
+        *bits = strm->state->bi_valid;
+    return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflatePrime (strm, bits, value)
+    z_streamp strm;
+    int bits;
+    int value;
+{
+    deflate_state *s;
+    int put;
+
     if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
-    s = strm->state; 
-    if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3)) 
-        return Z_BUF_ERROR; 
-    do { 
-        put = Buf_size - s->bi_valid; 
-        if (put > bits) 
-            put = bits; 
-        s->bi_buf |= (ush)((value & ((1 << put) - 1)) << s->bi_valid); 
-        s->bi_valid += put; 
-        _tr_flush_bits(s); 
-        value >>= put; 
-        bits -= put; 
-    } while (bits); 
-    return Z_OK; 
-} 
- 
-/* ========================================================================= */ 
-int ZEXPORT deflateParams(strm, level, strategy) 
-    z_streamp strm; 
-    int level; 
-    int strategy; 
-{ 
-    deflate_state *s; 
-    compress_func func; 
- 
+    s = strm->state;
+    if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3))
+        return Z_BUF_ERROR;
+    do {
+        put = Buf_size - s->bi_valid;
+        if (put > bits)
+            put = bits;
+        s->bi_buf |= (ush)((value & ((1 << put) - 1)) << s->bi_valid);
+        s->bi_valid += put;
+        _tr_flush_bits(s);
+        value >>= put;
+        bits -= put;
+    } while (bits);
+    return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateParams(strm, level, strategy)
+    z_streamp strm;
+    int level;
+    int strategy;
+{
+    deflate_state *s;
+    compress_func func;
+
     if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
-    s = strm->state; 
- 
-#ifdef FASTEST 
-    if (level != 0) level = 1; 
-#else 
-    if (level == Z_DEFAULT_COMPRESSION) level = 6; 
-#endif 
-    if (level < 0 || level > 9 || strategy < 0 || strategy > Z_FIXED) { 
-        return Z_STREAM_ERROR; 
-    } 
-    func = configuration_table[s->level].func; 
- 
-    if ((strategy != s->strategy || func != configuration_table[level].func) && 
+    s = strm->state;
+
+#ifdef FASTEST
+    if (level != 0) level = 1;
+#else
+    if (level == Z_DEFAULT_COMPRESSION) level = 6;
+#endif
+    if (level < 0 || level > 9 || strategy < 0 || strategy > Z_FIXED) {
+        return Z_STREAM_ERROR;
+    }
+    func = configuration_table[s->level].func;
+
+    if ((strategy != s->strategy || func != configuration_table[level].func) &&
         s->high_water) {
-        /* Flush the last buffer: */ 
+        /* Flush the last buffer: */
         int err = deflate(strm, Z_BLOCK);
         if (err == Z_STREAM_ERROR)
             return err;
         if (strm->avail_out == 0)
             return Z_BUF_ERROR;
-    } 
-    if (s->level != level) { 
+    }
+    if (s->level != level) {
         if (s->level == 0 && s->matches != 0) {
             if (s->matches == 1)
                 slide_hash(s);
@@ -606,152 +606,152 @@ int ZEXPORT deflateParams(strm, level, strategy)
                 CLEAR_HASH(s);
             s->matches = 0;
         }
-        s->level = level; 
-        s->max_lazy_match   = configuration_table[level].max_lazy; 
-        s->good_match       = configuration_table[level].good_length; 
-        s->nice_match       = configuration_table[level].nice_length; 
-        s->max_chain_length = configuration_table[level].max_chain; 
-    } 
-    s->strategy = strategy; 
+        s->level = level;
+        s->max_lazy_match   = configuration_table[level].max_lazy;
+        s->good_match       = configuration_table[level].good_length;
+        s->nice_match       = configuration_table[level].nice_length;
+        s->max_chain_length = configuration_table[level].max_chain;
+    }
+    s->strategy = strategy;
     return Z_OK;
-} 
- 
-/* ========================================================================= */ 
-int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain) 
-    z_streamp strm; 
-    int good_length; 
-    int max_lazy; 
-    int nice_length; 
-    int max_chain; 
-{ 
-    deflate_state *s; 
- 
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain)
+    z_streamp strm;
+    int good_length;
+    int max_lazy;
+    int nice_length;
+    int max_chain;
+{
+    deflate_state *s;
+
     if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
-    s = strm->state; 
+    s = strm->state;
     s->good_match = (uInt)good_length;
     s->max_lazy_match = (uInt)max_lazy;
-    s->nice_match = nice_length; 
+    s->nice_match = nice_length;
     s->max_chain_length = (uInt)max_chain;
-    return Z_OK; 
-} 
- 
-/* ========================================================================= 
- * For the default windowBits of 15 and memLevel of 8, this function returns 
- * a close to exact, as well as small, upper bound on the compressed size. 
- * They are coded as constants here for a reason--if the #define's are 
- * changed, then this function needs to be changed as well.  The return 
- * value for 15 and 8 only works for those exact settings. 
- * 
- * For any setting other than those defaults for windowBits and memLevel, 
- * the value returned is a conservative worst case for the maximum expansion 
- * resulting from using fixed blocks instead of stored blocks, which deflate 
- * can emit on compressed data for some combinations of the parameters. 
- * 
- * This function could be more sophisticated to provide closer upper bounds for 
- * every combination of windowBits and memLevel.  But even the conservative 
- * upper bound of about 14% expansion does not seem onerous for output buffer 
- * allocation. 
- */ 
-uLong ZEXPORT deflateBound(strm, sourceLen) 
-    z_streamp strm; 
-    uLong sourceLen; 
-{ 
-    deflate_state *s; 
-    uLong complen, wraplen; 
- 
-    /* conservative upper bound for compressed data */ 
-    complen = sourceLen + 
-              ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 5; 
- 
-    /* if can't get parameters, return conservative bound plus zlib wrapper */ 
+    return Z_OK;
+}
+
+/* =========================================================================
+ * For the default windowBits of 15 and memLevel of 8, this function returns
+ * a close to exact, as well as small, upper bound on the compressed size.
+ * They are coded as constants here for a reason--if the #define's are
+ * changed, then this function needs to be changed as well.  The return
+ * value for 15 and 8 only works for those exact settings.
+ *
+ * For any setting other than those defaults for windowBits and memLevel,
+ * the value returned is a conservative worst case for the maximum expansion
+ * resulting from using fixed blocks instead of stored blocks, which deflate
+ * can emit on compressed data for some combinations of the parameters.
+ *
+ * This function could be more sophisticated to provide closer upper bounds for
+ * every combination of windowBits and memLevel.  But even the conservative
+ * upper bound of about 14% expansion does not seem onerous for output buffer
+ * allocation.
+ */
+uLong ZEXPORT deflateBound(strm, sourceLen)
+    z_streamp strm;
+    uLong sourceLen;
+{
+    deflate_state *s;
+    uLong complen, wraplen;
+
+    /* conservative upper bound for compressed data */
+    complen = sourceLen +
+              ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 5;
+
+    /* if can't get parameters, return conservative bound plus zlib wrapper */
     if (deflateStateCheck(strm))
-        return complen + 6; 
- 
-    /* compute wrapper length */ 
-    s = strm->state; 
-    switch (s->wrap) { 
-    case 0:                                 /* raw deflate */ 
-        wraplen = 0; 
-        break; 
-    case 1:                                 /* zlib wrapper */ 
-        wraplen = 6 + (s->strstart ? 4 : 0); 
-        break; 
+        return complen + 6;
+
+    /* compute wrapper length */
+    s = strm->state;
+    switch (s->wrap) {
+    case 0:                                 /* raw deflate */
+        wraplen = 0;
+        break;
+    case 1:                                 /* zlib wrapper */
+        wraplen = 6 + (s->strstart ? 4 : 0);
+        break;
 #ifdef GZIP
-    case 2:                                 /* gzip wrapper */ 
-        wraplen = 18; 
-        if (s->gzhead != Z_NULL) {          /* user-supplied gzip header */ 
+    case 2:                                 /* gzip wrapper */
+        wraplen = 18;
+        if (s->gzhead != Z_NULL) {          /* user-supplied gzip header */
             Bytef *str;
-            if (s->gzhead->extra != Z_NULL) 
-                wraplen += 2 + s->gzhead->extra_len; 
-            str = s->gzhead->name; 
-            if (str != Z_NULL) 
-                do { 
-                    wraplen++; 
-                } while (*str++); 
-            str = s->gzhead->comment; 
-            if (str != Z_NULL) 
-                do { 
-                    wraplen++; 
-                } while (*str++); 
-            if (s->gzhead->hcrc) 
-                wraplen += 2; 
-        } 
-        break; 
+            if (s->gzhead->extra != Z_NULL)
+                wraplen += 2 + s->gzhead->extra_len;
+            str = s->gzhead->name;
+            if (str != Z_NULL)
+                do {
+                    wraplen++;
+                } while (*str++);
+            str = s->gzhead->comment;
+            if (str != Z_NULL)
+                do {
+                    wraplen++;
+                } while (*str++);
+            if (s->gzhead->hcrc)
+                wraplen += 2;
+        }
+        break;
 #endif
-    default:                                /* for compiler happiness */ 
-        wraplen = 6; 
-    } 
- 
-    /* if not default parameters, return conservative bound */ 
-    if (s->w_bits != 15 || s->hash_bits != 8 + 7) 
-        return complen + wraplen; 
- 
-    /* default settings: return tight bound for that case */ 
-    return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + 
-           (sourceLen >> 25) + 13 - 6 + wraplen; 
-} 
- 
-/* ========================================================================= 
- * Put a short in the pending buffer. The 16-bit value is put in MSB order. 
- * IN assertion: the stream state is correct and there is enough room in 
- * pending_buf. 
- */ 
-local void putShortMSB (s, b) 
-    deflate_state *s; 
-    uInt b; 
-{ 
-    put_byte(s, (Byte)(b >> 8)); 
-    put_byte(s, (Byte)(b & 0xff)); 
-} 
- 
-/* ========================================================================= 
+    default:                                /* for compiler happiness */
+        wraplen = 6;
+    }
+
+    /* if not default parameters, return conservative bound */
+    if (s->w_bits != 15 || s->hash_bits != 8 + 7)
+        return complen + wraplen;
+
+    /* default settings: return tight bound for that case */
+    return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
+           (sourceLen >> 25) + 13 - 6 + wraplen;
+}
+
+/* =========================================================================
+ * Put a short in the pending buffer. The 16-bit value is put in MSB order.
+ * IN assertion: the stream state is correct and there is enough room in
+ * pending_buf.
+ */
+local void putShortMSB (s, b)
+    deflate_state *s;
+    uInt b;
+{
+    put_byte(s, (Byte)(b >> 8));
+    put_byte(s, (Byte)(b & 0xff));
+}
+
+/* =========================================================================
  * Flush as much pending output as possible. All deflate() output, except for
  * some deflate_stored() output, goes through this function so some
  * applications may wish to modify it to avoid allocating a large
  * strm->next_out buffer and copying into it. (See also read_buf()).
- */ 
-local void flush_pending(strm) 
-    z_streamp strm; 
-{ 
-    unsigned len; 
-    deflate_state *s = strm->state; 
- 
-    _tr_flush_bits(s); 
-    len = s->pending; 
-    if (len > strm->avail_out) len = strm->avail_out; 
-    if (len == 0) return; 
- 
-    zmemcpy(strm->next_out, s->pending_out, len); 
-    strm->next_out  += len; 
-    s->pending_out  += len; 
-    strm->total_out += len; 
+ */
+local void flush_pending(strm)
+    z_streamp strm;
+{
+    unsigned len;
+    deflate_state *s = strm->state;
+
+    _tr_flush_bits(s);
+    len = s->pending;
+    if (len > strm->avail_out) len = strm->avail_out;
+    if (len == 0) return;
+
+    zmemcpy(strm->next_out, s->pending_out, len);
+    strm->next_out  += len;
+    s->pending_out  += len;
+    strm->total_out += len;
     strm->avail_out -= len;
     s->pending      -= len;
-    if (s->pending == 0) { 
-        s->pending_out = s->pending_buf; 
-    } 
-} 
- 
+    if (s->pending == 0) {
+        s->pending_out = s->pending_buf;
+    }
+}
+
 /* ===========================================================================
  * Update the header CRC with the bytes s->pending_buf[beg..s->pending - 1].
  */
@@ -762,29 +762,29 @@ local void flush_pending(strm)
                                 s->pending - (beg)); \
     } while (0)
 
-/* ========================================================================= */ 
-int ZEXPORT deflate (strm, flush) 
-    z_streamp strm; 
-    int flush; 
-{ 
-    int old_flush; /* value of flush param for previous deflate call */ 
-    deflate_state *s; 
- 
+/* ========================================================================= */
+int ZEXPORT deflate (strm, flush)
+    z_streamp strm;
+    int flush;
+{
+    int old_flush; /* value of flush param for previous deflate call */
+    deflate_state *s;
+
     if (deflateStateCheck(strm) || flush > Z_BLOCK || flush < 0) {
-        return Z_STREAM_ERROR; 
-    } 
-    s = strm->state; 
- 
-    if (strm->next_out == Z_NULL || 
+        return Z_STREAM_ERROR;
+    }
+    s = strm->state;
+
+    if (strm->next_out == Z_NULL ||
         (strm->avail_in != 0 && strm->next_in == Z_NULL) ||
-        (s->status == FINISH_STATE && flush != Z_FINISH)) { 
-        ERR_RETURN(strm, Z_STREAM_ERROR); 
-    } 
-    if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR); 
- 
-    old_flush = s->last_flush; 
-    s->last_flush = flush; 
- 
+        (s->status == FINISH_STATE && flush != Z_FINISH)) {
+        ERR_RETURN(strm, Z_STREAM_ERROR);
+    }
+    if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR);
+
+    old_flush = s->last_flush;
+    s->last_flush = flush;
+
     /* Flush as much pending output as possible */
     if (s->pending != 0) {
         flush_pending(strm);
@@ -813,8 +813,8 @@ int ZEXPORT deflate (strm, flush)
         ERR_RETURN(strm, Z_BUF_ERROR);
     }
 
-    /* Write the header */ 
-    if (s->status == INIT_STATE) { 
+    /* Write the header */
+    if (s->status == INIT_STATE) {
         /* zlib header */
         uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8;
         uInt level_flags;
@@ -825,14 +825,14 @@ int ZEXPORT deflate (strm, flush)
             level_flags = 1;
         else if (s->level == 6)
             level_flags = 2;
-        else 
+        else
             level_flags = 3;
         header |= (level_flags << 6);
         if (s->strstart != 0) header |= PRESET_DICT;
         header += 31 - (header % 31);
- 
+
         putShortMSB(s, header);
- 
+
         /* Save the adler32 of the preset dictionary: */
         if (s->strstart != 0) {
             putShortMSB(s, (uInt)(strm->adler >> 16));
@@ -865,15 +865,15 @@ int ZEXPORT deflate (strm, flush)
                      (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
                       4 : 0));
             put_byte(s, OS_CODE);
-            s->status = BUSY_STATE; 
- 
+            s->status = BUSY_STATE;
+
             /* Compression must start with an empty pending buffer */
             flush_pending(strm);
             if (s->pending != 0) {
                 s->last_flush = -1;
                 return Z_OK;
-            } 
-        } 
+            }
+        }
         else {
             put_byte(s, (s->gzhead->text ? 1 : 0) +
                      (s->gzhead->hcrc ? 2 : 0) +
@@ -899,9 +899,9 @@ int ZEXPORT deflate (strm, flush)
             s->gzindex = 0;
             s->status = EXTRA_STATE;
         }
-    } 
-    if (s->status == EXTRA_STATE) { 
-        if (s->gzhead->extra != Z_NULL) { 
+    }
+    if (s->status == EXTRA_STATE) {
+        if (s->gzhead->extra != Z_NULL) {
             ulg beg = s->pending;   /* start of bytes to update crc */
             uInt left = (s->gzhead->extra_len & 0xffff) - s->gzindex;
             while (s->pending + left > s->pending_buf_size) {
@@ -915,722 +915,722 @@ int ZEXPORT deflate (strm, flush)
                 if (s->pending != 0) {
                     s->last_flush = -1;
                     return Z_OK;
-                } 
+                }
                 beg = 0;
                 left -= copy;
-            } 
+            }
             zmemcpy(s->pending_buf + s->pending,
                     s->gzhead->extra + s->gzindex, left);
             s->pending += left;
             HCRC_UPDATE(beg);
             s->gzindex = 0;
-        } 
+        }
         s->status = NAME_STATE;
-    } 
-    if (s->status == NAME_STATE) { 
-        if (s->gzhead->name != Z_NULL) { 
+    }
+    if (s->status == NAME_STATE) {
+        if (s->gzhead->name != Z_NULL) {
             ulg beg = s->pending;   /* start of bytes to update crc */
-            int val; 
-            do { 
-                if (s->pending == s->pending_buf_size) { 
+            int val;
+            do {
+                if (s->pending == s->pending_buf_size) {
                     HCRC_UPDATE(beg);
-                    flush_pending(strm); 
+                    flush_pending(strm);
                     if (s->pending != 0) {
                         s->last_flush = -1;
                         return Z_OK;
-                    } 
+                    }
                     beg = 0;
-                } 
-                val = s->gzhead->name[s->gzindex++]; 
-                put_byte(s, val); 
-            } while (val != 0); 
+                }
+                val = s->gzhead->name[s->gzindex++];
+                put_byte(s, val);
+            } while (val != 0);
             HCRC_UPDATE(beg);
             s->gzindex = 0;
-        } 
+        }
         s->status = COMMENT_STATE;
-    } 
-    if (s->status == COMMENT_STATE) { 
-        if (s->gzhead->comment != Z_NULL) { 
+    }
+    if (s->status == COMMENT_STATE) {
+        if (s->gzhead->comment != Z_NULL) {
             ulg beg = s->pending;   /* start of bytes to update crc */
-            int val; 
-            do { 
-                if (s->pending == s->pending_buf_size) { 
+            int val;
+            do {
+                if (s->pending == s->pending_buf_size) {
                     HCRC_UPDATE(beg);
-                    flush_pending(strm); 
+                    flush_pending(strm);
                     if (s->pending != 0) {
                         s->last_flush = -1;
                         return Z_OK;
-                    } 
+                    }
                     beg = 0;
-                } 
-                val = s->gzhead->comment[s->gzindex++]; 
-                put_byte(s, val); 
-            } while (val != 0); 
+                }
+                val = s->gzhead->comment[s->gzindex++];
+                put_byte(s, val);
+            } while (val != 0);
             HCRC_UPDATE(beg);
-        } 
+        }
         s->status = HCRC_STATE;
-    } 
-    if (s->status == HCRC_STATE) { 
-        if (s->gzhead->hcrc) { 
+    }
+    if (s->status == HCRC_STATE) {
+        if (s->gzhead->hcrc) {
             if (s->pending + 2 > s->pending_buf_size) {
-                flush_pending(strm); 
+                flush_pending(strm);
                 if (s->pending != 0) {
                     s->last_flush = -1;
                     return Z_OK;
                 }
-            } 
+            }
             put_byte(s, (Byte)(strm->adler & 0xff));
             put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
             strm->adler = crc32(0L, Z_NULL, 0);
-        } 
+        }
         s->status = BUSY_STATE;
- 
+
         /* Compression must start with an empty pending buffer */
-        flush_pending(strm); 
+        flush_pending(strm);
         if (s->pending != 0) {
-            s->last_flush = -1; 
-            return Z_OK; 
-        } 
-    } 
+            s->last_flush = -1;
+            return Z_OK;
+        }
+    }
 #endif
- 
-    /* Start a new block or continue the current one. 
-     */ 
-    if (strm->avail_in != 0 || s->lookahead != 0 || 
-        (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) { 
-        block_state bstate; 
- 
+
+    /* Start a new block or continue the current one.
+     */
+    if (strm->avail_in != 0 || s->lookahead != 0 ||
+        (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) {
+        block_state bstate;
+
         bstate = s->level == 0 ? deflate_stored(s, flush) :
                  s->strategy == Z_HUFFMAN_ONLY ? deflate_huff(s, flush) :
                  s->strategy == Z_RLE ? deflate_rle(s, flush) :
                  (*(configuration_table[s->level].func))(s, flush);
- 
-        if (bstate == finish_started || bstate == finish_done) { 
-            s->status = FINISH_STATE; 
-        } 
-        if (bstate == need_more || bstate == finish_started) { 
-            if (strm->avail_out == 0) { 
-                s->last_flush = -1; /* avoid BUF_ERROR next call, see above */ 
-            } 
-            return Z_OK; 
-            /* If flush != Z_NO_FLUSH && avail_out == 0, the next call 
-             * of deflate should use the same flush parameter to make sure 
-             * that the flush is complete. So we don't have to output an 
-             * empty block here, this will be done at next call. This also 
-             * ensures that for a very small output buffer, we emit at most 
-             * one empty block. 
-             */ 
-        } 
-        if (bstate == block_done) { 
-            if (flush == Z_PARTIAL_FLUSH) { 
-                _tr_align(s); 
-            } else if (flush != Z_BLOCK) { /* FULL_FLUSH or SYNC_FLUSH */ 
-                _tr_stored_block(s, (char*)0, 0L, 0); 
-                /* For a full flush, this empty block will be recognized 
-                 * as a special marker by inflate_sync(). 
-                 */ 
-                if (flush == Z_FULL_FLUSH) { 
-                    CLEAR_HASH(s);             /* forget history */ 
-                    if (s->lookahead == 0) { 
-                        s->strstart = 0; 
-                        s->block_start = 0L; 
-                        s->insert = 0; 
-                    } 
-                } 
-            } 
-            flush_pending(strm); 
-            if (strm->avail_out == 0) { 
-              s->last_flush = -1; /* avoid BUF_ERROR at next call, see above */ 
-              return Z_OK; 
-            } 
-        } 
-    } 
- 
-    if (flush != Z_FINISH) return Z_OK; 
-    if (s->wrap <= 0) return Z_STREAM_END; 
- 
-    /* Write the trailer */ 
-#ifdef GZIP 
-    if (s->wrap == 2) { 
-        put_byte(s, (Byte)(strm->adler & 0xff)); 
-        put_byte(s, (Byte)((strm->adler >> 8) & 0xff)); 
-        put_byte(s, (Byte)((strm->adler >> 16) & 0xff)); 
-        put_byte(s, (Byte)((strm->adler >> 24) & 0xff)); 
-        put_byte(s, (Byte)(strm->total_in & 0xff)); 
-        put_byte(s, (Byte)((strm->total_in >> 8) & 0xff)); 
-        put_byte(s, (Byte)((strm->total_in >> 16) & 0xff)); 
-        put_byte(s, (Byte)((strm->total_in >> 24) & 0xff)); 
-    } 
-    else 
-#endif 
-    { 
-        putShortMSB(s, (uInt)(strm->adler >> 16)); 
-        putShortMSB(s, (uInt)(strm->adler & 0xffff)); 
-    } 
-    flush_pending(strm); 
-    /* If avail_out is zero, the application will call deflate again 
-     * to flush the rest. 
-     */ 
-    if (s->wrap > 0) s->wrap = -s->wrap; /* write the trailer only once! */ 
-    return s->pending != 0 ? Z_OK : Z_STREAM_END; 
-} 
- 
-/* ========================================================================= */ 
-int ZEXPORT deflateEnd (strm) 
-    z_streamp strm; 
-{ 
-    int status; 
- 
+
+        if (bstate == finish_started || bstate == finish_done) {
+            s->status = FINISH_STATE;
+        }
+        if (bstate == need_more || bstate == finish_started) {
+            if (strm->avail_out == 0) {
+                s->last_flush = -1; /* avoid BUF_ERROR next call, see above */
+            }
+            return Z_OK;
+            /* If flush != Z_NO_FLUSH && avail_out == 0, the next call
+             * of deflate should use the same flush parameter to make sure
+             * that the flush is complete. So we don't have to output an
+             * empty block here, this will be done at next call. This also
+             * ensures that for a very small output buffer, we emit at most
+             * one empty block.
+             */
+        }
+        if (bstate == block_done) {
+            if (flush == Z_PARTIAL_FLUSH) {
+                _tr_align(s);
+            } else if (flush != Z_BLOCK) { /* FULL_FLUSH or SYNC_FLUSH */
+                _tr_stored_block(s, (char*)0, 0L, 0);
+                /* For a full flush, this empty block will be recognized
+                 * as a special marker by inflate_sync().
+                 */
+                if (flush == Z_FULL_FLUSH) {
+                    CLEAR_HASH(s);             /* forget history */
+                    if (s->lookahead == 0) {
+                        s->strstart = 0;
+                        s->block_start = 0L;
+                        s->insert = 0;
+                    }
+                }
+            }
+            flush_pending(strm);
+            if (strm->avail_out == 0) {
+              s->last_flush = -1; /* avoid BUF_ERROR at next call, see above */
+              return Z_OK;
+            }
+        }
+    }
+
+    if (flush != Z_FINISH) return Z_OK;
+    if (s->wrap <= 0) return Z_STREAM_END;
+
+    /* Write the trailer */
+#ifdef GZIP
+    if (s->wrap == 2) {
+        put_byte(s, (Byte)(strm->adler & 0xff));
+        put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
+        put_byte(s, (Byte)((strm->adler >> 16) & 0xff));
+        put_byte(s, (Byte)((strm->adler >> 24) & 0xff));
+        put_byte(s, (Byte)(strm->total_in & 0xff));
+        put_byte(s, (Byte)((strm->total_in >> 8) & 0xff));
+        put_byte(s, (Byte)((strm->total_in >> 16) & 0xff));
+        put_byte(s, (Byte)((strm->total_in >> 24) & 0xff));
+    }
+    else
+#endif
+    {
+        putShortMSB(s, (uInt)(strm->adler >> 16));
+        putShortMSB(s, (uInt)(strm->adler & 0xffff));
+    }
+    flush_pending(strm);
+    /* If avail_out is zero, the application will call deflate again
+     * to flush the rest.
+     */
+    if (s->wrap > 0) s->wrap = -s->wrap; /* write the trailer only once! */
+    return s->pending != 0 ? Z_OK : Z_STREAM_END;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateEnd (strm)
+    z_streamp strm;
+{
+    int status;
+
     if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
- 
-    status = strm->state->status; 
- 
-    /* Deallocate in reverse order of allocations: */ 
-    TRY_FREE(strm, strm->state->pending_buf); 
-    TRY_FREE(strm, strm->state->head); 
-    TRY_FREE(strm, strm->state->prev); 
-    TRY_FREE(strm, strm->state->window); 
- 
-    ZFREE(strm, strm->state); 
-    strm->state = Z_NULL; 
- 
-    return status == BUSY_STATE ? Z_DATA_ERROR : Z_OK; 
-} 
- 
-/* ========================================================================= 
- * Copy the source state to the destination state. 
- * To simplify the source, this is not supported for 16-bit MSDOS (which 
- * doesn't have enough memory anyway to duplicate compression states). 
- */ 
-int ZEXPORT deflateCopy (dest, source) 
-    z_streamp dest; 
-    z_streamp source; 
-{ 
-#ifdef MAXSEG_64K 
-    return Z_STREAM_ERROR; 
-#else 
-    deflate_state *ds; 
-    deflate_state *ss; 
-    ushf *overlay; 
- 
- 
+
+    status = strm->state->status;
+
+    /* Deallocate in reverse order of allocations: */
+    TRY_FREE(strm, strm->state->pending_buf);
+    TRY_FREE(strm, strm->state->head);
+    TRY_FREE(strm, strm->state->prev);
+    TRY_FREE(strm, strm->state->window);
+
+    ZFREE(strm, strm->state);
+    strm->state = Z_NULL;
+
+    return status == BUSY_STATE ? Z_DATA_ERROR : Z_OK;
+}
+
+/* =========================================================================
+ * Copy the source state to the destination state.
+ * To simplify the source, this is not supported for 16-bit MSDOS (which
+ * doesn't have enough memory anyway to duplicate compression states).
+ */
+int ZEXPORT deflateCopy (dest, source)
+    z_streamp dest;
+    z_streamp source;
+{
+#ifdef MAXSEG_64K
+    return Z_STREAM_ERROR;
+#else
+    deflate_state *ds;
+    deflate_state *ss;
+    ushf *overlay;
+
+
     if (deflateStateCheck(source) || dest == Z_NULL) {
-        return Z_STREAM_ERROR; 
-    } 
- 
-    ss = source->state; 
- 
-    zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream)); 
- 
-    ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state)); 
-    if (ds == Z_NULL) return Z_MEM_ERROR; 
-    dest->state = (struct internal_state FAR *) ds; 
-    zmemcpy((voidpf)ds, (voidpf)ss, sizeof(deflate_state)); 
-    ds->strm = dest; 
- 
-    ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte)); 
-    ds->prev   = (Posf *)  ZALLOC(dest, ds->w_size, sizeof(Pos)); 
-    ds->head   = (Posf *)  ZALLOC(dest, ds->hash_size, sizeof(Pos)); 
-    overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2); 
-    ds->pending_buf = (uchf *) overlay; 
- 
-    if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL || 
-        ds->pending_buf == Z_NULL) { 
-        deflateEnd (dest); 
-        return Z_MEM_ERROR; 
-    } 
-    /* following zmemcpy do not work for 16-bit MSDOS */ 
-    zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte)); 
-    zmemcpy((voidpf)ds->prev, (voidpf)ss->prev, ds->w_size * sizeof(Pos)); 
-    zmemcpy((voidpf)ds->head, (voidpf)ss->head, ds->hash_size * sizeof(Pos)); 
-    zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size); 
- 
-    ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf); 
-    ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush); 
-    ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize; 
- 
-    ds->l_desc.dyn_tree = ds->dyn_ltree; 
-    ds->d_desc.dyn_tree = ds->dyn_dtree; 
-    ds->bl_desc.dyn_tree = ds->bl_tree; 
- 
-    return Z_OK; 
-#endif /* MAXSEG_64K */ 
-} 
- 
-/* =========================================================================== 
- * Read a new buffer from the current input stream, update the adler32 
- * and total number of bytes read.  All deflate() input goes through 
- * this function so some applications may wish to modify it to avoid 
- * allocating a large strm->next_in buffer and copying from it. 
- * (See also flush_pending()). 
- */ 
+        return Z_STREAM_ERROR;
+    }
+
+    ss = source->state;
+
+    zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream));
+
+    ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state));
+    if (ds == Z_NULL) return Z_MEM_ERROR;
+    dest->state = (struct internal_state FAR *) ds;
+    zmemcpy((voidpf)ds, (voidpf)ss, sizeof(deflate_state));
+    ds->strm = dest;
+
+    ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));
+    ds->prev   = (Posf *)  ZALLOC(dest, ds->w_size, sizeof(Pos));
+    ds->head   = (Posf *)  ZALLOC(dest, ds->hash_size, sizeof(Pos));
+    overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2);
+    ds->pending_buf = (uchf *) overlay;
+
+    if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL ||
+        ds->pending_buf == Z_NULL) {
+        deflateEnd (dest);
+        return Z_MEM_ERROR;
+    }
+    /* following zmemcpy do not work for 16-bit MSDOS */
+    zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte));
+    zmemcpy((voidpf)ds->prev, (voidpf)ss->prev, ds->w_size * sizeof(Pos));
+    zmemcpy((voidpf)ds->head, (voidpf)ss->head, ds->hash_size * sizeof(Pos));
+    zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);
+
+    ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
+    ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush);
+    ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize;
+
+    ds->l_desc.dyn_tree = ds->dyn_ltree;
+    ds->d_desc.dyn_tree = ds->dyn_dtree;
+    ds->bl_desc.dyn_tree = ds->bl_tree;
+
+    return Z_OK;
+#endif /* MAXSEG_64K */
+}
+
+/* ===========================================================================
+ * Read a new buffer from the current input stream, update the adler32
+ * and total number of bytes read.  All deflate() input goes through
+ * this function so some applications may wish to modify it to avoid
+ * allocating a large strm->next_in buffer and copying from it.
+ * (See also flush_pending()).
+ */
 local unsigned read_buf(strm, buf, size)
-    z_streamp strm; 
-    Bytef *buf; 
-    unsigned size; 
-{ 
-    unsigned len = strm->avail_in; 
- 
-    if (len > size) len = size; 
-    if (len == 0) return 0; 
- 
-    strm->avail_in  -= len; 
- 
-    zmemcpy(buf, strm->next_in, len); 
-    if (strm->state->wrap == 1) { 
-        strm->adler = adler32(strm->adler, buf, len); 
-    } 
-#ifdef GZIP 
-    else if (strm->state->wrap == 2) { 
-        strm->adler = crc32(strm->adler, buf, len); 
-    } 
-#endif 
-    strm->next_in  += len; 
-    strm->total_in += len; 
- 
+    z_streamp strm;
+    Bytef *buf;
+    unsigned size;
+{
+    unsigned len = strm->avail_in;
+
+    if (len > size) len = size;
+    if (len == 0) return 0;
+
+    strm->avail_in  -= len;
+
+    zmemcpy(buf, strm->next_in, len);
+    if (strm->state->wrap == 1) {
+        strm->adler = adler32(strm->adler, buf, len);
+    }
+#ifdef GZIP
+    else if (strm->state->wrap == 2) {
+        strm->adler = crc32(strm->adler, buf, len);
+    }
+#endif
+    strm->next_in  += len;
+    strm->total_in += len;
+
     return len;
-} 
- 
-/* =========================================================================== 
- * Initialize the "longest match" routines for a new zlib stream 
- */ 
-local void lm_init (s) 
-    deflate_state *s; 
-{ 
-    s->window_size = (ulg)2L*s->w_size; 
- 
-    CLEAR_HASH(s); 
- 
-    /* Set the default configuration parameters: 
-     */ 
-    s->max_lazy_match   = configuration_table[s->level].max_lazy; 
-    s->good_match       = configuration_table[s->level].good_length; 
-    s->nice_match       = configuration_table[s->level].nice_length; 
-    s->max_chain_length = configuration_table[s->level].max_chain; 
- 
-    s->strstart = 0; 
-    s->block_start = 0L; 
-    s->lookahead = 0; 
-    s->insert = 0; 
-    s->match_length = s->prev_length = MIN_MATCH-1; 
-    s->match_available = 0; 
-    s->ins_h = 0; 
-#ifndef FASTEST 
-#ifdef ASMV 
-    match_init(); /* initialize the asm code */ 
-#endif 
-#endif 
-} 
- 
-#ifndef FASTEST 
-/* =========================================================================== 
- * Set match_start to the longest match starting at the given string and 
- * return its length. Matches shorter or equal to prev_length are discarded, 
- * in which case the result is equal to prev_length and match_start is 
- * garbage. 
- * IN assertions: cur_match is the head of the hash chain for the current 
- *   string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1 
- * OUT assertion: the match length is not greater than s->lookahead. 
- */ 
-#ifndef ASMV 
-/* For 80x86 and 680x0, an optimized version will be provided in match.asm or 
- * match.S. The code will be functionally equivalent. 
- */ 
+}
+
+/* ===========================================================================
+ * Initialize the "longest match" routines for a new zlib stream
+ */
+local void lm_init (s)
+    deflate_state *s;
+{
+    s->window_size = (ulg)2L*s->w_size;
+
+    CLEAR_HASH(s);
+
+    /* Set the default configuration parameters:
+     */
+    s->max_lazy_match   = configuration_table[s->level].max_lazy;
+    s->good_match       = configuration_table[s->level].good_length;
+    s->nice_match       = configuration_table[s->level].nice_length;
+    s->max_chain_length = configuration_table[s->level].max_chain;
+
+    s->strstart = 0;
+    s->block_start = 0L;
+    s->lookahead = 0;
+    s->insert = 0;
+    s->match_length = s->prev_length = MIN_MATCH-1;
+    s->match_available = 0;
+    s->ins_h = 0;
+#ifndef FASTEST
+#ifdef ASMV
+    match_init(); /* initialize the asm code */
+#endif
+#endif
+}
+
+#ifndef FASTEST
+/* ===========================================================================
+ * Set match_start to the longest match starting at the given string and
+ * return its length. Matches shorter or equal to prev_length are discarded,
+ * in which case the result is equal to prev_length and match_start is
+ * garbage.
+ * IN assertions: cur_match is the head of the hash chain for the current
+ *   string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1
+ * OUT assertion: the match length is not greater than s->lookahead.
+ */
+#ifndef ASMV
+/* For 80x86 and 680x0, an optimized version will be provided in match.asm or
+ * match.S. The code will be functionally equivalent.
+ */
 Y_NO_SANITIZE("undefined") local uInt longest_match(s, cur_match)
-    deflate_state *s; 
-    IPos cur_match;                             /* current match */ 
-{ 
-    unsigned chain_length = s->max_chain_length;/* max hash chain length */ 
+    deflate_state *s;
+    IPos cur_match;                             /* current match */
+{
+    unsigned chain_length = s->max_chain_length;/* max hash chain length */
     register Bytef *scan = s->window + s->strstart; /* current string */
     register Bytef *match;                      /* matched string */
     register int len;                           /* length of current match */
     int best_len = (int)s->prev_length;         /* best match length so far */
-    int nice_match = s->nice_match;             /* stop if match long enough */ 
-    IPos limit = s->strstart > (IPos)MAX_DIST(s) ? 
-        s->strstart - (IPos)MAX_DIST(s) : NIL; 
-    /* Stop when cur_match becomes <= limit. To simplify the code, 
-     * we prevent matches with the string of window index 0. 
-     */ 
-    Posf *prev = s->prev; 
-    uInt wmask = s->w_mask; 
- 
-#ifdef UNALIGNED_OK 
-    /* Compare two bytes at a time. Note: this is not always beneficial. 
-     * Try with and without -DUNALIGNED_OK to check. 
-     */ 
+    int nice_match = s->nice_match;             /* stop if match long enough */
+    IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
+        s->strstart - (IPos)MAX_DIST(s) : NIL;
+    /* Stop when cur_match becomes <= limit. To simplify the code,
+     * we prevent matches with the string of window index 0.
+     */
+    Posf *prev = s->prev;
+    uInt wmask = s->w_mask;
+
+#ifdef UNALIGNED_OK
+    /* Compare two bytes at a time. Note: this is not always beneficial.
+     * Try with and without -DUNALIGNED_OK to check.
+     */
     register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;
     register ush scan_start = *(ushf*)scan;
     register ush scan_end   = *(ushf*)(scan+best_len-1);
-#else 
+#else
     register Bytef *strend = s->window + s->strstart + MAX_MATCH;
     register Byte scan_end1  = scan[best_len-1];
     register Byte scan_end   = scan[best_len];
-#endif 
- 
-    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16. 
-     * It is easy to get rid of this optimization if necessary. 
-     */ 
-    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever"); 
- 
-    /* Do not waste too much time if we already have a good match: */ 
-    if (s->prev_length >= s->good_match) { 
-        chain_length >>= 2; 
-    } 
-    /* Do not look for matches beyond the end of the input. This is necessary 
-     * to make deflate deterministic. 
-     */ 
+#endif
+
+    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
+     * It is easy to get rid of this optimization if necessary.
+     */
+    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
+
+    /* Do not waste too much time if we already have a good match: */
+    if (s->prev_length >= s->good_match) {
+        chain_length >>= 2;
+    }
+    /* Do not look for matches beyond the end of the input. This is necessary
+     * to make deflate deterministic.
+     */
     if ((uInt)nice_match > s->lookahead) nice_match = (int)s->lookahead;
- 
-    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead"); 
- 
-    do { 
-        Assert(cur_match < s->strstart, "no future"); 
-        match = s->window + cur_match; 
- 
-        /* Skip to next match if the match length cannot increase 
-         * or if the match length is less than 2.  Note that the checks below 
-         * for insufficient lookahead only occur occasionally for performance 
-         * reasons.  Therefore uninitialized memory will be accessed, and 
-         * conditional jumps will be made that depend on those values. 
-         * However the length of the match is limited to the lookahead, so 
-         * the output of deflate is not affected by the uninitialized values. 
-         */ 
-#if (defined(UNALIGNED_OK) && MAX_MATCH == 258) 
-        /* This code assumes sizeof(unsigned short) == 2. Do not use 
-         * UNALIGNED_OK if your compiler uses a different size. 
-         */ 
-        if (*(ushf*)(match+best_len-1) != scan_end || 
-            *(ushf*)match != scan_start) continue; 
- 
-        /* It is not necessary to compare scan[2] and match[2] since they are 
-         * always equal when the other bytes match, given that the hash keys 
-         * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at 
-         * strstart+3, +5, ... up to strstart+257. We check for insufficient 
-         * lookahead only every 4th comparison; the 128th check will be made 
-         * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is 
-         * necessary to put more guard bytes at the end of the window, or 
-         * to check more often for insufficient lookahead. 
-         */ 
-        Assert(scan[2] == match[2], "scan[2]?"); 
-        scan++, match++; 
-        do { 
-        } while (*(ushf*)(scan+=2) == *(ushf*)(match+=2) && 
-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) && 
-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) && 
-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) && 
-                 scan < strend); 
-        /* The funny "do {}" generates better code on most compilers */ 
- 
-        /* Here, scan <= window+strstart+257 */ 
-        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan"); 
-        if (*scan == *match) scan++; 
- 
-        len = (MAX_MATCH - 1) - (int)(strend-scan); 
-        scan = strend - (MAX_MATCH-1); 
- 
-#else /* UNALIGNED_OK */ 
- 
-        if (match[best_len]   != scan_end  || 
-            match[best_len-1] != scan_end1 || 
-            *match            != *scan     || 
-            *++match          != scan[1])      continue; 
- 
-        /* The check at best_len-1 can be removed because it will be made 
-         * again later. (This heuristic is not always a win.) 
-         * It is not necessary to compare scan[2] and match[2] since they 
-         * are always equal when the other bytes match, given that 
-         * the hash keys are equal and that HASH_BITS >= 8. 
-         */ 
-        scan += 2, match++; 
-        Assert(*scan == *match, "match[2]?"); 
- 
-        /* We check for insufficient lookahead only every 8th comparison; 
-         * the 256th check will be made at strstart+258. 
-         */ 
-        do { 
-        } while (*++scan == *++match && *++scan == *++match && 
-                 *++scan == *++match && *++scan == *++match && 
-                 *++scan == *++match && *++scan == *++match && 
-                 *++scan == *++match && *++scan == *++match && 
-                 scan < strend); 
- 
-        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan"); 
- 
-        len = MAX_MATCH - (int)(strend - scan); 
-        scan = strend - MAX_MATCH; 
- 
-#endif /* UNALIGNED_OK */ 
- 
-        if (len > best_len) { 
-            s->match_start = cur_match; 
-            best_len = len; 
-            if (len >= nice_match) break; 
-#ifdef UNALIGNED_OK 
-            scan_end = *(ushf*)(scan+best_len-1); 
-#else 
-            scan_end1  = scan[best_len-1]; 
-            scan_end   = scan[best_len]; 
-#endif 
-        } 
-    } while ((cur_match = prev[cur_match & wmask]) > limit 
-             && --chain_length != 0); 
- 
-    if ((uInt)best_len <= s->lookahead) return (uInt)best_len; 
-    return s->lookahead; 
-} 
-#endif /* ASMV */ 
- 
-#else /* FASTEST */ 
- 
-/* --------------------------------------------------------------------------- 
- * Optimized version for FASTEST only 
- */ 
-local uInt longest_match(s, cur_match) 
-    deflate_state *s; 
-    IPos cur_match;                             /* current match */ 
-{ 
+
+    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
+
+    do {
+        Assert(cur_match < s->strstart, "no future");
+        match = s->window + cur_match;
+
+        /* Skip to next match if the match length cannot increase
+         * or if the match length is less than 2.  Note that the checks below
+         * for insufficient lookahead only occur occasionally for performance
+         * reasons.  Therefore uninitialized memory will be accessed, and
+         * conditional jumps will be made that depend on those values.
+         * However the length of the match is limited to the lookahead, so
+         * the output of deflate is not affected by the uninitialized values.
+         */
+#if (defined(UNALIGNED_OK) && MAX_MATCH == 258)
+        /* This code assumes sizeof(unsigned short) == 2. Do not use
+         * UNALIGNED_OK if your compiler uses a different size.
+         */
+        if (*(ushf*)(match+best_len-1) != scan_end ||
+            *(ushf*)match != scan_start) continue;
+
+        /* It is not necessary to compare scan[2] and match[2] since they are
+         * always equal when the other bytes match, given that the hash keys
+         * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at
+         * strstart+3, +5, ... up to strstart+257. We check for insufficient
+         * lookahead only every 4th comparison; the 128th check will be made
+         * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is
+         * necessary to put more guard bytes at the end of the window, or
+         * to check more often for insufficient lookahead.
+         */
+        Assert(scan[2] == match[2], "scan[2]?");
+        scan++, match++;
+        do {
+        } while (*(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
+                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
+                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
+                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
+                 scan < strend);
+        /* The funny "do {}" generates better code on most compilers */
+
+        /* Here, scan <= window+strstart+257 */
+        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
+        if (*scan == *match) scan++;
+
+        len = (MAX_MATCH - 1) - (int)(strend-scan);
+        scan = strend - (MAX_MATCH-1);
+
+#else /* UNALIGNED_OK */
+
+        if (match[best_len]   != scan_end  ||
+            match[best_len-1] != scan_end1 ||
+            *match            != *scan     ||
+            *++match          != scan[1])      continue;
+
+        /* The check at best_len-1 can be removed because it will be made
+         * again later. (This heuristic is not always a win.)
+         * It is not necessary to compare scan[2] and match[2] since they
+         * are always equal when the other bytes match, given that
+         * the hash keys are equal and that HASH_BITS >= 8.
+         */
+        scan += 2, match++;
+        Assert(*scan == *match, "match[2]?");
+
+        /* We check for insufficient lookahead only every 8th comparison;
+         * the 256th check will be made at strstart+258.
+         */
+        do {
+        } while (*++scan == *++match && *++scan == *++match &&
+                 *++scan == *++match && *++scan == *++match &&
+                 *++scan == *++match && *++scan == *++match &&
+                 *++scan == *++match && *++scan == *++match &&
+                 scan < strend);
+
+        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
+
+        len = MAX_MATCH - (int)(strend - scan);
+        scan = strend - MAX_MATCH;
+
+#endif /* UNALIGNED_OK */
+
+        if (len > best_len) {
+            s->match_start = cur_match;
+            best_len = len;
+            if (len >= nice_match) break;
+#ifdef UNALIGNED_OK
+            scan_end = *(ushf*)(scan+best_len-1);
+#else
+            scan_end1  = scan[best_len-1];
+            scan_end   = scan[best_len];
+#endif
+        }
+    } while ((cur_match = prev[cur_match & wmask]) > limit
+             && --chain_length != 0);
+
+    if ((uInt)best_len <= s->lookahead) return (uInt)best_len;
+    return s->lookahead;
+}
+#endif /* ASMV */
+
+#else /* FASTEST */
+
+/* ---------------------------------------------------------------------------
+ * Optimized version for FASTEST only
+ */
+local uInt longest_match(s, cur_match)
+    deflate_state *s;
+    IPos cur_match;                             /* current match */
+{
     register Bytef *scan = s->window + s->strstart; /* current string */
     register Bytef *match;                       /* matched string */
     register int len;                           /* length of current match */
     register Bytef *strend = s->window + s->strstart + MAX_MATCH;
- 
-    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16. 
-     * It is easy to get rid of this optimization if necessary. 
-     */ 
-    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever"); 
- 
-    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead"); 
- 
-    Assert(cur_match < s->strstart, "no future"); 
- 
-    match = s->window + cur_match; 
- 
-    /* Return failure if the match length is less than 2: 
-     */ 
-    if (match[0] != scan[0] || match[1] != scan[1]) return MIN_MATCH-1; 
- 
-    /* The check at best_len-1 can be removed because it will be made 
-     * again later. (This heuristic is not always a win.) 
-     * It is not necessary to compare scan[2] and match[2] since they 
-     * are always equal when the other bytes match, given that 
-     * the hash keys are equal and that HASH_BITS >= 8. 
-     */ 
-    scan += 2, match += 2; 
-    Assert(*scan == *match, "match[2]?"); 
- 
-    /* We check for insufficient lookahead only every 8th comparison; 
-     * the 256th check will be made at strstart+258. 
-     */ 
-    do { 
-    } while (*++scan == *++match && *++scan == *++match && 
-             *++scan == *++match && *++scan == *++match && 
-             *++scan == *++match && *++scan == *++match && 
-             *++scan == *++match && *++scan == *++match && 
-             scan < strend); 
- 
-    Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan"); 
- 
-    len = MAX_MATCH - (int)(strend - scan); 
- 
-    if (len < MIN_MATCH) return MIN_MATCH - 1; 
- 
-    s->match_start = cur_match; 
-    return (uInt)len <= s->lookahead ? (uInt)len : s->lookahead; 
-} 
- 
-#endif /* FASTEST */ 
- 
+
+    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
+     * It is easy to get rid of this optimization if necessary.
+     */
+    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
+
+    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
+
+    Assert(cur_match < s->strstart, "no future");
+
+    match = s->window + cur_match;
+
+    /* Return failure if the match length is less than 2:
+     */
+    if (match[0] != scan[0] || match[1] != scan[1]) return MIN_MATCH-1;
+
+    /* The check at best_len-1 can be removed because it will be made
+     * again later. (This heuristic is not always a win.)
+     * It is not necessary to compare scan[2] and match[2] since they
+     * are always equal when the other bytes match, given that
+     * the hash keys are equal and that HASH_BITS >= 8.
+     */
+    scan += 2, match += 2;
+    Assert(*scan == *match, "match[2]?");
+
+    /* We check for insufficient lookahead only every 8th comparison;
+     * the 256th check will be made at strstart+258.
+     */
+    do {
+    } while (*++scan == *++match && *++scan == *++match &&
+             *++scan == *++match && *++scan == *++match &&
+             *++scan == *++match && *++scan == *++match &&
+             *++scan == *++match && *++scan == *++match &&
+             scan < strend);
+
+    Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
+
+    len = MAX_MATCH - (int)(strend - scan);
+
+    if (len < MIN_MATCH) return MIN_MATCH - 1;
+
+    s->match_start = cur_match;
+    return (uInt)len <= s->lookahead ? (uInt)len : s->lookahead;
+}
+
+#endif /* FASTEST */
+
 #ifdef ZLIB_DEBUG
 
 #define EQUAL 0
 /* result of memcmp for equal strings */
 
-/* =========================================================================== 
- * Check that the match at match_start is indeed a match. 
- */ 
-local void check_match(s, start, match, length) 
-    deflate_state *s; 
-    IPos start, match; 
-    int length; 
-{ 
-    /* check that the match is indeed a match */ 
-    if (zmemcmp(s->window + match, 
-                s->window + start, length) != EQUAL) { 
-        fprintf(stderr, " start %u, match %u, length %d\n", 
-                start, match, length); 
-        do { 
-            fprintf(stderr, "%c%c", s->window[match++], s->window[start++]); 
-        } while (--length != 0); 
-        z_error("invalid match"); 
-    } 
-    if (z_verbose > 1) { 
-        fprintf(stderr,"\\[%d,%d]", start-match, length); 
-        do { putc(s->window[start++], stderr); } while (--length != 0); 
-    } 
-} 
-#else 
-#  define check_match(s, start, match, length) 
+/* ===========================================================================
+ * Check that the match at match_start is indeed a match.
+ */
+local void check_match(s, start, match, length)
+    deflate_state *s;
+    IPos start, match;
+    int length;
+{
+    /* check that the match is indeed a match */
+    if (zmemcmp(s->window + match,
+                s->window + start, length) != EQUAL) {
+        fprintf(stderr, " start %u, match %u, length %d\n",
+                start, match, length);
+        do {
+            fprintf(stderr, "%c%c", s->window[match++], s->window[start++]);
+        } while (--length != 0);
+        z_error("invalid match");
+    }
+    if (z_verbose > 1) {
+        fprintf(stderr,"\\[%d,%d]", start-match, length);
+        do { putc(s->window[start++], stderr); } while (--length != 0);
+    }
+}
+#else
+#  define check_match(s, start, match, length)
 #endif /* ZLIB_DEBUG */
- 
-/* =========================================================================== 
- * Fill the window when the lookahead becomes insufficient. 
- * Updates strstart and lookahead. 
- * 
- * IN assertion: lookahead < MIN_LOOKAHEAD 
- * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD 
- *    At least one byte has been read, or avail_in == 0; reads are 
- *    performed for at least two bytes (required for the zip translate_eol 
- *    option -- not supported here). 
- */ 
-local void fill_window(s) 
-    deflate_state *s; 
-{ 
+
+/* ===========================================================================
+ * Fill the window when the lookahead becomes insufficient.
+ * Updates strstart and lookahead.
+ *
+ * IN assertion: lookahead < MIN_LOOKAHEAD
+ * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD
+ *    At least one byte has been read, or avail_in == 0; reads are
+ *    performed for at least two bytes (required for the zip translate_eol
+ *    option -- not supported here).
+ */
+local void fill_window(s)
+    deflate_state *s;
+{
     unsigned n;
-    unsigned more;    /* Amount of free space at the end of the window. */ 
-    uInt wsize = s->w_size; 
- 
-    Assert(s->lookahead < MIN_LOOKAHEAD, "already enough lookahead"); 
- 
-    do { 
-        more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart); 
- 
-        /* Deal with !@#$% 64K limit: */ 
-        if (sizeof(int) <= 2) { 
-            if (more == 0 && s->strstart == 0 && s->lookahead == 0) { 
-                more = wsize; 
- 
-            } else if (more == (unsigned)(-1)) { 
-                /* Very unlikely, but possible on 16 bit machine if 
-                 * strstart == 0 && lookahead == 1 (input done a byte at time) 
-                 */ 
-                more--; 
-            } 
-        } 
- 
-        /* If the window is almost full and there is insufficient lookahead, 
-         * move the upper half to the lower one to make room in the upper half. 
-         */ 
-        if (s->strstart >= wsize+MAX_DIST(s)) { 
- 
+    unsigned more;    /* Amount of free space at the end of the window. */
+    uInt wsize = s->w_size;
+
+    Assert(s->lookahead < MIN_LOOKAHEAD, "already enough lookahead");
+
+    do {
+        more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);
+
+        /* Deal with !@#$% 64K limit: */
+        if (sizeof(int) <= 2) {
+            if (more == 0 && s->strstart == 0 && s->lookahead == 0) {
+                more = wsize;
+
+            } else if (more == (unsigned)(-1)) {
+                /* Very unlikely, but possible on 16 bit machine if
+                 * strstart == 0 && lookahead == 1 (input done a byte at time)
+                 */
+                more--;
+            }
+        }
+
+        /* If the window is almost full and there is insufficient lookahead,
+         * move the upper half to the lower one to make room in the upper half.
+         */
+        if (s->strstart >= wsize+MAX_DIST(s)) {
+
             zmemcpy(s->window, s->window+wsize, (unsigned)wsize - more);
-            s->match_start -= wsize; 
-            s->strstart    -= wsize; /* we now have strstart >= MAX_DIST */ 
-            s->block_start -= (long) wsize; 
+            s->match_start -= wsize;
+            s->strstart    -= wsize; /* we now have strstart >= MAX_DIST */
+            s->block_start -= (long) wsize;
             slide_hash(s);
-            more += wsize; 
-        } 
-        if (s->strm->avail_in == 0) break; 
- 
-        /* If there was no sliding: 
-         *    strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 && 
-         *    more == window_size - lookahead - strstart 
-         * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1) 
-         * => more >= window_size - 2*WSIZE + 2 
-         * In the BIG_MEM or MMAP case (not yet supported), 
-         *   window_size == input_size + MIN_LOOKAHEAD  && 
-         *   strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD. 
-         * Otherwise, window_size == 2*WSIZE so more >= 2. 
-         * If there was sliding, more >= WSIZE. So in all cases, more >= 2. 
-         */ 
-        Assert(more >= 2, "more < 2"); 
- 
-        n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more); 
-        s->lookahead += n; 
- 
-        /* Initialize the hash value now that we have some input: */ 
-        if (s->lookahead + s->insert >= MIN_MATCH) { 
-            uInt str = s->strstart - s->insert; 
-            s->ins_h = s->window[str]; 
-            UPDATE_HASH(s, s->ins_h, s->window[str + 1]); 
-#if MIN_MATCH != 3 
-            Call UPDATE_HASH() MIN_MATCH-3 more times 
-#endif 
-            while (s->insert) { 
-                UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]); 
-#ifndef FASTEST 
-                s->prev[str & s->w_mask] = s->head[s->ins_h]; 
-#endif 
-                s->head[s->ins_h] = (Pos)str; 
-                str++; 
-                s->insert--; 
-                if (s->lookahead + s->insert < MIN_MATCH) 
-                    break; 
-            } 
-        } 
-        /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage, 
-         * but this is not important since only literal bytes will be emitted. 
-         */ 
- 
-    } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0); 
- 
-    /* If the WIN_INIT bytes after the end of the current data have never been 
-     * written, then zero those bytes in order to avoid memory check reports of 
-     * the use of uninitialized (or uninitialised as Julian writes) bytes by 
-     * the longest match routines.  Update the high water mark for the next 
-     * time through here.  WIN_INIT is set to MAX_MATCH since the longest match 
-     * routines allow scanning to strstart + MAX_MATCH, ignoring lookahead. 
-     */ 
-    if (s->high_water < s->window_size) { 
-        ulg curr = s->strstart + (ulg)(s->lookahead); 
-        ulg init; 
- 
-        if (s->high_water < curr) { 
-            /* Previous high water mark below current data -- zero WIN_INIT 
-             * bytes or up to end of window, whichever is less. 
-             */ 
-            init = s->window_size - curr; 
-            if (init > WIN_INIT) 
-                init = WIN_INIT; 
-            zmemzero(s->window + curr, (unsigned)init); 
-            s->high_water = curr + init; 
-        } 
-        else if (s->high_water < (ulg)curr + WIN_INIT) { 
-            /* High water mark at or above current data, but below current data 
-             * plus WIN_INIT -- zero out to current data plus WIN_INIT, or up 
-             * to end of window, whichever is less. 
-             */ 
-            init = (ulg)curr + WIN_INIT - s->high_water; 
-            if (init > s->window_size - s->high_water) 
-                init = s->window_size - s->high_water; 
-            zmemzero(s->window + s->high_water, (unsigned)init); 
-            s->high_water += init; 
-        } 
-    } 
- 
-    Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD, 
-           "not enough room for search"); 
-} 
- 
-/* =========================================================================== 
- * Flush the current block, with given end-of-file flag. 
- * IN assertion: strstart is set to the end of the current match. 
- */ 
-#define FLUSH_BLOCK_ONLY(s, last) { \ 
-   _tr_flush_block(s, (s->block_start >= 0L ? \ 
-                   (charf *)&s->window[(unsigned)s->block_start] : \ 
-                   (charf *)Z_NULL), \ 
-                (ulg)((long)s->strstart - s->block_start), \ 
-                (last)); \ 
-   s->block_start = s->strstart; \ 
-   flush_pending(s->strm); \ 
-   Tracev((stderr,"[FLUSH]")); \ 
-} 
- 
-/* Same but force premature exit if necessary. */ 
-#define FLUSH_BLOCK(s, last) { \ 
-   FLUSH_BLOCK_ONLY(s, last); \ 
-   if (s->strm->avail_out == 0) return (last) ? finish_started : need_more; \ 
-} 
- 
+            more += wsize;
+        }
+        if (s->strm->avail_in == 0) break;
+
+        /* If there was no sliding:
+         *    strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&
+         *    more == window_size - lookahead - strstart
+         * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1)
+         * => more >= window_size - 2*WSIZE + 2
+         * In the BIG_MEM or MMAP case (not yet supported),
+         *   window_size == input_size + MIN_LOOKAHEAD  &&
+         *   strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD.
+         * Otherwise, window_size == 2*WSIZE so more >= 2.
+         * If there was sliding, more >= WSIZE. So in all cases, more >= 2.
+         */
+        Assert(more >= 2, "more < 2");
+
+        n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more);
+        s->lookahead += n;
+
+        /* Initialize the hash value now that we have some input: */
+        if (s->lookahead + s->insert >= MIN_MATCH) {
+            uInt str = s->strstart - s->insert;
+            s->ins_h = s->window[str];
+            UPDATE_HASH(s, s->ins_h, s->window[str + 1]);
+#if MIN_MATCH != 3
+            Call UPDATE_HASH() MIN_MATCH-3 more times
+#endif
+            while (s->insert) {
+                UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]);
+#ifndef FASTEST
+                s->prev[str & s->w_mask] = s->head[s->ins_h];
+#endif
+                s->head[s->ins_h] = (Pos)str;
+                str++;
+                s->insert--;
+                if (s->lookahead + s->insert < MIN_MATCH)
+                    break;
+            }
+        }
+        /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,
+         * but this is not important since only literal bytes will be emitted.
+         */
+
+    } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0);
+
+    /* If the WIN_INIT bytes after the end of the current data have never been
+     * written, then zero those bytes in order to avoid memory check reports of
+     * the use of uninitialized (or uninitialised as Julian writes) bytes by
+     * the longest match routines.  Update the high water mark for the next
+     * time through here.  WIN_INIT is set to MAX_MATCH since the longest match
+     * routines allow scanning to strstart + MAX_MATCH, ignoring lookahead.
+     */
+    if (s->high_water < s->window_size) {
+        ulg curr = s->strstart + (ulg)(s->lookahead);
+        ulg init;
+
+        if (s->high_water < curr) {
+            /* Previous high water mark below current data -- zero WIN_INIT
+             * bytes or up to end of window, whichever is less.
+             */
+            init = s->window_size - curr;
+            if (init > WIN_INIT)
+                init = WIN_INIT;
+            zmemzero(s->window + curr, (unsigned)init);
+            s->high_water = curr + init;
+        }
+        else if (s->high_water < (ulg)curr + WIN_INIT) {
+            /* High water mark at or above current data, but below current data
+             * plus WIN_INIT -- zero out to current data plus WIN_INIT, or up
+             * to end of window, whichever is less.
+             */
+            init = (ulg)curr + WIN_INIT - s->high_water;
+            if (init > s->window_size - s->high_water)
+                init = s->window_size - s->high_water;
+            zmemzero(s->window + s->high_water, (unsigned)init);
+            s->high_water += init;
+        }
+    }
+
+    Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
+           "not enough room for search");
+}
+
+/* ===========================================================================
+ * Flush the current block, with given end-of-file flag.
+ * IN assertion: strstart is set to the end of the current match.
+ */
+#define FLUSH_BLOCK_ONLY(s, last) { \
+   _tr_flush_block(s, (s->block_start >= 0L ? \
+                   (charf *)&s->window[(unsigned)s->block_start] : \
+                   (charf *)Z_NULL), \
+                (ulg)((long)s->strstart - s->block_start), \
+                (last)); \
+   s->block_start = s->strstart; \
+   flush_pending(s->strm); \
+   Tracev((stderr,"[FLUSH]")); \
+}
+
+/* Same but force premature exit if necessary. */
+#define FLUSH_BLOCK(s, last) { \
+   FLUSH_BLOCK_ONLY(s, last); \
+   if (s->strm->avail_out == 0) return (last) ? finish_started : need_more; \
+}
+
 /* Maximum stored block length in deflate format (not including header). */
 #define MAX_STORED 65535
 
 /* Minimum of a and b. */
 #define MIN(a, b) ((a) > (b) ? (b) : (a))
 
-/* =========================================================================== 
- * Copy without compression as much as possible from the input stream, return 
- * the current block state. 
+/* ===========================================================================
+ * Copy without compression as much as possible from the input stream, return
+ * the current block state.
  *
  * In case deflateParams() is used to later switch to a non-zero compression
  * level, s->matches (otherwise unused when storing) keeps track of the number
@@ -1642,17 +1642,17 @@ local void fill_window(s)
  * deflate_stored() is written to minimize the number of times an input byte is
  * copied. It is most efficient with large input and output buffers, which
  * maximizes the opportunites to have a single copy from next_in to next_out.
- */ 
-local block_state deflate_stored(s, flush) 
-    deflate_state *s; 
-    int flush; 
-{ 
+ */
+local block_state deflate_stored(s, flush)
+    deflate_state *s;
+    int flush;
+{
     /* Smallest worthy block size when not flushing or finishing. By default
      * this is 32K. This can be as small as 507 bytes for memLevel == 1. For
      * large input and output buffers, the stored block size will be larger.
-     */ 
+     */
     unsigned min_block = MIN(s->pending_buf_size - 5, s->w_size);
- 
+
     /* Copy as many min_block or larger stored blocks directly to next_out as
      * possible. If flushing, copy the remaining available input to next_out as
      * stored blocks, if there is enough space.
@@ -1675,7 +1675,7 @@ local block_state deflate_stored(s, flush)
             len = left + s->strm->avail_in;     /* limit len to the input */
         if (len > have)
             len = have;                         /* limit len to the output */
- 
+
         /* If the stored block would be less than min_block in length, or if
          * unable to copy all of the available input when flushing, then try
          * copying to the window and the pending buffer instead. Also don't
@@ -1685,28 +1685,28 @@ local block_state deflate_stored(s, flush)
                                 flush == Z_NO_FLUSH ||
                                 len != left + s->strm->avail_in))
             break;
- 
+
         /* Make a dummy stored block in pending to get the header bytes,
          * including any pending bits. This also updates the debugging counts.
          */
         last = flush == Z_FINISH && len == left + s->strm->avail_in ? 1 : 0;
         _tr_stored_block(s, (char *)0, 0L, last);
- 
+
         /* Replace the lengths in the dummy stored block with len. */
         s->pending_buf[s->pending - 4] = len;
         s->pending_buf[s->pending - 3] = len >> 8;
         s->pending_buf[s->pending - 2] = ~len;
         s->pending_buf[s->pending - 1] = ~len >> 8;
- 
+
         /* Write the stored block header bytes. */
         flush_pending(s->strm);
- 
+
 #ifdef ZLIB_DEBUG
         /* Update debugging counts for the data about to be copied. */
         s->compressed_len += len << 3;
         s->bits_sent += len << 3;
 #endif
- 
+
         /* Copy uncompressed bytes from the window to next_out. */
         if (left) {
             if (left > len)
@@ -1717,17 +1717,17 @@ local block_state deflate_stored(s, flush)
             s->strm->total_out += left;
             s->block_start += left;
             len -= left;
-        } 
+        }
 
         /* Copy uncompressed bytes directly from next_in to next_out, updating
          * the check value.
-         */ 
+         */
         if (len) {
             read_buf(s->strm, s->strm->next_out, len);
             s->strm->next_out += len;
             s->strm->avail_out -= len;
             s->strm->total_out += len;
-        } 
+        }
     } while (last == 0);
 
     /* Update the sliding window with the last s->w_size bytes of the copied
@@ -1759,13 +1759,13 @@ local block_state deflate_stored(s, flush)
         }
         s->block_start = s->strstart;
         s->insert += MIN(used, s->w_size - s->insert);
-    } 
+    }
     if (s->high_water < s->strstart)
         s->high_water = s->strstart;
 
     /* If the last block was written to next_out, then done. */
     if (last)
-        return finish_done; 
+        return finish_done;
 
     /* If flushing and all input has been consumed, then done. */
     if (flush != Z_NO_FLUSH && flush != Z_FINISH &&
@@ -1782,7 +1782,7 @@ local block_state deflate_stored(s, flush)
         if (s->matches < 2)
             s->matches++;           /* add a pending slide_hash() */
         have += s->w_size;          /* more space now */
-    } 
+    }
     if (have > s->strm->avail_in)
         have = s->strm->avail_in;
     if (have) {
@@ -1815,352 +1815,352 @@ local block_state deflate_stored(s, flush)
 
     /* We've done all we can with the available input and output. */
     return last ? finish_started : need_more;
-} 
- 
-/* =========================================================================== 
- * Compress as much as possible from the input stream, return the current 
- * block state. 
- * This function does not perform lazy evaluation of matches and inserts 
- * new strings in the dictionary only for unmatched strings or for short 
- * matches. It is used only for the fast compression options. 
- */ 
-local block_state deflate_fast(s, flush) 
-    deflate_state *s; 
-    int flush; 
-{ 
-    IPos hash_head;       /* head of the hash chain */ 
-    int bflush;           /* set if current block must be flushed */ 
- 
-    for (;;) { 
-        /* Make sure that we always have enough lookahead, except 
-         * at the end of the input file. We need MAX_MATCH bytes 
-         * for the next match, plus MIN_MATCH bytes to insert the 
-         * string following the next match. 
-         */ 
-        if (s->lookahead < MIN_LOOKAHEAD) { 
-            fill_window(s); 
-            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) { 
-                return need_more; 
-            } 
-            if (s->lookahead == 0) break; /* flush the current block */ 
-        } 
- 
-        /* Insert the string window[strstart .. strstart+2] in the 
-         * dictionary, and set hash_head to the head of the hash chain: 
-         */ 
-        hash_head = NIL; 
-        if (s->lookahead >= MIN_MATCH) { 
-            INSERT_STRING(s, s->strstart, hash_head); 
-        } 
- 
-        /* Find the longest match, discarding those <= prev_length. 
-         * At this point we have always match_length < MIN_MATCH 
-         */ 
-        if (hash_head != NIL && s->strstart - hash_head <= MAX_DIST(s)) { 
-            /* To simplify the code, we prevent matches with the string 
-             * of window index 0 (in particular we have to avoid a match 
-             * of the string with itself at the start of the input file). 
-             */ 
-            s->match_length = longest_match (s, hash_head); 
-            /* longest_match() sets match_start */ 
-        } 
-        if (s->match_length >= MIN_MATCH) { 
-            check_match(s, s->strstart, s->match_start, s->match_length); 
- 
-            _tr_tally_dist(s, s->strstart - s->match_start, 
-                           s->match_length - MIN_MATCH, bflush); 
- 
-            s->lookahead -= s->match_length; 
- 
-            /* Insert new strings in the hash table only if the match length 
-             * is not too large. This saves time but degrades compression. 
-             */ 
-#ifndef FASTEST 
-            if (s->match_length <= s->max_insert_length && 
-                s->lookahead >= MIN_MATCH) { 
-                s->match_length--; /* string at strstart already in table */ 
-                do { 
-                    s->strstart++; 
-                    INSERT_STRING(s, s->strstart, hash_head); 
-                    /* strstart never exceeds WSIZE-MAX_MATCH, so there are 
-                     * always MIN_MATCH bytes ahead. 
-                     */ 
-                } while (--s->match_length != 0); 
-                s->strstart++; 
-            } else 
-#endif 
-            { 
-                s->strstart += s->match_length; 
-                s->match_length = 0; 
-                s->ins_h = s->window[s->strstart]; 
-                UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]); 
-#if MIN_MATCH != 3 
-                Call UPDATE_HASH() MIN_MATCH-3 more times 
-#endif 
-                /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not 
-                 * matter since it will be recomputed at next deflate call. 
-                 */ 
-            } 
-        } else { 
-            /* No match, output a literal byte */ 
-            Tracevv((stderr,"%c", s->window[s->strstart])); 
-            _tr_tally_lit (s, s->window[s->strstart], bflush); 
-            s->lookahead--; 
-            s->strstart++; 
-        } 
-        if (bflush) FLUSH_BLOCK(s, 0); 
-    } 
-    s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1; 
-    if (flush == Z_FINISH) { 
-        FLUSH_BLOCK(s, 1); 
-        return finish_done; 
-    } 
-    if (s->last_lit) 
-        FLUSH_BLOCK(s, 0); 
-    return block_done; 
-} 
- 
-#ifndef FASTEST 
-/* =========================================================================== 
- * Same as above, but achieves better compression. We use a lazy 
- * evaluation for matches: a match is finally adopted only if there is 
- * no better match at the next window position. 
- */ 
-local block_state deflate_slow(s, flush) 
-    deflate_state *s; 
-    int flush; 
-{ 
-    IPos hash_head;          /* head of hash chain */ 
-    int bflush;              /* set if current block must be flushed */ 
- 
-    /* Process the input block. */ 
-    for (;;) { 
-        /* Make sure that we always have enough lookahead, except 
-         * at the end of the input file. We need MAX_MATCH bytes 
-         * for the next match, plus MIN_MATCH bytes to insert the 
-         * string following the next match. 
-         */ 
-        if (s->lookahead < MIN_LOOKAHEAD) { 
-            fill_window(s); 
-            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) { 
-                return need_more; 
-            } 
-            if (s->lookahead == 0) break; /* flush the current block */ 
-        } 
- 
-        /* Insert the string window[strstart .. strstart+2] in the 
-         * dictionary, and set hash_head to the head of the hash chain: 
-         */ 
-        hash_head = NIL; 
-        if (s->lookahead >= MIN_MATCH) { 
-            INSERT_STRING(s, s->strstart, hash_head); 
-        } 
- 
-        /* Find the longest match, discarding those <= prev_length. 
-         */ 
-        s->prev_length = s->match_length, s->prev_match = s->match_start; 
-        s->match_length = MIN_MATCH-1; 
- 
-        if (hash_head != NIL && s->prev_length < s->max_lazy_match && 
-            s->strstart - hash_head <= MAX_DIST(s)) { 
-            /* To simplify the code, we prevent matches with the string 
-             * of window index 0 (in particular we have to avoid a match 
-             * of the string with itself at the start of the input file). 
-             */ 
-            s->match_length = longest_match (s, hash_head); 
-            /* longest_match() sets match_start */ 
- 
-            if (s->match_length <= 5 && (s->strategy == Z_FILTERED 
-#if TOO_FAR <= 32767 
-                || (s->match_length == MIN_MATCH && 
-                    s->strstart - s->match_start > TOO_FAR) 
-#endif 
-                )) { 
- 
-                /* If prev_match is also MIN_MATCH, match_start is garbage 
-                 * but we will ignore the current match anyway. 
-                 */ 
-                s->match_length = MIN_MATCH-1; 
-            } 
-        } 
-        /* If there was a match at the previous step and the current 
-         * match is not better, output the previous match: 
-         */ 
-        if (s->prev_length >= MIN_MATCH && s->match_length <= s->prev_length) { 
-            uInt max_insert = s->strstart + s->lookahead - MIN_MATCH; 
-            /* Do not insert strings in hash table beyond this. */ 
- 
-            check_match(s, s->strstart-1, s->prev_match, s->prev_length); 
- 
-            _tr_tally_dist(s, s->strstart -1 - s->prev_match, 
-                           s->prev_length - MIN_MATCH, bflush); 
- 
-            /* Insert in hash table all strings up to the end of the match. 
-             * strstart-1 and strstart are already inserted. If there is not 
-             * enough lookahead, the last two strings are not inserted in 
-             * the hash table. 
-             */ 
-            s->lookahead -= s->prev_length-1; 
-            s->prev_length -= 2; 
-            do { 
-                if (++s->strstart <= max_insert) { 
-                    INSERT_STRING(s, s->strstart, hash_head); 
-                } 
-            } while (--s->prev_length != 0); 
-            s->match_available = 0; 
-            s->match_length = MIN_MATCH-1; 
-            s->strstart++; 
- 
-            if (bflush) FLUSH_BLOCK(s, 0); 
- 
-        } else if (s->match_available) { 
-            /* If there was no match at the previous position, output a 
-             * single literal. If there was a match but the current match 
-             * is longer, truncate the previous match to a single literal. 
-             */ 
-            Tracevv((stderr,"%c", s->window[s->strstart-1])); 
-            _tr_tally_lit(s, s->window[s->strstart-1], bflush); 
-            if (bflush) { 
-                FLUSH_BLOCK_ONLY(s, 0); 
-            } 
-            s->strstart++; 
-            s->lookahead--; 
-            if (s->strm->avail_out == 0) return need_more; 
-        } else { 
-            /* There is no previous match to compare with, wait for 
-             * the next step to decide. 
-             */ 
-            s->match_available = 1; 
-            s->strstart++; 
-            s->lookahead--; 
-        } 
-    } 
-    Assert (flush != Z_NO_FLUSH, "no flush?"); 
-    if (s->match_available) { 
-        Tracevv((stderr,"%c", s->window[s->strstart-1])); 
-        _tr_tally_lit(s, s->window[s->strstart-1], bflush); 
-        s->match_available = 0; 
-    } 
-    s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1; 
-    if (flush == Z_FINISH) { 
-        FLUSH_BLOCK(s, 1); 
-        return finish_done; 
-    } 
-    if (s->last_lit) 
-        FLUSH_BLOCK(s, 0); 
-    return block_done; 
-} 
-#endif /* FASTEST */ 
- 
-/* =========================================================================== 
- * For Z_RLE, simply look for runs of bytes, generate matches only of distance 
- * one.  Do not maintain a hash table.  (It will be regenerated if this run of 
- * deflate switches away from Z_RLE.) 
- */ 
-local block_state deflate_rle(s, flush) 
-    deflate_state *s; 
-    int flush; 
-{ 
-    int bflush;             /* set if current block must be flushed */ 
-    uInt prev;              /* byte at distance one to match */ 
-    Bytef *scan, *strend;   /* scan goes up to strend for length of run */ 
- 
-    for (;;) { 
-        /* Make sure that we always have enough lookahead, except 
-         * at the end of the input file. We need MAX_MATCH bytes 
-         * for the longest run, plus one for the unrolled loop. 
-         */ 
-        if (s->lookahead <= MAX_MATCH) { 
-            fill_window(s); 
-            if (s->lookahead <= MAX_MATCH && flush == Z_NO_FLUSH) { 
-                return need_more; 
-            } 
-            if (s->lookahead == 0) break; /* flush the current block */ 
-        } 
- 
-        /* See how many times the previous byte repeats */ 
-        s->match_length = 0; 
-        if (s->lookahead >= MIN_MATCH && s->strstart > 0) { 
-            scan = s->window + s->strstart - 1; 
-            prev = *scan; 
-            if (prev == *++scan && prev == *++scan && prev == *++scan) { 
-                strend = s->window + s->strstart + MAX_MATCH; 
-                do { 
-                } while (prev == *++scan && prev == *++scan && 
-                         prev == *++scan && prev == *++scan && 
-                         prev == *++scan && prev == *++scan && 
-                         prev == *++scan && prev == *++scan && 
-                         scan < strend); 
+}
+
+/* ===========================================================================
+ * Compress as much as possible from the input stream, return the current
+ * block state.
+ * This function does not perform lazy evaluation of matches and inserts
+ * new strings in the dictionary only for unmatched strings or for short
+ * matches. It is used only for the fast compression options.
+ */
+local block_state deflate_fast(s, flush)
+    deflate_state *s;
+    int flush;
+{
+    IPos hash_head;       /* head of the hash chain */
+    int bflush;           /* set if current block must be flushed */
+
+    for (;;) {
+        /* Make sure that we always have enough lookahead, except
+         * at the end of the input file. We need MAX_MATCH bytes
+         * for the next match, plus MIN_MATCH bytes to insert the
+         * string following the next match.
+         */
+        if (s->lookahead < MIN_LOOKAHEAD) {
+            fill_window(s);
+            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
+                return need_more;
+            }
+            if (s->lookahead == 0) break; /* flush the current block */
+        }
+
+        /* Insert the string window[strstart .. strstart+2] in the
+         * dictionary, and set hash_head to the head of the hash chain:
+         */
+        hash_head = NIL;
+        if (s->lookahead >= MIN_MATCH) {
+            INSERT_STRING(s, s->strstart, hash_head);
+        }
+
+        /* Find the longest match, discarding those <= prev_length.
+         * At this point we have always match_length < MIN_MATCH
+         */
+        if (hash_head != NIL && s->strstart - hash_head <= MAX_DIST(s)) {
+            /* To simplify the code, we prevent matches with the string
+             * of window index 0 (in particular we have to avoid a match
+             * of the string with itself at the start of the input file).
+             */
+            s->match_length = longest_match (s, hash_head);
+            /* longest_match() sets match_start */
+        }
+        if (s->match_length >= MIN_MATCH) {
+            check_match(s, s->strstart, s->match_start, s->match_length);
+
+            _tr_tally_dist(s, s->strstart - s->match_start,
+                           s->match_length - MIN_MATCH, bflush);
+
+            s->lookahead -= s->match_length;
+
+            /* Insert new strings in the hash table only if the match length
+             * is not too large. This saves time but degrades compression.
+             */
+#ifndef FASTEST
+            if (s->match_length <= s->max_insert_length &&
+                s->lookahead >= MIN_MATCH) {
+                s->match_length--; /* string at strstart already in table */
+                do {
+                    s->strstart++;
+                    INSERT_STRING(s, s->strstart, hash_head);
+                    /* strstart never exceeds WSIZE-MAX_MATCH, so there are
+                     * always MIN_MATCH bytes ahead.
+                     */
+                } while (--s->match_length != 0);
+                s->strstart++;
+            } else
+#endif
+            {
+                s->strstart += s->match_length;
+                s->match_length = 0;
+                s->ins_h = s->window[s->strstart];
+                UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);
+#if MIN_MATCH != 3
+                Call UPDATE_HASH() MIN_MATCH-3 more times
+#endif
+                /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not
+                 * matter since it will be recomputed at next deflate call.
+                 */
+            }
+        } else {
+            /* No match, output a literal byte */
+            Tracevv((stderr,"%c", s->window[s->strstart]));
+            _tr_tally_lit (s, s->window[s->strstart], bflush);
+            s->lookahead--;
+            s->strstart++;
+        }
+        if (bflush) FLUSH_BLOCK(s, 0);
+    }
+    s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1;
+    if (flush == Z_FINISH) {
+        FLUSH_BLOCK(s, 1);
+        return finish_done;
+    }
+    if (s->last_lit)
+        FLUSH_BLOCK(s, 0);
+    return block_done;
+}
+
+#ifndef FASTEST
+/* ===========================================================================
+ * Same as above, but achieves better compression. We use a lazy
+ * evaluation for matches: a match is finally adopted only if there is
+ * no better match at the next window position.
+ */
+local block_state deflate_slow(s, flush)
+    deflate_state *s;
+    int flush;
+{
+    IPos hash_head;          /* head of hash chain */
+    int bflush;              /* set if current block must be flushed */
+
+    /* Process the input block. */
+    for (;;) {
+        /* Make sure that we always have enough lookahead, except
+         * at the end of the input file. We need MAX_MATCH bytes
+         * for the next match, plus MIN_MATCH bytes to insert the
+         * string following the next match.
+         */
+        if (s->lookahead < MIN_LOOKAHEAD) {
+            fill_window(s);
+            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
+                return need_more;
+            }
+            if (s->lookahead == 0) break; /* flush the current block */
+        }
+
+        /* Insert the string window[strstart .. strstart+2] in the
+         * dictionary, and set hash_head to the head of the hash chain:
+         */
+        hash_head = NIL;
+        if (s->lookahead >= MIN_MATCH) {
+            INSERT_STRING(s, s->strstart, hash_head);
+        }
+
+        /* Find the longest match, discarding those <= prev_length.
+         */
+        s->prev_length = s->match_length, s->prev_match = s->match_start;
+        s->match_length = MIN_MATCH-1;
+
+        if (hash_head != NIL && s->prev_length < s->max_lazy_match &&
+            s->strstart - hash_head <= MAX_DIST(s)) {
+            /* To simplify the code, we prevent matches with the string
+             * of window index 0 (in particular we have to avoid a match
+             * of the string with itself at the start of the input file).
+             */
+            s->match_length = longest_match (s, hash_head);
+            /* longest_match() sets match_start */
+
+            if (s->match_length <= 5 && (s->strategy == Z_FILTERED
+#if TOO_FAR <= 32767
+                || (s->match_length == MIN_MATCH &&
+                    s->strstart - s->match_start > TOO_FAR)
+#endif
+                )) {
+
+                /* If prev_match is also MIN_MATCH, match_start is garbage
+                 * but we will ignore the current match anyway.
+                 */
+                s->match_length = MIN_MATCH-1;
+            }
+        }
+        /* If there was a match at the previous step and the current
+         * match is not better, output the previous match:
+         */
+        if (s->prev_length >= MIN_MATCH && s->match_length <= s->prev_length) {
+            uInt max_insert = s->strstart + s->lookahead - MIN_MATCH;
+            /* Do not insert strings in hash table beyond this. */
+
+            check_match(s, s->strstart-1, s->prev_match, s->prev_length);
+
+            _tr_tally_dist(s, s->strstart -1 - s->prev_match,
+                           s->prev_length - MIN_MATCH, bflush);
+
+            /* Insert in hash table all strings up to the end of the match.
+             * strstart-1 and strstart are already inserted. If there is not
+             * enough lookahead, the last two strings are not inserted in
+             * the hash table.
+             */
+            s->lookahead -= s->prev_length-1;
+            s->prev_length -= 2;
+            do {
+                if (++s->strstart <= max_insert) {
+                    INSERT_STRING(s, s->strstart, hash_head);
+                }
+            } while (--s->prev_length != 0);
+            s->match_available = 0;
+            s->match_length = MIN_MATCH-1;
+            s->strstart++;
+
+            if (bflush) FLUSH_BLOCK(s, 0);
+
+        } else if (s->match_available) {
+            /* If there was no match at the previous position, output a
+             * single literal. If there was a match but the current match
+             * is longer, truncate the previous match to a single literal.
+             */
+            Tracevv((stderr,"%c", s->window[s->strstart-1]));
+            _tr_tally_lit(s, s->window[s->strstart-1], bflush);
+            if (bflush) {
+                FLUSH_BLOCK_ONLY(s, 0);
+            }
+            s->strstart++;
+            s->lookahead--;
+            if (s->strm->avail_out == 0) return need_more;
+        } else {
+            /* There is no previous match to compare with, wait for
+             * the next step to decide.
+             */
+            s->match_available = 1;
+            s->strstart++;
+            s->lookahead--;
+        }
+    }
+    Assert (flush != Z_NO_FLUSH, "no flush?");
+    if (s->match_available) {
+        Tracevv((stderr,"%c", s->window[s->strstart-1]));
+        _tr_tally_lit(s, s->window[s->strstart-1], bflush);
+        s->match_available = 0;
+    }
+    s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1;
+    if (flush == Z_FINISH) {
+        FLUSH_BLOCK(s, 1);
+        return finish_done;
+    }
+    if (s->last_lit)
+        FLUSH_BLOCK(s, 0);
+    return block_done;
+}
+#endif /* FASTEST */
+
+/* ===========================================================================
+ * For Z_RLE, simply look for runs of bytes, generate matches only of distance
+ * one.  Do not maintain a hash table.  (It will be regenerated if this run of
+ * deflate switches away from Z_RLE.)
+ */
+local block_state deflate_rle(s, flush)
+    deflate_state *s;
+    int flush;
+{
+    int bflush;             /* set if current block must be flushed */
+    uInt prev;              /* byte at distance one to match */
+    Bytef *scan, *strend;   /* scan goes up to strend for length of run */
+
+    for (;;) {
+        /* Make sure that we always have enough lookahead, except
+         * at the end of the input file. We need MAX_MATCH bytes
+         * for the longest run, plus one for the unrolled loop.
+         */
+        if (s->lookahead <= MAX_MATCH) {
+            fill_window(s);
+            if (s->lookahead <= MAX_MATCH && flush == Z_NO_FLUSH) {
+                return need_more;
+            }
+            if (s->lookahead == 0) break; /* flush the current block */
+        }
+
+        /* See how many times the previous byte repeats */
+        s->match_length = 0;
+        if (s->lookahead >= MIN_MATCH && s->strstart > 0) {
+            scan = s->window + s->strstart - 1;
+            prev = *scan;
+            if (prev == *++scan && prev == *++scan && prev == *++scan) {
+                strend = s->window + s->strstart + MAX_MATCH;
+                do {
+                } while (prev == *++scan && prev == *++scan &&
+                         prev == *++scan && prev == *++scan &&
+                         prev == *++scan && prev == *++scan &&
+                         prev == *++scan && prev == *++scan &&
+                         scan < strend);
                 s->match_length = MAX_MATCH - (uInt)(strend - scan);
-                if (s->match_length > s->lookahead) 
-                    s->match_length = s->lookahead; 
-            } 
-            Assert(scan <= s->window+(uInt)(s->window_size-1), "wild scan"); 
-        } 
- 
-        /* Emit match if have run of MIN_MATCH or longer, else emit literal */ 
-        if (s->match_length >= MIN_MATCH) { 
-            check_match(s, s->strstart, s->strstart - 1, s->match_length); 
- 
-            _tr_tally_dist(s, 1, s->match_length - MIN_MATCH, bflush); 
- 
-            s->lookahead -= s->match_length; 
-            s->strstart += s->match_length; 
-            s->match_length = 0; 
-        } else { 
-            /* No match, output a literal byte */ 
-            Tracevv((stderr,"%c", s->window[s->strstart])); 
-            _tr_tally_lit (s, s->window[s->strstart], bflush); 
-            s->lookahead--; 
-            s->strstart++; 
-        } 
-        if (bflush) FLUSH_BLOCK(s, 0); 
-    } 
-    s->insert = 0; 
-    if (flush == Z_FINISH) { 
-        FLUSH_BLOCK(s, 1); 
-        return finish_done; 
-    } 
-    if (s->last_lit) 
-        FLUSH_BLOCK(s, 0); 
-    return block_done; 
-} 
- 
-/* =========================================================================== 
- * For Z_HUFFMAN_ONLY, do not look for matches.  Do not maintain a hash table. 
- * (It will be regenerated if this run of deflate switches away from Huffman.) 
- */ 
-local block_state deflate_huff(s, flush) 
-    deflate_state *s; 
-    int flush; 
-{ 
-    int bflush;             /* set if current block must be flushed */ 
- 
-    for (;;) { 
-        /* Make sure that we have a literal to write. */ 
-        if (s->lookahead == 0) { 
-            fill_window(s); 
-            if (s->lookahead == 0) { 
-                if (flush == Z_NO_FLUSH) 
-                    return need_more; 
-                break;      /* flush the current block */ 
-            } 
-        } 
- 
-        /* Output a literal byte */ 
-        s->match_length = 0; 
-        Tracevv((stderr,"%c", s->window[s->strstart])); 
-        _tr_tally_lit (s, s->window[s->strstart], bflush); 
-        s->lookahead--; 
-        s->strstart++; 
-        if (bflush) FLUSH_BLOCK(s, 0); 
-    } 
-    s->insert = 0; 
-    if (flush == Z_FINISH) { 
-        FLUSH_BLOCK(s, 1); 
-        return finish_done; 
-    } 
-    if (s->last_lit) 
-        FLUSH_BLOCK(s, 0); 
-    return block_done; 
-} 
+                if (s->match_length > s->lookahead)
+                    s->match_length = s->lookahead;
+            }
+            Assert(scan <= s->window+(uInt)(s->window_size-1), "wild scan");
+        }
+
+        /* Emit match if have run of MIN_MATCH or longer, else emit literal */
+        if (s->match_length >= MIN_MATCH) {
+            check_match(s, s->strstart, s->strstart - 1, s->match_length);
+
+            _tr_tally_dist(s, 1, s->match_length - MIN_MATCH, bflush);
+
+            s->lookahead -= s->match_length;
+            s->strstart += s->match_length;
+            s->match_length = 0;
+        } else {
+            /* No match, output a literal byte */
+            Tracevv((stderr,"%c", s->window[s->strstart]));
+            _tr_tally_lit (s, s->window[s->strstart], bflush);
+            s->lookahead--;
+            s->strstart++;
+        }
+        if (bflush) FLUSH_BLOCK(s, 0);
+    }
+    s->insert = 0;
+    if (flush == Z_FINISH) {
+        FLUSH_BLOCK(s, 1);
+        return finish_done;
+    }
+    if (s->last_lit)
+        FLUSH_BLOCK(s, 0);
+    return block_done;
+}
+
+/* ===========================================================================
+ * For Z_HUFFMAN_ONLY, do not look for matches.  Do not maintain a hash table.
+ * (It will be regenerated if this run of deflate switches away from Huffman.)
+ */
+local block_state deflate_huff(s, flush)
+    deflate_state *s;
+    int flush;
+{
+    int bflush;             /* set if current block must be flushed */
+
+    for (;;) {
+        /* Make sure that we have a literal to write. */
+        if (s->lookahead == 0) {
+            fill_window(s);
+            if (s->lookahead == 0) {
+                if (flush == Z_NO_FLUSH)
+                    return need_more;
+                break;      /* flush the current block */
+            }
+        }
+
+        /* Output a literal byte */
+        s->match_length = 0;
+        Tracevv((stderr,"%c", s->window[s->strstart]));
+        _tr_tally_lit (s, s->window[s->strstart], bflush);
+        s->lookahead--;
+        s->strstart++;
+        if (bflush) FLUSH_BLOCK(s, 0);
+    }
+    s->insert = 0;
+    if (flush == Z_FINISH) {
+        FLUSH_BLOCK(s, 1);
+        return finish_done;
+    }
+    if (s->last_lit)
+        FLUSH_BLOCK(s, 0);
+    return block_done;
+}
diff --git a/contrib/libs/zlib/deflate.h b/contrib/libs/zlib/deflate.h
index ae9d480fd4..23ecdd312b 100644
--- a/contrib/libs/zlib/deflate.h
+++ b/contrib/libs/zlib/deflate.h
@@ -1,56 +1,56 @@
-/* deflate.h -- internal compression state 
+/* deflate.h -- internal compression state
  * Copyright (C) 1995-2016 Jean-loup Gailly
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */ 
- 
-/* WARNING: this file should *not* be used by applications. It is 
-   part of the implementation of the compression library and is 
-   subject to change. Applications should only use zlib.h. 
- */ 
- 
-/* @(#) $Id$ */ 
- 
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+/* @(#) $Id$ */
+
 #ifndef DEFLATE_H
 #define DEFLATE_H
 
-#include "zutil.h" 
- 
-/* define NO_GZIP when compiling if you want to disable gzip header and 
-   trailer creation by deflate().  NO_GZIP would be used to avoid linking in 
-   the crc code when it is not needed.  For shared libraries, gzip encoding 
-   should be left enabled. */ 
-#ifndef NO_GZIP 
-#  define GZIP 
-#endif 
- 
-/* =========================================================================== 
- * Internal compression state. 
- */ 
- 
-#define LENGTH_CODES 29 
-/* number of length codes, not counting the special END_BLOCK code */ 
- 
-#define LITERALS  256 
-/* number of literal bytes 0..255 */ 
- 
-#define L_CODES (LITERALS+1+LENGTH_CODES) 
-/* number of Literal or Length codes, including the END_BLOCK code */ 
- 
-#define D_CODES   30 
-/* number of distance codes */ 
- 
-#define BL_CODES  19 
-/* number of codes used to transfer the bit lengths */ 
- 
-#define HEAP_SIZE (2*L_CODES+1) 
-/* maximum heap size */ 
- 
-#define MAX_BITS 15 
-/* All codes must not exceed MAX_BITS bits */ 
- 
-#define Buf_size 16 
-/* size of bit buffer in bi_buf */ 
- 
+#include "zutil.h"
+
+/* define NO_GZIP when compiling if you want to disable gzip header and
+   trailer creation by deflate().  NO_GZIP would be used to avoid linking in
+   the crc code when it is not needed.  For shared libraries, gzip encoding
+   should be left enabled. */
+#ifndef NO_GZIP
+#  define GZIP
+#endif
+
+/* ===========================================================================
+ * Internal compression state.
+ */
+
+#define LENGTH_CODES 29
+/* number of length codes, not counting the special END_BLOCK code */
+
+#define LITERALS  256
+/* number of literal bytes 0..255 */
+
+#define L_CODES (LITERALS+1+LENGTH_CODES)
+/* number of Literal or Length codes, including the END_BLOCK code */
+
+#define D_CODES   30
+/* number of distance codes */
+
+#define BL_CODES  19
+/* number of codes used to transfer the bit lengths */
+
+#define HEAP_SIZE (2*L_CODES+1)
+/* maximum heap size */
+
+#define MAX_BITS 15
+/* All codes must not exceed MAX_BITS bits */
+
+#define Buf_size 16
+/* size of bit buffer in bi_buf */
+
 #define INIT_STATE    42    /* zlib header -> BUSY_STATE */
 #ifdef GZIP
 #  define GZIP_STATE  57    /* gzip header -> BUSY_STATE | EXTRA_STATE */
@@ -61,289 +61,289 @@
 #define HCRC_STATE   103    /* gzip header CRC -> BUSY_STATE */
 #define BUSY_STATE   113    /* deflate -> FINISH_STATE */
 #define FINISH_STATE 666    /* stream complete */
-/* Stream status */ 
- 
- 
-/* Data structure describing a single value and its code string. */ 
-typedef struct ct_data_s { 
-    union { 
-        ush  freq;       /* frequency count */ 
-        ush  code;       /* bit string */ 
-    } fc; 
-    union { 
-        ush  dad;        /* father node in Huffman tree */ 
-        ush  len;        /* length of bit string */ 
-    } dl; 
-} FAR ct_data; 
- 
-#define Freq fc.freq 
-#define Code fc.code 
-#define Dad  dl.dad 
-#define Len  dl.len 
- 
-typedef struct static_tree_desc_s  static_tree_desc; 
- 
-typedef struct tree_desc_s { 
-    ct_data *dyn_tree;           /* the dynamic tree */ 
-    int     max_code;            /* largest code with non zero frequency */ 
+/* Stream status */
+
+
+/* Data structure describing a single value and its code string. */
+typedef struct ct_data_s {
+    union {
+        ush  freq;       /* frequency count */
+        ush  code;       /* bit string */
+    } fc;
+    union {
+        ush  dad;        /* father node in Huffman tree */
+        ush  len;        /* length of bit string */
+    } dl;
+} FAR ct_data;
+
+#define Freq fc.freq
+#define Code fc.code
+#define Dad  dl.dad
+#define Len  dl.len
+
+typedef struct static_tree_desc_s  static_tree_desc;
+
+typedef struct tree_desc_s {
+    ct_data *dyn_tree;           /* the dynamic tree */
+    int     max_code;            /* largest code with non zero frequency */
     const static_tree_desc *stat_desc;  /* the corresponding static tree */
-} FAR tree_desc; 
- 
-typedef ush Pos; 
-typedef Pos FAR Posf; 
-typedef unsigned IPos; 
- 
-/* A Pos is an index in the character window. We use short instead of int to 
- * save space in the various tables. IPos is used only for parameter passing. 
- */ 
- 
-typedef struct internal_state { 
-    z_streamp strm;      /* pointer back to this zlib stream */ 
-    int   status;        /* as the name implies */ 
-    Bytef *pending_buf;  /* output still pending */ 
-    ulg   pending_buf_size; /* size of pending_buf */ 
-    Bytef *pending_out;  /* next pending byte to output to the stream */ 
+} FAR tree_desc;
+
+typedef ush Pos;
+typedef Pos FAR Posf;
+typedef unsigned IPos;
+
+/* A Pos is an index in the character window. We use short instead of int to
+ * save space in the various tables. IPos is used only for parameter passing.
+ */
+
+typedef struct internal_state {
+    z_streamp strm;      /* pointer back to this zlib stream */
+    int   status;        /* as the name implies */
+    Bytef *pending_buf;  /* output still pending */
+    ulg   pending_buf_size; /* size of pending_buf */
+    Bytef *pending_out;  /* next pending byte to output to the stream */
     ulg   pending;       /* nb of bytes in the pending buffer */
-    int   wrap;          /* bit 0 true for zlib, bit 1 true for gzip */ 
-    gz_headerp  gzhead;  /* gzip header information to write */ 
+    int   wrap;          /* bit 0 true for zlib, bit 1 true for gzip */
+    gz_headerp  gzhead;  /* gzip header information to write */
     ulg   gzindex;       /* where in extra, name, or comment */
-    Byte  method;        /* can only be DEFLATED */ 
-    int   last_flush;    /* value of flush param for previous deflate call */ 
- 
-                /* used by deflate.c: */ 
- 
-    uInt  w_size;        /* LZ77 window size (32K by default) */ 
-    uInt  w_bits;        /* log2(w_size)  (8..16) */ 
-    uInt  w_mask;        /* w_size - 1 */ 
- 
-    Bytef *window; 
-    /* Sliding window. Input bytes are read into the second half of the window, 
-     * and move to the first half later to keep a dictionary of at least wSize 
-     * bytes. With this organization, matches are limited to a distance of 
-     * wSize-MAX_MATCH bytes, but this ensures that IO is always 
-     * performed with a length multiple of the block size. Also, it limits 
-     * the window size to 64K, which is quite useful on MSDOS. 
-     * To do: use the user input buffer as sliding window. 
-     */ 
- 
-    ulg window_size; 
-    /* Actual size of window: 2*wSize, except when the user input buffer 
-     * is directly used as sliding window. 
-     */ 
- 
-    Posf *prev; 
-    /* Link to older string with same hash index. To limit the size of this 
-     * array to 64K, this link is maintained only for the last 32K strings. 
-     * An index in this array is thus a window index modulo 32K. 
-     */ 
- 
-    Posf *head; /* Heads of the hash chains or NIL. */ 
- 
-    uInt  ins_h;          /* hash index of string to be inserted */ 
-    uInt  hash_size;      /* number of elements in hash table */ 
-    uInt  hash_bits;      /* log2(hash_size) */ 
-    uInt  hash_mask;      /* hash_size-1 */ 
- 
-    uInt  hash_shift; 
-    /* Number of bits by which ins_h must be shifted at each input 
-     * step. It must be such that after MIN_MATCH steps, the oldest 
-     * byte no longer takes part in the hash key, that is: 
-     *   hash_shift * MIN_MATCH >= hash_bits 
-     */ 
- 
-    long block_start; 
-    /* Window position at the beginning of the current output block. Gets 
-     * negative when the window is moved backwards. 
-     */ 
- 
-    uInt match_length;           /* length of best match */ 
-    IPos prev_match;             /* previous match */ 
-    int match_available;         /* set if previous match exists */ 
-    uInt strstart;               /* start of string to insert */ 
-    uInt match_start;            /* start of matching string */ 
-    uInt lookahead;              /* number of valid bytes ahead in window */ 
- 
-    uInt prev_length; 
-    /* Length of the best match at previous step. Matches not greater than this 
-     * are discarded. This is used in the lazy match evaluation. 
-     */ 
- 
-    uInt max_chain_length; 
-    /* To speed up deflation, hash chains are never searched beyond this 
-     * length.  A higher limit improves compression ratio but degrades the 
-     * speed. 
-     */ 
- 
-    uInt max_lazy_match; 
-    /* Attempt to find a better match only when the current match is strictly 
-     * smaller than this value. This mechanism is used only for compression 
-     * levels >= 4. 
-     */ 
-#   define max_insert_length  max_lazy_match 
-    /* Insert new strings in the hash table only if the match length is not 
-     * greater than this length. This saves time but degrades compression. 
-     * max_insert_length is used only for compression levels <= 3. 
-     */ 
- 
-    int level;    /* compression level (1..9) */ 
-    int strategy; /* favor or force Huffman coding*/ 
- 
-    uInt good_match; 
-    /* Use a faster search when the previous match is longer than this */ 
- 
-    int nice_match; /* Stop searching when current match exceeds this */ 
- 
-                /* used by trees.c: */ 
-    /* Didn't use ct_data typedef below to suppress compiler warning */ 
-    struct ct_data_s dyn_ltree[HEAP_SIZE];   /* literal and length tree */ 
-    struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */ 
-    struct ct_data_s bl_tree[2*BL_CODES+1];  /* Huffman tree for bit lengths */ 
- 
-    struct tree_desc_s l_desc;               /* desc. for literal tree */ 
-    struct tree_desc_s d_desc;               /* desc. for distance tree */ 
-    struct tree_desc_s bl_desc;              /* desc. for bit length tree */ 
- 
-    ush bl_count[MAX_BITS+1]; 
-    /* number of codes at each bit length for an optimal tree */ 
- 
-    int heap[2*L_CODES+1];      /* heap used to build the Huffman trees */ 
-    int heap_len;               /* number of elements in the heap */ 
-    int heap_max;               /* element of largest frequency */ 
-    /* The sons of heap[n] are heap[2*n] and heap[2*n+1]. heap[0] is not used. 
-     * The same heap array is used to build all trees. 
-     */ 
- 
-    uch depth[2*L_CODES+1]; 
-    /* Depth of each subtree used as tie breaker for trees of equal frequency 
-     */ 
- 
-    uchf *l_buf;          /* buffer for literals or lengths */ 
- 
-    uInt  lit_bufsize; 
-    /* Size of match buffer for literals/lengths.  There are 4 reasons for 
-     * limiting lit_bufsize to 64K: 
-     *   - frequencies can be kept in 16 bit counters 
-     *   - if compression is not successful for the first block, all input 
-     *     data is still in the window so we can still emit a stored block even 
-     *     when input comes from standard input.  (This can also be done for 
-     *     all blocks if lit_bufsize is not greater than 32K.) 
-     *   - if compression is not successful for a file smaller than 64K, we can 
-     *     even emit a stored file instead of a stored block (saving 5 bytes). 
-     *     This is applicable only for zip (not gzip or zlib). 
-     *   - creating new Huffman trees less frequently may not provide fast 
-     *     adaptation to changes in the input data statistics. (Take for 
-     *     example a binary file with poorly compressible code followed by 
-     *     a highly compressible string table.) Smaller buffer sizes give 
-     *     fast adaptation but have of course the overhead of transmitting 
-     *     trees more frequently. 
-     *   - I can't count above 4 
-     */ 
- 
-    uInt last_lit;      /* running index in l_buf */ 
- 
-    ushf *d_buf; 
-    /* Buffer for distances. To simplify the code, d_buf and l_buf have 
-     * the same number of elements. To use different lengths, an extra flag 
-     * array would be necessary. 
-     */ 
- 
-    ulg opt_len;        /* bit length of current block with optimal trees */ 
-    ulg static_len;     /* bit length of current block with static trees */ 
-    uInt matches;       /* number of string matches in current block */ 
-    uInt insert;        /* bytes at end of window left to insert */ 
- 
+    Byte  method;        /* can only be DEFLATED */
+    int   last_flush;    /* value of flush param for previous deflate call */
+
+                /* used by deflate.c: */
+
+    uInt  w_size;        /* LZ77 window size (32K by default) */
+    uInt  w_bits;        /* log2(w_size)  (8..16) */
+    uInt  w_mask;        /* w_size - 1 */
+
+    Bytef *window;
+    /* Sliding window. Input bytes are read into the second half of the window,
+     * and move to the first half later to keep a dictionary of at least wSize
+     * bytes. With this organization, matches are limited to a distance of
+     * wSize-MAX_MATCH bytes, but this ensures that IO is always
+     * performed with a length multiple of the block size. Also, it limits
+     * the window size to 64K, which is quite useful on MSDOS.
+     * To do: use the user input buffer as sliding window.
+     */
+
+    ulg window_size;
+    /* Actual size of window: 2*wSize, except when the user input buffer
+     * is directly used as sliding window.
+     */
+
+    Posf *prev;
+    /* Link to older string with same hash index. To limit the size of this
+     * array to 64K, this link is maintained only for the last 32K strings.
+     * An index in this array is thus a window index modulo 32K.
+     */
+
+    Posf *head; /* Heads of the hash chains or NIL. */
+
+    uInt  ins_h;          /* hash index of string to be inserted */
+    uInt  hash_size;      /* number of elements in hash table */
+    uInt  hash_bits;      /* log2(hash_size) */
+    uInt  hash_mask;      /* hash_size-1 */
+
+    uInt  hash_shift;
+    /* Number of bits by which ins_h must be shifted at each input
+     * step. It must be such that after MIN_MATCH steps, the oldest
+     * byte no longer takes part in the hash key, that is:
+     *   hash_shift * MIN_MATCH >= hash_bits
+     */
+
+    long block_start;
+    /* Window position at the beginning of the current output block. Gets
+     * negative when the window is moved backwards.
+     */
+
+    uInt match_length;           /* length of best match */
+    IPos prev_match;             /* previous match */
+    int match_available;         /* set if previous match exists */
+    uInt strstart;               /* start of string to insert */
+    uInt match_start;            /* start of matching string */
+    uInt lookahead;              /* number of valid bytes ahead in window */
+
+    uInt prev_length;
+    /* Length of the best match at previous step. Matches not greater than this
+     * are discarded. This is used in the lazy match evaluation.
+     */
+
+    uInt max_chain_length;
+    /* To speed up deflation, hash chains are never searched beyond this
+     * length.  A higher limit improves compression ratio but degrades the
+     * speed.
+     */
+
+    uInt max_lazy_match;
+    /* Attempt to find a better match only when the current match is strictly
+     * smaller than this value. This mechanism is used only for compression
+     * levels >= 4.
+     */
+#   define max_insert_length  max_lazy_match
+    /* Insert new strings in the hash table only if the match length is not
+     * greater than this length. This saves time but degrades compression.
+     * max_insert_length is used only for compression levels <= 3.
+     */
+
+    int level;    /* compression level (1..9) */
+    int strategy; /* favor or force Huffman coding*/
+
+    uInt good_match;
+    /* Use a faster search when the previous match is longer than this */
+
+    int nice_match; /* Stop searching when current match exceeds this */
+
+                /* used by trees.c: */
+    /* Didn't use ct_data typedef below to suppress compiler warning */
+    struct ct_data_s dyn_ltree[HEAP_SIZE];   /* literal and length tree */
+    struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */
+    struct ct_data_s bl_tree[2*BL_CODES+1];  /* Huffman tree for bit lengths */
+
+    struct tree_desc_s l_desc;               /* desc. for literal tree */
+    struct tree_desc_s d_desc;               /* desc. for distance tree */
+    struct tree_desc_s bl_desc;              /* desc. for bit length tree */
+
+    ush bl_count[MAX_BITS+1];
+    /* number of codes at each bit length for an optimal tree */
+
+    int heap[2*L_CODES+1];      /* heap used to build the Huffman trees */
+    int heap_len;               /* number of elements in the heap */
+    int heap_max;               /* element of largest frequency */
+    /* The sons of heap[n] are heap[2*n] and heap[2*n+1]. heap[0] is not used.
+     * The same heap array is used to build all trees.
+     */
+
+    uch depth[2*L_CODES+1];
+    /* Depth of each subtree used as tie breaker for trees of equal frequency
+     */
+
+    uchf *l_buf;          /* buffer for literals or lengths */
+
+    uInt  lit_bufsize;
+    /* Size of match buffer for literals/lengths.  There are 4 reasons for
+     * limiting lit_bufsize to 64K:
+     *   - frequencies can be kept in 16 bit counters
+     *   - if compression is not successful for the first block, all input
+     *     data is still in the window so we can still emit a stored block even
+     *     when input comes from standard input.  (This can also be done for
+     *     all blocks if lit_bufsize is not greater than 32K.)
+     *   - if compression is not successful for a file smaller than 64K, we can
+     *     even emit a stored file instead of a stored block (saving 5 bytes).
+     *     This is applicable only for zip (not gzip or zlib).
+     *   - creating new Huffman trees less frequently may not provide fast
+     *     adaptation to changes in the input data statistics. (Take for
+     *     example a binary file with poorly compressible code followed by
+     *     a highly compressible string table.) Smaller buffer sizes give
+     *     fast adaptation but have of course the overhead of transmitting
+     *     trees more frequently.
+     *   - I can't count above 4
+     */
+
+    uInt last_lit;      /* running index in l_buf */
+
+    ushf *d_buf;
+    /* Buffer for distances. To simplify the code, d_buf and l_buf have
+     * the same number of elements. To use different lengths, an extra flag
+     * array would be necessary.
+     */
+
+    ulg opt_len;        /* bit length of current block with optimal trees */
+    ulg static_len;     /* bit length of current block with static trees */
+    uInt matches;       /* number of string matches in current block */
+    uInt insert;        /* bytes at end of window left to insert */
+
 #ifdef ZLIB_DEBUG
-    ulg compressed_len; /* total bit length of compressed file mod 2^32 */ 
-    ulg bits_sent;      /* bit length of compressed data sent mod 2^32 */ 
-#endif 
- 
-    ush bi_buf; 
-    /* Output buffer. bits are inserted starting at the bottom (least 
-     * significant bits). 
-     */ 
-    int bi_valid; 
-    /* Number of valid bits in bi_buf.  All bits above the last valid bit 
-     * are always zero. 
-     */ 
- 
-    ulg high_water; 
-    /* High water mark offset in window for initialized bytes -- bytes above 
-     * this are set to zero in order to avoid memory check warnings when 
-     * longest match routines access bytes past the input.  This is then 
-     * updated to the new high water mark. 
-     */ 
- 
-} FAR deflate_state; 
- 
-/* Output a byte on the stream. 
- * IN assertion: there is enough room in pending_buf. 
- */ 
+    ulg compressed_len; /* total bit length of compressed file mod 2^32 */
+    ulg bits_sent;      /* bit length of compressed data sent mod 2^32 */
+#endif
+
+    ush bi_buf;
+    /* Output buffer. bits are inserted starting at the bottom (least
+     * significant bits).
+     */
+    int bi_valid;
+    /* Number of valid bits in bi_buf.  All bits above the last valid bit
+     * are always zero.
+     */
+
+    ulg high_water;
+    /* High water mark offset in window for initialized bytes -- bytes above
+     * this are set to zero in order to avoid memory check warnings when
+     * longest match routines access bytes past the input.  This is then
+     * updated to the new high water mark.
+     */
+
+} FAR deflate_state;
+
+/* Output a byte on the stream.
+ * IN assertion: there is enough room in pending_buf.
+ */
 #define put_byte(s, c) {s->pending_buf[s->pending++] = (Bytef)(c);}
- 
- 
-#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1) 
-/* Minimum amount of lookahead, except at the end of the input file. 
- * See deflate.c for comments about the MIN_MATCH+1. 
- */ 
- 
-#define MAX_DIST(s)  ((s)->w_size-MIN_LOOKAHEAD) 
-/* In order to simplify the code, particularly on 16 bit machines, match 
- * distances are limited to MAX_DIST instead of WSIZE. 
- */ 
- 
-#define WIN_INIT MAX_MATCH 
-/* Number of bytes after end of data in window to initialize in order to avoid 
-   memory checker errors from longest match routines */ 
- 
-        /* in trees.c */ 
-void ZLIB_INTERNAL _tr_init OF((deflate_state *s)); 
-int ZLIB_INTERNAL _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc)); 
-void ZLIB_INTERNAL _tr_flush_block OF((deflate_state *s, charf *buf, 
-                        ulg stored_len, int last)); 
-void ZLIB_INTERNAL _tr_flush_bits OF((deflate_state *s)); 
-void ZLIB_INTERNAL _tr_align OF((deflate_state *s)); 
-void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf, 
-                        ulg stored_len, int last)); 
- 
-#define d_code(dist) \ 
-   ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)]) 
-/* Mapping from a distance to a distance code. dist is the distance - 1 and 
- * must not have side effects. _dist_code[256] and _dist_code[257] are never 
- * used. 
- */ 
- 
+
+
+#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1)
+/* Minimum amount of lookahead, except at the end of the input file.
+ * See deflate.c for comments about the MIN_MATCH+1.
+ */
+
+#define MAX_DIST(s)  ((s)->w_size-MIN_LOOKAHEAD)
+/* In order to simplify the code, particularly on 16 bit machines, match
+ * distances are limited to MAX_DIST instead of WSIZE.
+ */
+
+#define WIN_INIT MAX_MATCH
+/* Number of bytes after end of data in window to initialize in order to avoid
+   memory checker errors from longest match routines */
+
+        /* in trees.c */
+void ZLIB_INTERNAL _tr_init OF((deflate_state *s));
+int ZLIB_INTERNAL _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc));
+void ZLIB_INTERNAL _tr_flush_block OF((deflate_state *s, charf *buf,
+                        ulg stored_len, int last));
+void ZLIB_INTERNAL _tr_flush_bits OF((deflate_state *s));
+void ZLIB_INTERNAL _tr_align OF((deflate_state *s));
+void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
+                        ulg stored_len, int last));
+
+#define d_code(dist) \
+   ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)])
+/* Mapping from a distance to a distance code. dist is the distance - 1 and
+ * must not have side effects. _dist_code[256] and _dist_code[257] are never
+ * used.
+ */
+
 #ifndef ZLIB_DEBUG
-/* Inline versions of _tr_tally for speed: */ 
- 
-#if defined(GEN_TREES_H) || !defined(STDC) 
-  extern uch ZLIB_INTERNAL _length_code[]; 
-  extern uch ZLIB_INTERNAL _dist_code[]; 
-#else 
-  extern const uch ZLIB_INTERNAL _length_code[]; 
-  extern const uch ZLIB_INTERNAL _dist_code[]; 
-#endif 
- 
-# define _tr_tally_lit(s, c, flush) \ 
-  { uch cc = (c); \ 
-    s->d_buf[s->last_lit] = 0; \ 
-    s->l_buf[s->last_lit++] = cc; \ 
-    s->dyn_ltree[cc].Freq++; \ 
-    flush = (s->last_lit == s->lit_bufsize-1); \ 
-   } 
-# define _tr_tally_dist(s, distance, length, flush) \ 
+/* Inline versions of _tr_tally for speed: */
+
+#if defined(GEN_TREES_H) || !defined(STDC)
+  extern uch ZLIB_INTERNAL _length_code[];
+  extern uch ZLIB_INTERNAL _dist_code[];
+#else
+  extern const uch ZLIB_INTERNAL _length_code[];
+  extern const uch ZLIB_INTERNAL _dist_code[];
+#endif
+
+# define _tr_tally_lit(s, c, flush) \
+  { uch cc = (c); \
+    s->d_buf[s->last_lit] = 0; \
+    s->l_buf[s->last_lit++] = cc; \
+    s->dyn_ltree[cc].Freq++; \
+    flush = (s->last_lit == s->lit_bufsize-1); \
+   }
+# define _tr_tally_dist(s, distance, length, flush) \
   { uch len = (uch)(length); \
     ush dist = (ush)(distance); \
-    s->d_buf[s->last_lit] = dist; \ 
-    s->l_buf[s->last_lit++] = len; \ 
-    dist--; \ 
-    s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \ 
-    s->dyn_dtree[d_code(dist)].Freq++; \ 
-    flush = (s->last_lit == s->lit_bufsize-1); \ 
-  } 
-#else 
-# define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c) 
-# define _tr_tally_dist(s, distance, length, flush) \ 
-              flush = _tr_tally(s, distance, length) 
-#endif 
+    s->d_buf[s->last_lit] = dist; \
+    s->l_buf[s->last_lit++] = len; \
+    dist--; \
+    s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \
+    s->dyn_dtree[d_code(dist)].Freq++; \
+    flush = (s->last_lit == s->lit_bufsize-1); \
+  }
+#else
+# define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c)
+# define _tr_tally_dist(s, distance, length, flush) \
+              flush = _tr_tally(s, distance, length)
+#endif
 
 #endif /* DEFLATE_H */
diff --git a/contrib/libs/zlib/dynamic/ya.make b/contrib/libs/zlib/dynamic/ya.make
index 590e2835fb..e112ea9979 100644
--- a/contrib/libs/zlib/dynamic/ya.make
+++ b/contrib/libs/zlib/dynamic/ya.make
@@ -2,4 +2,4 @@ OWNER(
     g:contrib
     g:cpp-contrib
 )
-DLL_FOR(contrib/libs/zlib) 
+DLL_FOR(contrib/libs/zlib)
diff --git a/contrib/libs/zlib/gzclose.c b/contrib/libs/zlib/gzclose.c
index ea07134138..caeb99a317 100644
--- a/contrib/libs/zlib/gzclose.c
+++ b/contrib/libs/zlib/gzclose.c
@@ -1,25 +1,25 @@
-/* gzclose.c -- zlib gzclose() function 
- * Copyright (C) 2004, 2010 Mark Adler 
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */ 
- 
-#include "gzguts.h" 
- 
-/* gzclose() is in a separate file so that it is linked in only if it is used. 
-   That way the other gzclose functions can be used instead to avoid linking in 
-   unneeded compression or decompression routines. */ 
-int ZEXPORT gzclose(file) 
-    gzFile file; 
-{ 
-#ifndef NO_GZCOMPRESS 
-    gz_statep state; 
- 
-    if (file == NULL) 
-        return Z_STREAM_ERROR; 
-    state = (gz_statep)file; 
- 
-    return state->mode == GZ_READ ? gzclose_r(file) : gzclose_w(file); 
-#else 
-    return gzclose_r(file); 
-#endif 
-} 
+/* gzclose.c -- zlib gzclose() function
+ * Copyright (C) 2004, 2010 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "gzguts.h"
+
+/* gzclose() is in a separate file so that it is linked in only if it is used.
+   That way the other gzclose functions can be used instead to avoid linking in
+   unneeded compression or decompression routines. */
+int ZEXPORT gzclose(file)
+    gzFile file;
+{
+#ifndef NO_GZCOMPRESS
+    gz_statep state;
+
+    if (file == NULL)
+        return Z_STREAM_ERROR;
+    state = (gz_statep)file;
+
+    return state->mode == GZ_READ ? gzclose_r(file) : gzclose_w(file);
+#else
+    return gzclose_r(file);
+#endif
+}
diff --git a/contrib/libs/zlib/gzguts.h b/contrib/libs/zlib/gzguts.h
index 6fc373c577..2b7382f654 100644
--- a/contrib/libs/zlib/gzguts.h
+++ b/contrib/libs/zlib/gzguts.h
@@ -1,220 +1,220 @@
-/* gzguts.h -- zlib internal header definitions for gz* operations 
+/* gzguts.h -- zlib internal header definitions for gz* operations
  * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */ 
- 
-#ifdef _LARGEFILE64_SOURCE 
-#  ifndef _LARGEFILE_SOURCE 
-#    define _LARGEFILE_SOURCE 1 
-#  endif 
-#  ifdef _FILE_OFFSET_BITS 
-#    undef _FILE_OFFSET_BITS 
-#  endif 
-#endif 
- 
-#ifdef HAVE_HIDDEN 
-#  define ZLIB_INTERNAL __attribute__((visibility ("hidden"))) 
-#else 
-#  define ZLIB_INTERNAL 
-#endif 
- 
-#include <stdio.h> 
-#include "zlib.h" 
-#ifdef STDC 
-#  include <string.h> 
-#  include <stdlib.h> 
-#  include <limits.h> 
-#endif 
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#ifdef _LARGEFILE64_SOURCE
+#  ifndef _LARGEFILE_SOURCE
+#    define _LARGEFILE_SOURCE 1
+#  endif
+#  ifdef _FILE_OFFSET_BITS
+#    undef _FILE_OFFSET_BITS
+#  endif
+#endif
+
+#ifdef HAVE_HIDDEN
+#  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
+#else
+#  define ZLIB_INTERNAL
+#endif
+
+#include <stdio.h>
+#include "zlib.h"
+#ifdef STDC
+#  include <string.h>
+#  include <stdlib.h>
+#  include <limits.h>
+#endif
 
 #ifndef _POSIX_SOURCE
 #  define _POSIX_SOURCE
 #endif
-#include <fcntl.h> 
- 
-#ifdef _WIN32 
-#  include <stddef.h> 
+#include <fcntl.h>
+
+#ifdef _WIN32
+#  include <stddef.h>
 #else
 #  include <unistd.h>
-#endif 
- 
-#if defined(__TURBOC__) || defined(_MSC_VER) || defined(_WIN32) 
-#  include <io.h> 
-#endif 
- 
+#endif
+
+#if defined(__TURBOC__) || defined(_MSC_VER) || defined(_WIN32)
+#  include <io.h>
+#endif
+
 #if defined(_WIN32) || defined(__CYGWIN__)
 #  define WIDECHAR
 #endif
 
-#ifdef WINAPI_FAMILY 
-#  define open _open 
-#  define read _read 
-#  define write _write 
-#  define close _close 
-#endif 
- 
-#ifdef NO_DEFLATE       /* for compatibility with old definition */ 
-#  define NO_GZCOMPRESS 
-#endif 
- 
-#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550) 
-#  ifndef HAVE_VSNPRINTF 
-#    define HAVE_VSNPRINTF 
-#  endif 
-#endif 
- 
-#if defined(__CYGWIN__) 
-#  ifndef HAVE_VSNPRINTF 
-#    define HAVE_VSNPRINTF 
-#  endif 
-#endif 
- 
-#if defined(MSDOS) && defined(__BORLANDC__) && (BORLANDC > 0x410) 
-#  ifndef HAVE_VSNPRINTF 
-#    define HAVE_VSNPRINTF 
-#  endif 
-#endif 
- 
-#ifndef HAVE_VSNPRINTF 
-#  ifdef MSDOS 
-/* vsnprintf may exist on some MS-DOS compilers (DJGPP?), 
-   but for now we just assume it doesn't. */ 
-#    define NO_vsnprintf 
-#  endif 
-#  ifdef __TURBOC__ 
-#    define NO_vsnprintf 
-#  endif 
-#  ifdef WIN32 
-/* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */ 
-#    if !defined(vsnprintf) && !defined(NO_vsnprintf) 
-#      if !defined(_MSC_VER) || ( defined(_MSC_VER) && _MSC_VER < 1500 ) 
-#         define vsnprintf _vsnprintf 
-#      endif 
-#    endif 
-#  endif 
-#  ifdef __SASC 
-#    define NO_vsnprintf 
-#  endif 
-#  ifdef VMS 
-#    define NO_vsnprintf 
-#  endif 
-#  ifdef __OS400__ 
-#    define NO_vsnprintf 
-#  endif 
-#  ifdef __MVS__ 
-#    define NO_vsnprintf 
-#  endif 
-#endif 
- 
+#ifdef WINAPI_FAMILY
+#  define open _open
+#  define read _read
+#  define write _write
+#  define close _close
+#endif
+
+#ifdef NO_DEFLATE       /* for compatibility with old definition */
+#  define NO_GZCOMPRESS
+#endif
+
+#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550)
+#  ifndef HAVE_VSNPRINTF
+#    define HAVE_VSNPRINTF
+#  endif
+#endif
+
+#if defined(__CYGWIN__)
+#  ifndef HAVE_VSNPRINTF
+#    define HAVE_VSNPRINTF
+#  endif
+#endif
+
+#if defined(MSDOS) && defined(__BORLANDC__) && (BORLANDC > 0x410)
+#  ifndef HAVE_VSNPRINTF
+#    define HAVE_VSNPRINTF
+#  endif
+#endif
+
+#ifndef HAVE_VSNPRINTF
+#  ifdef MSDOS
+/* vsnprintf may exist on some MS-DOS compilers (DJGPP?),
+   but for now we just assume it doesn't. */
+#    define NO_vsnprintf
+#  endif
+#  ifdef __TURBOC__
+#    define NO_vsnprintf
+#  endif
+#  ifdef WIN32
+/* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */
+#    if !defined(vsnprintf) && !defined(NO_vsnprintf)
+#      if !defined(_MSC_VER) || ( defined(_MSC_VER) && _MSC_VER < 1500 )
+#         define vsnprintf _vsnprintf
+#      endif
+#    endif
+#  endif
+#  ifdef __SASC
+#    define NO_vsnprintf
+#  endif
+#  ifdef VMS
+#    define NO_vsnprintf
+#  endif
+#  ifdef __OS400__
+#    define NO_vsnprintf
+#  endif
+#  ifdef __MVS__
+#    define NO_vsnprintf
+#  endif
+#endif
+
 /* unlike snprintf (which is required in C99), _snprintf does not guarantee
    null termination of the result -- however this is only used in gzlib.c where
-   the result is assured to fit in the space provided */ 
+   the result is assured to fit in the space provided */
 #if defined(_MSC_VER) && _MSC_VER < 1900
-#  define snprintf _snprintf 
-#endif 
- 
-#ifndef local 
-#  define local static 
-#endif 
+#  define snprintf _snprintf
+#endif
+
+#ifndef local
+#  define local static
+#endif
 /* since "static" is used to mean two completely different things in C, we
    define "local" for the non-static meaning of "static", for readability
    (compile with -Dlocal if your debugger can't find static symbols) */
- 
-/* gz* functions always use library allocation functions */ 
-#ifndef STDC 
-  extern voidp  malloc OF((uInt size)); 
-  extern void   free   OF((voidpf ptr)); 
-#endif 
- 
-/* get errno and strerror definition */ 
-#if defined UNDER_CE 
-#  include <windows.h> 
-#  define zstrerror() gz_strwinerror((DWORD)GetLastError()) 
-#else 
-#  ifndef NO_STRERROR 
-#    include <errno.h> 
-#    define zstrerror() strerror(errno) 
-#  else 
-#    define zstrerror() "stdio error (consult errno)" 
-#  endif 
-#endif 
- 
-/* provide prototypes for these when building zlib without LFS */ 
-#if !defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0 
-    ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); 
-    ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int)); 
-    ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile)); 
-    ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile)); 
-#endif 
- 
-/* default memLevel */ 
-#if MAX_MEM_LEVEL >= 8 
-#  define DEF_MEM_LEVEL 8 
-#else 
-#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL 
-#endif 
- 
-/* default i/o buffer size -- double this for output when reading (this and 
-   twice this must be able to fit in an unsigned type) */ 
-#define GZBUFSIZE 8192 
- 
-/* gzip modes, also provide a little integrity check on the passed structure */ 
-#define GZ_NONE 0 
-#define GZ_READ 7247 
-#define GZ_WRITE 31153 
-#define GZ_APPEND 1     /* mode set to GZ_WRITE after the file is opened */ 
- 
-/* values for gz_state how */ 
-#define LOOK 0      /* look for a gzip header */ 
-#define COPY 1      /* copy input directly */ 
-#define GZIP 2      /* decompress a gzip stream */ 
- 
-/* internal gzip file state data structure */ 
-typedef struct { 
-        /* exposed contents for gzgetc() macro */ 
-    struct gzFile_s x;      /* "x" for exposed */ 
-                            /* x.have: number of bytes available at x.next */ 
-                            /* x.next: next output data to deliver or write */ 
-                            /* x.pos: current position in uncompressed data */ 
-        /* used for both reading and writing */ 
-    int mode;               /* see gzip modes above */ 
-    int fd;                 /* file descriptor */ 
-    char *path;             /* path or fd for error messages */ 
-    unsigned size;          /* buffer size, zero if not allocated yet */ 
-    unsigned want;          /* requested buffer size, default is GZBUFSIZE */ 
+
+/* gz* functions always use library allocation functions */
+#ifndef STDC
+  extern voidp  malloc OF((uInt size));
+  extern void   free   OF((voidpf ptr));
+#endif
+
+/* get errno and strerror definition */
+#if defined UNDER_CE
+#  include <windows.h>
+#  define zstrerror() gz_strwinerror((DWORD)GetLastError())
+#else
+#  ifndef NO_STRERROR
+#    include <errno.h>
+#    define zstrerror() strerror(errno)
+#  else
+#    define zstrerror() "stdio error (consult errno)"
+#  endif
+#endif
+
+/* provide prototypes for these when building zlib without LFS */
+#if !defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0
+    ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
+    ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
+    ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
+    ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
+#endif
+
+/* default memLevel */
+#if MAX_MEM_LEVEL >= 8
+#  define DEF_MEM_LEVEL 8
+#else
+#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
+#endif
+
+/* default i/o buffer size -- double this for output when reading (this and
+   twice this must be able to fit in an unsigned type) */
+#define GZBUFSIZE 8192
+
+/* gzip modes, also provide a little integrity check on the passed structure */
+#define GZ_NONE 0
+#define GZ_READ 7247
+#define GZ_WRITE 31153
+#define GZ_APPEND 1     /* mode set to GZ_WRITE after the file is opened */
+
+/* values for gz_state how */
+#define LOOK 0      /* look for a gzip header */
+#define COPY 1      /* copy input directly */
+#define GZIP 2      /* decompress a gzip stream */
+
+/* internal gzip file state data structure */
+typedef struct {
+        /* exposed contents for gzgetc() macro */
+    struct gzFile_s x;      /* "x" for exposed */
+                            /* x.have: number of bytes available at x.next */
+                            /* x.next: next output data to deliver or write */
+                            /* x.pos: current position in uncompressed data */
+        /* used for both reading and writing */
+    int mode;               /* see gzip modes above */
+    int fd;                 /* file descriptor */
+    char *path;             /* path or fd for error messages */
+    unsigned size;          /* buffer size, zero if not allocated yet */
+    unsigned want;          /* requested buffer size, default is GZBUFSIZE */
     unsigned char *in;      /* input buffer (double-sized when writing) */
-    unsigned char *out;     /* output buffer (double-sized when reading) */ 
-    int direct;             /* 0 if processing gzip, 1 if transparent */ 
-        /* just for reading */ 
-    int how;                /* 0: get header, 1: copy, 2: decompress */ 
-    z_off64_t start;        /* where the gzip data started, for rewinding */ 
-    int eof;                /* true if end of input file reached */ 
-    int past;               /* true if read requested past end */ 
-        /* just for writing */ 
-    int level;              /* compression level */ 
-    int strategy;           /* compression strategy */ 
-        /* seek request */ 
-    z_off64_t skip;         /* amount to skip (already rewound if backwards) */ 
-    int seek;               /* true if seek request pending */ 
-        /* error information */ 
-    int err;                /* error code */ 
-    char *msg;              /* error message */ 
-        /* zlib inflate or deflate stream */ 
-    z_stream strm;          /* stream structure in-place (not a pointer) */ 
-} gz_state; 
-typedef gz_state FAR *gz_statep; 
- 
-/* shared functions */ 
-void ZLIB_INTERNAL gz_error OF((gz_statep, int, const char *)); 
-#if defined UNDER_CE 
-char ZLIB_INTERNAL *gz_strwinerror OF((DWORD error)); 
-#endif 
- 
-/* GT_OFF(x), where x is an unsigned value, is true if x > maximum z_off64_t 
-   value -- needed when comparing unsigned to z_off64_t, which is signed 
-   (possible z_off64_t types off_t, off64_t, and long are all signed) */ 
-#ifdef INT_MAX 
-#  define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > INT_MAX) 
-#else 
-unsigned ZLIB_INTERNAL gz_intmax OF((void)); 
-#  define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > gz_intmax()) 
-#endif 
+    unsigned char *out;     /* output buffer (double-sized when reading) */
+    int direct;             /* 0 if processing gzip, 1 if transparent */
+        /* just for reading */
+    int how;                /* 0: get header, 1: copy, 2: decompress */
+    z_off64_t start;        /* where the gzip data started, for rewinding */
+    int eof;                /* true if end of input file reached */
+    int past;               /* true if read requested past end */
+        /* just for writing */
+    int level;              /* compression level */
+    int strategy;           /* compression strategy */
+        /* seek request */
+    z_off64_t skip;         /* amount to skip (already rewound if backwards) */
+    int seek;               /* true if seek request pending */
+        /* error information */
+    int err;                /* error code */
+    char *msg;              /* error message */
+        /* zlib inflate or deflate stream */
+    z_stream strm;          /* stream structure in-place (not a pointer) */
+} gz_state;
+typedef gz_state FAR *gz_statep;
+
+/* shared functions */
+void ZLIB_INTERNAL gz_error OF((gz_statep, int, const char *));
+#if defined UNDER_CE
+char ZLIB_INTERNAL *gz_strwinerror OF((DWORD error));
+#endif
+
+/* GT_OFF(x), where x is an unsigned value, is true if x > maximum z_off64_t
+   value -- needed when comparing unsigned to z_off64_t, which is signed
+   (possible z_off64_t types off_t, off64_t, and long are all signed) */
+#ifdef INT_MAX
+#  define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > INT_MAX)
+#else
+unsigned ZLIB_INTERNAL gz_intmax OF((void));
+#  define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > gz_intmax())
+#endif
diff --git a/contrib/libs/zlib/gzlib.c b/contrib/libs/zlib/gzlib.c
index 07873cb5e4..4105e6aff9 100644
--- a/contrib/libs/zlib/gzlib.c
+++ b/contrib/libs/zlib/gzlib.c
@@ -1,637 +1,637 @@
-/* gzlib.c -- zlib functions common to reading and writing gzip files 
+/* gzlib.c -- zlib functions common to reading and writing gzip files
  * Copyright (C) 2004-2017 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */ 
- 
-#include "gzguts.h" 
- 
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "gzguts.h"
+
 #if defined(_WIN32) && !defined(__BORLANDC__) && !defined(__MINGW32__)
-#  define LSEEK _lseeki64 
-#else 
-#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0 
-#  define LSEEK lseek64 
-#else 
-#  define LSEEK lseek 
-#endif 
-#endif 
- 
-/* Local functions */ 
-local void gz_reset OF((gz_statep)); 
-local gzFile gz_open OF((const void *, int, const char *)); 
- 
-#if defined UNDER_CE 
- 
-/* Map the Windows error number in ERROR to a locale-dependent error message 
-   string and return a pointer to it.  Typically, the values for ERROR come 
-   from GetLastError. 
- 
-   The string pointed to shall not be modified by the application, but may be 
-   overwritten by a subsequent call to gz_strwinerror 
- 
-   The gz_strwinerror function does not change the current setting of 
-   GetLastError. */ 
-char ZLIB_INTERNAL *gz_strwinerror (error) 
-     DWORD error; 
-{ 
-    static char buf[1024]; 
- 
-    wchar_t *msgbuf; 
-    DWORD lasterr = GetLastError(); 
-    DWORD chars = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM 
-        | FORMAT_MESSAGE_ALLOCATE_BUFFER, 
-        NULL, 
-        error, 
-        0, /* Default language */ 
-        (LPVOID)&msgbuf, 
-        0, 
-        NULL); 
-    if (chars != 0) { 
-        /* If there is an \r\n appended, zap it.  */ 
-        if (chars >= 2 
-            && msgbuf[chars - 2] == '\r' && msgbuf[chars - 1] == '\n') { 
-            chars -= 2; 
-            msgbuf[chars] = 0; 
-        } 
- 
-        if (chars > sizeof (buf) - 1) { 
-            chars = sizeof (buf) - 1; 
-            msgbuf[chars] = 0; 
-        } 
- 
-        wcstombs(buf, msgbuf, chars + 1); 
-        LocalFree(msgbuf); 
-    } 
-    else { 
-        sprintf(buf, "unknown win32 error (%ld)", error); 
-    } 
- 
-    SetLastError(lasterr); 
-    return buf; 
-} 
- 
-#endif /* UNDER_CE */ 
- 
-/* Reset gzip file state */ 
-local void gz_reset(state) 
-    gz_statep state; 
-{ 
-    state->x.have = 0;              /* no output data available */ 
-    if (state->mode == GZ_READ) {   /* for reading ... */ 
-        state->eof = 0;             /* not at end of file */ 
-        state->past = 0;            /* have not read past end yet */ 
-        state->how = LOOK;          /* look for gzip header */ 
-    } 
-    state->seek = 0;                /* no seek request pending */ 
-    gz_error(state, Z_OK, NULL);    /* clear error */ 
-    state->x.pos = 0;               /* no uncompressed data yet */ 
-    state->strm.avail_in = 0;       /* no input data yet */ 
-} 
- 
-/* Open a gzip file either by name or file descriptor. */ 
-local gzFile gz_open(path, fd, mode) 
-    const void *path; 
-    int fd; 
-    const char *mode; 
-{ 
-    gz_statep state; 
+#  define LSEEK _lseeki64
+#else
+#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
+#  define LSEEK lseek64
+#else
+#  define LSEEK lseek
+#endif
+#endif
+
+/* Local functions */
+local void gz_reset OF((gz_statep));
+local gzFile gz_open OF((const void *, int, const char *));
+
+#if defined UNDER_CE
+
+/* Map the Windows error number in ERROR to a locale-dependent error message
+   string and return a pointer to it.  Typically, the values for ERROR come
+   from GetLastError.
+
+   The string pointed to shall not be modified by the application, but may be
+   overwritten by a subsequent call to gz_strwinerror
+
+   The gz_strwinerror function does not change the current setting of
+   GetLastError. */
+char ZLIB_INTERNAL *gz_strwinerror (error)
+     DWORD error;
+{
+    static char buf[1024];
+
+    wchar_t *msgbuf;
+    DWORD lasterr = GetLastError();
+    DWORD chars = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM
+        | FORMAT_MESSAGE_ALLOCATE_BUFFER,
+        NULL,
+        error,
+        0, /* Default language */
+        (LPVOID)&msgbuf,
+        0,
+        NULL);
+    if (chars != 0) {
+        /* If there is an \r\n appended, zap it.  */
+        if (chars >= 2
+            && msgbuf[chars - 2] == '\r' && msgbuf[chars - 1] == '\n') {
+            chars -= 2;
+            msgbuf[chars] = 0;
+        }
+
+        if (chars > sizeof (buf) - 1) {
+            chars = sizeof (buf) - 1;
+            msgbuf[chars] = 0;
+        }
+
+        wcstombs(buf, msgbuf, chars + 1);
+        LocalFree(msgbuf);
+    }
+    else {
+        sprintf(buf, "unknown win32 error (%ld)", error);
+    }
+
+    SetLastError(lasterr);
+    return buf;
+}
+
+#endif /* UNDER_CE */
+
+/* Reset gzip file state */
+local void gz_reset(state)
+    gz_statep state;
+{
+    state->x.have = 0;              /* no output data available */
+    if (state->mode == GZ_READ) {   /* for reading ... */
+        state->eof = 0;             /* not at end of file */
+        state->past = 0;            /* have not read past end yet */
+        state->how = LOOK;          /* look for gzip header */
+    }
+    state->seek = 0;                /* no seek request pending */
+    gz_error(state, Z_OK, NULL);    /* clear error */
+    state->x.pos = 0;               /* no uncompressed data yet */
+    state->strm.avail_in = 0;       /* no input data yet */
+}
+
+/* Open a gzip file either by name or file descriptor. */
+local gzFile gz_open(path, fd, mode)
+    const void *path;
+    int fd;
+    const char *mode;
+{
+    gz_statep state;
     z_size_t len;
-    int oflag; 
-#ifdef O_CLOEXEC 
-    int cloexec = 0; 
-#endif 
-#ifdef O_EXCL 
-    int exclusive = 0; 
-#endif 
- 
-    /* check input */ 
-    if (path == NULL) 
-        return NULL; 
- 
-    /* allocate gzFile structure to return */ 
-    state = (gz_statep)malloc(sizeof(gz_state)); 
-    if (state == NULL) 
-        return NULL; 
-    state->size = 0;            /* no buffers allocated yet */ 
-    state->want = GZBUFSIZE;    /* requested buffer size */ 
-    state->msg = NULL;          /* no error message yet */ 
- 
-    /* interpret mode */ 
-    state->mode = GZ_NONE; 
-    state->level = Z_DEFAULT_COMPRESSION; 
-    state->strategy = Z_DEFAULT_STRATEGY; 
-    state->direct = 0; 
-    while (*mode) { 
-        if (*mode >= '0' && *mode <= '9') 
-            state->level = *mode - '0'; 
-        else 
-            switch (*mode) { 
-            case 'r': 
-                state->mode = GZ_READ; 
-                break; 
-#ifndef NO_GZCOMPRESS 
-            case 'w': 
-                state->mode = GZ_WRITE; 
-                break; 
-            case 'a': 
-                state->mode = GZ_APPEND; 
-                break; 
-#endif 
-            case '+':       /* can't read and write at the same time */ 
-                free(state); 
-                return NULL; 
-            case 'b':       /* ignore -- will request binary anyway */ 
-                break; 
-#ifdef O_CLOEXEC 
-            case 'e': 
-                cloexec = 1; 
-                break; 
-#endif 
-#ifdef O_EXCL 
-            case 'x': 
-                exclusive = 1; 
-                break; 
-#endif 
-            case 'f': 
-                state->strategy = Z_FILTERED; 
-                break; 
-            case 'h': 
-                state->strategy = Z_HUFFMAN_ONLY; 
-                break; 
-            case 'R': 
-                state->strategy = Z_RLE; 
-                break; 
-            case 'F': 
-                state->strategy = Z_FIXED; 
-                break; 
-            case 'T': 
-                state->direct = 1; 
-                break; 
-            default:        /* could consider as an error, but just ignore */ 
-                ; 
-            } 
-        mode++; 
-    } 
- 
-    /* must provide an "r", "w", or "a" */ 
-    if (state->mode == GZ_NONE) { 
-        free(state); 
-        return NULL; 
-    } 
- 
-    /* can't force transparent read */ 
-    if (state->mode == GZ_READ) { 
-        if (state->direct) { 
-            free(state); 
-            return NULL; 
-        } 
-        state->direct = 1;      /* for empty file */ 
-    } 
- 
-    /* save the path name for error messages */ 
+    int oflag;
+#ifdef O_CLOEXEC
+    int cloexec = 0;
+#endif
+#ifdef O_EXCL
+    int exclusive = 0;
+#endif
+
+    /* check input */
+    if (path == NULL)
+        return NULL;
+
+    /* allocate gzFile structure to return */
+    state = (gz_statep)malloc(sizeof(gz_state));
+    if (state == NULL)
+        return NULL;
+    state->size = 0;            /* no buffers allocated yet */
+    state->want = GZBUFSIZE;    /* requested buffer size */
+    state->msg = NULL;          /* no error message yet */
+
+    /* interpret mode */
+    state->mode = GZ_NONE;
+    state->level = Z_DEFAULT_COMPRESSION;
+    state->strategy = Z_DEFAULT_STRATEGY;
+    state->direct = 0;
+    while (*mode) {
+        if (*mode >= '0' && *mode <= '9')
+            state->level = *mode - '0';
+        else
+            switch (*mode) {
+            case 'r':
+                state->mode = GZ_READ;
+                break;
+#ifndef NO_GZCOMPRESS
+            case 'w':
+                state->mode = GZ_WRITE;
+                break;
+            case 'a':
+                state->mode = GZ_APPEND;
+                break;
+#endif
+            case '+':       /* can't read and write at the same time */
+                free(state);
+                return NULL;
+            case 'b':       /* ignore -- will request binary anyway */
+                break;
+#ifdef O_CLOEXEC
+            case 'e':
+                cloexec = 1;
+                break;
+#endif
+#ifdef O_EXCL
+            case 'x':
+                exclusive = 1;
+                break;
+#endif
+            case 'f':
+                state->strategy = Z_FILTERED;
+                break;
+            case 'h':
+                state->strategy = Z_HUFFMAN_ONLY;
+                break;
+            case 'R':
+                state->strategy = Z_RLE;
+                break;
+            case 'F':
+                state->strategy = Z_FIXED;
+                break;
+            case 'T':
+                state->direct = 1;
+                break;
+            default:        /* could consider as an error, but just ignore */
+                ;
+            }
+        mode++;
+    }
+
+    /* must provide an "r", "w", or "a" */
+    if (state->mode == GZ_NONE) {
+        free(state);
+        return NULL;
+    }
+
+    /* can't force transparent read */
+    if (state->mode == GZ_READ) {
+        if (state->direct) {
+            free(state);
+            return NULL;
+        }
+        state->direct = 1;      /* for empty file */
+    }
+
+    /* save the path name for error messages */
 #ifdef WIDECHAR
-    if (fd == -2) { 
-        len = wcstombs(NULL, path, 0); 
+    if (fd == -2) {
+        len = wcstombs(NULL, path, 0);
         if (len == (z_size_t)-1)
-            len = 0; 
-    } 
-    else 
-#endif 
-        len = strlen((const char *)path); 
-    state->path = (char *)malloc(len + 1); 
-    if (state->path == NULL) { 
-        free(state); 
-        return NULL; 
-    } 
+            len = 0;
+    }
+    else
+#endif
+        len = strlen((const char *)path);
+    state->path = (char *)malloc(len + 1);
+    if (state->path == NULL) {
+        free(state);
+        return NULL;
+    }
 #ifdef WIDECHAR
-    if (fd == -2) 
-        if (len) 
-            wcstombs(state->path, path, len + 1); 
-        else 
-            *(state->path) = 0; 
-    else 
-#endif 
-#if !defined(NO_snprintf) && !defined(NO_vsnprintf) 
+    if (fd == -2)
+        if (len)
+            wcstombs(state->path, path, len + 1);
+        else
+            *(state->path) = 0;
+    else
+#endif
+#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
         (void)snprintf(state->path, len + 1, "%s", (const char *)path);
-#else 
-        strcpy(state->path, path); 
-#endif 
- 
-    /* compute the flags for open() */ 
-    oflag = 
-#ifdef O_LARGEFILE 
-        O_LARGEFILE | 
-#endif 
-#ifdef O_BINARY 
-        O_BINARY | 
-#endif 
-#ifdef O_CLOEXEC 
-        (cloexec ? O_CLOEXEC : 0) | 
-#endif 
-        (state->mode == GZ_READ ? 
-         O_RDONLY : 
-         (O_WRONLY | O_CREAT | 
-#ifdef O_EXCL 
-          (exclusive ? O_EXCL : 0) | 
-#endif 
-          (state->mode == GZ_WRITE ? 
-           O_TRUNC : 
-           O_APPEND))); 
- 
-    /* open the file with the appropriate flags (or just use fd) */ 
-    state->fd = fd > -1 ? fd : ( 
+#else
+        strcpy(state->path, path);
+#endif
+
+    /* compute the flags for open() */
+    oflag =
+#ifdef O_LARGEFILE
+        O_LARGEFILE |
+#endif
+#ifdef O_BINARY
+        O_BINARY |
+#endif
+#ifdef O_CLOEXEC
+        (cloexec ? O_CLOEXEC : 0) |
+#endif
+        (state->mode == GZ_READ ?
+         O_RDONLY :
+         (O_WRONLY | O_CREAT |
+#ifdef O_EXCL
+          (exclusive ? O_EXCL : 0) |
+#endif
+          (state->mode == GZ_WRITE ?
+           O_TRUNC :
+           O_APPEND)));
+
+    /* open the file with the appropriate flags (or just use fd) */
+    state->fd = fd > -1 ? fd : (
 #ifdef WIDECHAR
-        fd == -2 ? _wopen(path, oflag, 0666) : 
-#endif 
-        open((const char *)path, oflag, 0666)); 
-    if (state->fd == -1) { 
-        free(state->path); 
-        free(state); 
-        return NULL; 
-    } 
+        fd == -2 ? _wopen(path, oflag, 0666) :
+#endif
+        open((const char *)path, oflag, 0666));
+    if (state->fd == -1) {
+        free(state->path);
+        free(state);
+        return NULL;
+    }
     if (state->mode == GZ_APPEND) {
         LSEEK(state->fd, 0, SEEK_END);  /* so gzoffset() is correct */
-        state->mode = GZ_WRITE;         /* simplify later checks */ 
+        state->mode = GZ_WRITE;         /* simplify later checks */
     }
- 
-    /* save the current position for rewinding (only if reading) */ 
-    if (state->mode == GZ_READ) { 
-        state->start = LSEEK(state->fd, 0, SEEK_CUR); 
-        if (state->start == -1) state->start = 0; 
-    } 
- 
-    /* initialize stream */ 
-    gz_reset(state); 
- 
-    /* return stream */ 
-    return (gzFile)state; 
-} 
- 
-/* -- see zlib.h -- */ 
-gzFile ZEXPORT gzopen(path, mode) 
-    const char *path; 
-    const char *mode; 
-{ 
-    return gz_open(path, -1, mode); 
-} 
- 
-/* -- see zlib.h -- */ 
-gzFile ZEXPORT gzopen64(path, mode) 
-    const char *path; 
-    const char *mode; 
-{ 
-    return gz_open(path, -1, mode); 
-} 
- 
-/* -- see zlib.h -- */ 
-gzFile ZEXPORT gzdopen(fd, mode) 
-    int fd; 
-    const char *mode; 
-{ 
-    char *path;         /* identifier for error messages */ 
-    gzFile gz; 
- 
-    if (fd == -1 || (path = (char *)malloc(7 + 3 * sizeof(int))) == NULL) 
-        return NULL; 
-#if !defined(NO_snprintf) && !defined(NO_vsnprintf) 
+
+    /* save the current position for rewinding (only if reading) */
+    if (state->mode == GZ_READ) {
+        state->start = LSEEK(state->fd, 0, SEEK_CUR);
+        if (state->start == -1) state->start = 0;
+    }
+
+    /* initialize stream */
+    gz_reset(state);
+
+    /* return stream */
+    return (gzFile)state;
+}
+
+/* -- see zlib.h -- */
+gzFile ZEXPORT gzopen(path, mode)
+    const char *path;
+    const char *mode;
+{
+    return gz_open(path, -1, mode);
+}
+
+/* -- see zlib.h -- */
+gzFile ZEXPORT gzopen64(path, mode)
+    const char *path;
+    const char *mode;
+{
+    return gz_open(path, -1, mode);
+}
+
+/* -- see zlib.h -- */
+gzFile ZEXPORT gzdopen(fd, mode)
+    int fd;
+    const char *mode;
+{
+    char *path;         /* identifier for error messages */
+    gzFile gz;
+
+    if (fd == -1 || (path = (char *)malloc(7 + 3 * sizeof(int))) == NULL)
+        return NULL;
+#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
     (void)snprintf(path, 7 + 3 * sizeof(int), "<fd:%d>", fd);
-#else 
-    sprintf(path, "<fd:%d>", fd);   /* for debugging */ 
-#endif 
-    gz = gz_open(path, fd, mode); 
-    free(path); 
-    return gz; 
-} 
- 
-/* -- see zlib.h -- */ 
+#else
+    sprintf(path, "<fd:%d>", fd);   /* for debugging */
+#endif
+    gz = gz_open(path, fd, mode);
+    free(path);
+    return gz;
+}
+
+/* -- see zlib.h -- */
 #ifdef WIDECHAR
-gzFile ZEXPORT gzopen_w(path, mode) 
-    const wchar_t *path; 
-    const char *mode; 
-{ 
-    return gz_open(path, -2, mode); 
-} 
-#endif 
- 
-/* -- see zlib.h -- */ 
-int ZEXPORT gzbuffer(file, size) 
-    gzFile file; 
-    unsigned size; 
-{ 
-    gz_statep state; 
- 
-    /* get internal structure and check integrity */ 
-    if (file == NULL) 
-        return -1; 
-    state = (gz_statep)file; 
-    if (state->mode != GZ_READ && state->mode != GZ_WRITE) 
-        return -1; 
- 
-    /* make sure we haven't already allocated memory */ 
-    if (state->size != 0) 
-        return -1; 
- 
-    /* check and set requested size */ 
+gzFile ZEXPORT gzopen_w(path, mode)
+    const wchar_t *path;
+    const char *mode;
+{
+    return gz_open(path, -2, mode);
+}
+#endif
+
+/* -- see zlib.h -- */
+int ZEXPORT gzbuffer(file, size)
+    gzFile file;
+    unsigned size;
+{
+    gz_statep state;
+
+    /* get internal structure and check integrity */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
+        return -1;
+
+    /* make sure we haven't already allocated memory */
+    if (state->size != 0)
+        return -1;
+
+    /* check and set requested size */
     if ((size << 1) < size)
         return -1;              /* need to be able to double it */
-    if (size < 2) 
-        size = 2;               /* need two bytes to check magic header */ 
-    state->want = size; 
-    return 0; 
-} 
- 
-/* -- see zlib.h -- */ 
-int ZEXPORT gzrewind(file) 
-    gzFile file; 
-{ 
-    gz_statep state; 
- 
-    /* get internal structure */ 
-    if (file == NULL) 
-        return -1; 
-    state = (gz_statep)file; 
- 
-    /* check that we're reading and that there's no error */ 
-    if (state->mode != GZ_READ || 
-            (state->err != Z_OK && state->err != Z_BUF_ERROR)) 
-        return -1; 
- 
-    /* back up and start over */ 
-    if (LSEEK(state->fd, state->start, SEEK_SET) == -1) 
-        return -1; 
-    gz_reset(state); 
-    return 0; 
-} 
- 
-/* -- see zlib.h -- */ 
-z_off64_t ZEXPORT gzseek64(file, offset, whence) 
-    gzFile file; 
-    z_off64_t offset; 
-    int whence; 
-{ 
-    unsigned n; 
-    z_off64_t ret; 
-    gz_statep state; 
- 
-    /* get internal structure and check integrity */ 
-    if (file == NULL) 
-        return -1; 
-    state = (gz_statep)file; 
-    if (state->mode != GZ_READ && state->mode != GZ_WRITE) 
-        return -1; 
- 
-    /* check that there's no error */ 
-    if (state->err != Z_OK && state->err != Z_BUF_ERROR) 
-        return -1; 
- 
-    /* can only seek from start or relative to current position */ 
-    if (whence != SEEK_SET && whence != SEEK_CUR) 
-        return -1; 
- 
-    /* normalize offset to a SEEK_CUR specification */ 
-    if (whence == SEEK_SET) 
-        offset -= state->x.pos; 
-    else if (state->seek) 
-        offset += state->skip; 
-    state->seek = 0; 
- 
-    /* if within raw area while reading, just go there */ 
-    if (state->mode == GZ_READ && state->how == COPY && 
-            state->x.pos + offset >= 0) { 
-        ret = LSEEK(state->fd, offset - state->x.have, SEEK_CUR); 
-        if (ret == -1) 
-            return -1; 
-        state->x.have = 0; 
-        state->eof = 0; 
-        state->past = 0; 
-        state->seek = 0; 
-        gz_error(state, Z_OK, NULL); 
-        state->strm.avail_in = 0; 
-        state->x.pos += offset; 
-        return state->x.pos; 
-    } 
- 
-    /* calculate skip amount, rewinding if needed for back seek when reading */ 
-    if (offset < 0) { 
-        if (state->mode != GZ_READ)         /* writing -- can't go backwards */ 
-            return -1; 
-        offset += state->x.pos; 
-        if (offset < 0)                     /* before start of file! */ 
-            return -1; 
-        if (gzrewind(file) == -1)           /* rewind, then skip to offset */ 
-            return -1; 
-    } 
- 
-    /* if reading, skip what's in output buffer (one less gzgetc() check) */ 
-    if (state->mode == GZ_READ) { 
-        n = GT_OFF(state->x.have) || (z_off64_t)state->x.have > offset ? 
-            (unsigned)offset : state->x.have; 
-        state->x.have -= n; 
-        state->x.next += n; 
-        state->x.pos += n; 
-        offset -= n; 
-    } 
- 
-    /* request skip (if not zero) */ 
-    if (offset) { 
-        state->seek = 1; 
-        state->skip = offset; 
-    } 
-    return state->x.pos + offset; 
-} 
- 
-/* -- see zlib.h -- */ 
-z_off_t ZEXPORT gzseek(file, offset, whence) 
-    gzFile file; 
-    z_off_t offset; 
-    int whence; 
-{ 
-    z_off64_t ret; 
- 
-    ret = gzseek64(file, (z_off64_t)offset, whence); 
-    return ret == (z_off_t)ret ? (z_off_t)ret : -1; 
-} 
- 
-/* -- see zlib.h -- */ 
-z_off64_t ZEXPORT gztell64(file) 
-    gzFile file; 
-{ 
-    gz_statep state; 
- 
-    /* get internal structure and check integrity */ 
-    if (file == NULL) 
-        return -1; 
-    state = (gz_statep)file; 
-    if (state->mode != GZ_READ && state->mode != GZ_WRITE) 
-        return -1; 
- 
-    /* return position */ 
-    return state->x.pos + (state->seek ? state->skip : 0); 
-} 
- 
-/* -- see zlib.h -- */ 
-z_off_t ZEXPORT gztell(file) 
-    gzFile file; 
-{ 
-    z_off64_t ret; 
- 
-    ret = gztell64(file); 
-    return ret == (z_off_t)ret ? (z_off_t)ret : -1; 
-} 
- 
-/* -- see zlib.h -- */ 
-z_off64_t ZEXPORT gzoffset64(file) 
-    gzFile file; 
-{ 
-    z_off64_t offset; 
-    gz_statep state; 
- 
-    /* get internal structure and check integrity */ 
-    if (file == NULL) 
-        return -1; 
-    state = (gz_statep)file; 
-    if (state->mode != GZ_READ && state->mode != GZ_WRITE) 
-        return -1; 
- 
-    /* compute and return effective offset in file */ 
-    offset = LSEEK(state->fd, 0, SEEK_CUR); 
-    if (offset == -1) 
-        return -1; 
-    if (state->mode == GZ_READ)             /* reading */ 
-        offset -= state->strm.avail_in;     /* don't count buffered input */ 
-    return offset; 
-} 
- 
-/* -- see zlib.h -- */ 
-z_off_t ZEXPORT gzoffset(file) 
-    gzFile file; 
-{ 
-    z_off64_t ret; 
- 
-    ret = gzoffset64(file); 
-    return ret == (z_off_t)ret ? (z_off_t)ret : -1; 
-} 
- 
-/* -- see zlib.h -- */ 
-int ZEXPORT gzeof(file) 
-    gzFile file; 
-{ 
-    gz_statep state; 
- 
-    /* get internal structure and check integrity */ 
-    if (file == NULL) 
-        return 0; 
-    state = (gz_statep)file; 
-    if (state->mode != GZ_READ && state->mode != GZ_WRITE) 
-        return 0; 
- 
-    /* return end-of-file state */ 
-    return state->mode == GZ_READ ? state->past : 0; 
-} 
- 
-/* -- see zlib.h -- */ 
-const char * ZEXPORT gzerror(file, errnum) 
-    gzFile file; 
-    int *errnum; 
-{ 
-    gz_statep state; 
- 
-    /* get internal structure and check integrity */ 
-    if (file == NULL) 
-        return NULL; 
-    state = (gz_statep)file; 
-    if (state->mode != GZ_READ && state->mode != GZ_WRITE) 
-        return NULL; 
- 
-    /* return error information */ 
-    if (errnum != NULL) 
-        *errnum = state->err; 
-    return state->err == Z_MEM_ERROR ? "out of memory" : 
-                                       (state->msg == NULL ? "" : state->msg); 
-} 
- 
-/* -- see zlib.h -- */ 
-void ZEXPORT gzclearerr(file) 
-    gzFile file; 
-{ 
-    gz_statep state; 
- 
-    /* get internal structure and check integrity */ 
-    if (file == NULL) 
-        return; 
-    state = (gz_statep)file; 
-    if (state->mode != GZ_READ && state->mode != GZ_WRITE) 
-        return; 
- 
-    /* clear error and end-of-file */ 
-    if (state->mode == GZ_READ) { 
-        state->eof = 0; 
-        state->past = 0; 
-    } 
-    gz_error(state, Z_OK, NULL); 
-} 
- 
-/* Create an error message in allocated memory and set state->err and 
-   state->msg accordingly.  Free any previous error message already there.  Do 
-   not try to free or allocate space if the error is Z_MEM_ERROR (out of 
-   memory).  Simply save the error message as a static string.  If there is an 
-   allocation failure constructing the error message, then convert the error to 
-   out of memory. */ 
-void ZLIB_INTERNAL gz_error(state, err, msg) 
-    gz_statep state; 
-    int err; 
-    const char *msg; 
-{ 
-    /* free previously allocated message and clear */ 
-    if (state->msg != NULL) { 
-        if (state->err != Z_MEM_ERROR) 
-            free(state->msg); 
-        state->msg = NULL; 
-    } 
- 
-    /* if fatal, set state->x.have to 0 so that the gzgetc() macro fails */ 
-    if (err != Z_OK && err != Z_BUF_ERROR) 
-        state->x.have = 0; 
- 
-    /* set error code, and if no message, then done */ 
-    state->err = err; 
-    if (msg == NULL) 
-        return; 
- 
-    /* for an out of memory error, return literal string when requested */ 
-    if (err == Z_MEM_ERROR) 
-        return; 
- 
-    /* construct error message with path */ 
-    if ((state->msg = (char *)malloc(strlen(state->path) + strlen(msg) + 3)) == 
-            NULL) { 
-        state->err = Z_MEM_ERROR; 
-        return; 
-    } 
-#if !defined(NO_snprintf) && !defined(NO_vsnprintf) 
+    if (size < 2)
+        size = 2;               /* need two bytes to check magic header */
+    state->want = size;
+    return 0;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzrewind(file)
+    gzFile file;
+{
+    gz_statep state;
+
+    /* get internal structure */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+
+    /* check that we're reading and that there's no error */
+    if (state->mode != GZ_READ ||
+            (state->err != Z_OK && state->err != Z_BUF_ERROR))
+        return -1;
+
+    /* back up and start over */
+    if (LSEEK(state->fd, state->start, SEEK_SET) == -1)
+        return -1;
+    gz_reset(state);
+    return 0;
+}
+
+/* -- see zlib.h -- */
+z_off64_t ZEXPORT gzseek64(file, offset, whence)
+    gzFile file;
+    z_off64_t offset;
+    int whence;
+{
+    unsigned n;
+    z_off64_t ret;
+    gz_statep state;
+
+    /* get internal structure and check integrity */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
+        return -1;
+
+    /* check that there's no error */
+    if (state->err != Z_OK && state->err != Z_BUF_ERROR)
+        return -1;
+
+    /* can only seek from start or relative to current position */
+    if (whence != SEEK_SET && whence != SEEK_CUR)
+        return -1;
+
+    /* normalize offset to a SEEK_CUR specification */
+    if (whence == SEEK_SET)
+        offset -= state->x.pos;
+    else if (state->seek)
+        offset += state->skip;
+    state->seek = 0;
+
+    /* if within raw area while reading, just go there */
+    if (state->mode == GZ_READ && state->how == COPY &&
+            state->x.pos + offset >= 0) {
+        ret = LSEEK(state->fd, offset - state->x.have, SEEK_CUR);
+        if (ret == -1)
+            return -1;
+        state->x.have = 0;
+        state->eof = 0;
+        state->past = 0;
+        state->seek = 0;
+        gz_error(state, Z_OK, NULL);
+        state->strm.avail_in = 0;
+        state->x.pos += offset;
+        return state->x.pos;
+    }
+
+    /* calculate skip amount, rewinding if needed for back seek when reading */
+    if (offset < 0) {
+        if (state->mode != GZ_READ)         /* writing -- can't go backwards */
+            return -1;
+        offset += state->x.pos;
+        if (offset < 0)                     /* before start of file! */
+            return -1;
+        if (gzrewind(file) == -1)           /* rewind, then skip to offset */
+            return -1;
+    }
+
+    /* if reading, skip what's in output buffer (one less gzgetc() check) */
+    if (state->mode == GZ_READ) {
+        n = GT_OFF(state->x.have) || (z_off64_t)state->x.have > offset ?
+            (unsigned)offset : state->x.have;
+        state->x.have -= n;
+        state->x.next += n;
+        state->x.pos += n;
+        offset -= n;
+    }
+
+    /* request skip (if not zero) */
+    if (offset) {
+        state->seek = 1;
+        state->skip = offset;
+    }
+    return state->x.pos + offset;
+}
+
+/* -- see zlib.h -- */
+z_off_t ZEXPORT gzseek(file, offset, whence)
+    gzFile file;
+    z_off_t offset;
+    int whence;
+{
+    z_off64_t ret;
+
+    ret = gzseek64(file, (z_off64_t)offset, whence);
+    return ret == (z_off_t)ret ? (z_off_t)ret : -1;
+}
+
+/* -- see zlib.h -- */
+z_off64_t ZEXPORT gztell64(file)
+    gzFile file;
+{
+    gz_statep state;
+
+    /* get internal structure and check integrity */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
+        return -1;
+
+    /* return position */
+    return state->x.pos + (state->seek ? state->skip : 0);
+}
+
+/* -- see zlib.h -- */
+z_off_t ZEXPORT gztell(file)
+    gzFile file;
+{
+    z_off64_t ret;
+
+    ret = gztell64(file);
+    return ret == (z_off_t)ret ? (z_off_t)ret : -1;
+}
+
+/* -- see zlib.h -- */
+z_off64_t ZEXPORT gzoffset64(file)
+    gzFile file;
+{
+    z_off64_t offset;
+    gz_statep state;
+
+    /* get internal structure and check integrity */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
+        return -1;
+
+    /* compute and return effective offset in file */
+    offset = LSEEK(state->fd, 0, SEEK_CUR);
+    if (offset == -1)
+        return -1;
+    if (state->mode == GZ_READ)             /* reading */
+        offset -= state->strm.avail_in;     /* don't count buffered input */
+    return offset;
+}
+
+/* -- see zlib.h -- */
+z_off_t ZEXPORT gzoffset(file)
+    gzFile file;
+{
+    z_off64_t ret;
+
+    ret = gzoffset64(file);
+    return ret == (z_off_t)ret ? (z_off_t)ret : -1;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzeof(file)
+    gzFile file;
+{
+    gz_statep state;
+
+    /* get internal structure and check integrity */
+    if (file == NULL)
+        return 0;
+    state = (gz_statep)file;
+    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
+        return 0;
+
+    /* return end-of-file state */
+    return state->mode == GZ_READ ? state->past : 0;
+}
+
+/* -- see zlib.h -- */
+const char * ZEXPORT gzerror(file, errnum)
+    gzFile file;
+    int *errnum;
+{
+    gz_statep state;
+
+    /* get internal structure and check integrity */
+    if (file == NULL)
+        return NULL;
+    state = (gz_statep)file;
+    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
+        return NULL;
+
+    /* return error information */
+    if (errnum != NULL)
+        *errnum = state->err;
+    return state->err == Z_MEM_ERROR ? "out of memory" :
+                                       (state->msg == NULL ? "" : state->msg);
+}
+
+/* -- see zlib.h -- */
+void ZEXPORT gzclearerr(file)
+    gzFile file;
+{
+    gz_statep state;
+
+    /* get internal structure and check integrity */
+    if (file == NULL)
+        return;
+    state = (gz_statep)file;
+    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
+        return;
+
+    /* clear error and end-of-file */
+    if (state->mode == GZ_READ) {
+        state->eof = 0;
+        state->past = 0;
+    }
+    gz_error(state, Z_OK, NULL);
+}
+
+/* Create an error message in allocated memory and set state->err and
+   state->msg accordingly.  Free any previous error message already there.  Do
+   not try to free or allocate space if the error is Z_MEM_ERROR (out of
+   memory).  Simply save the error message as a static string.  If there is an
+   allocation failure constructing the error message, then convert the error to
+   out of memory. */
+void ZLIB_INTERNAL gz_error(state, err, msg)
+    gz_statep state;
+    int err;
+    const char *msg;
+{
+    /* free previously allocated message and clear */
+    if (state->msg != NULL) {
+        if (state->err != Z_MEM_ERROR)
+            free(state->msg);
+        state->msg = NULL;
+    }
+
+    /* if fatal, set state->x.have to 0 so that the gzgetc() macro fails */
+    if (err != Z_OK && err != Z_BUF_ERROR)
+        state->x.have = 0;
+
+    /* set error code, and if no message, then done */
+    state->err = err;
+    if (msg == NULL)
+        return;
+
+    /* for an out of memory error, return literal string when requested */
+    if (err == Z_MEM_ERROR)
+        return;
+
+    /* construct error message with path */
+    if ((state->msg = (char *)malloc(strlen(state->path) + strlen(msg) + 3)) ==
+            NULL) {
+        state->err = Z_MEM_ERROR;
+        return;
+    }
+#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
     (void)snprintf(state->msg, strlen(state->path) + strlen(msg) + 3,
                    "%s%s%s", state->path, ": ", msg);
-#else 
-    strcpy(state->msg, state->path); 
-    strcat(state->msg, ": "); 
-    strcat(state->msg, msg); 
-#endif 
-} 
- 
-#ifndef INT_MAX 
-/* portably return maximum value for an int (when limits.h presumed not 
-   available) -- we need to do this to cover cases where 2's complement not 
-   used, since C standard permits 1's complement and sign-bit representations, 
-   otherwise we could just use ((unsigned)-1) >> 1 */ 
-unsigned ZLIB_INTERNAL gz_intmax() 
-{ 
-    unsigned p, q; 
- 
-    p = 1; 
-    do { 
-        q = p; 
-        p <<= 1; 
-        p++; 
-    } while (p > q); 
-    return q >> 1; 
-} 
-#endif 
+#else
+    strcpy(state->msg, state->path);
+    strcat(state->msg, ": ");
+    strcat(state->msg, msg);
+#endif
+}
+
+#ifndef INT_MAX
+/* portably return maximum value for an int (when limits.h presumed not
+   available) -- we need to do this to cover cases where 2's complement not
+   used, since C standard permits 1's complement and sign-bit representations,
+   otherwise we could just use ((unsigned)-1) >> 1 */
+unsigned ZLIB_INTERNAL gz_intmax()
+{
+    unsigned p, q;
+
+    p = 1;
+    do {
+        q = p;
+        p <<= 1;
+        p++;
+    } while (p > q);
+    return q >> 1;
+}
+#endif
diff --git a/contrib/libs/zlib/gzread.c b/contrib/libs/zlib/gzread.c
index b3ab0fee5a..956b91ea7d 100644
--- a/contrib/libs/zlib/gzread.c
+++ b/contrib/libs/zlib/gzread.c
@@ -1,377 +1,377 @@
-/* gzread.c -- zlib functions for reading gzip files 
+/* gzread.c -- zlib functions for reading gzip files
  * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */ 
- 
-#include "gzguts.h" 
- 
-/* Local functions */ 
-local int gz_load OF((gz_statep, unsigned char *, unsigned, unsigned *)); 
-local int gz_avail OF((gz_statep)); 
-local int gz_look OF((gz_statep)); 
-local int gz_decomp OF((gz_statep)); 
-local int gz_fetch OF((gz_statep)); 
-local int gz_skip OF((gz_statep, z_off64_t)); 
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "gzguts.h"
+
+/* Local functions */
+local int gz_load OF((gz_statep, unsigned char *, unsigned, unsigned *));
+local int gz_avail OF((gz_statep));
+local int gz_look OF((gz_statep));
+local int gz_decomp OF((gz_statep));
+local int gz_fetch OF((gz_statep));
+local int gz_skip OF((gz_statep, z_off64_t));
 local z_size_t gz_read OF((gz_statep, voidp, z_size_t));
- 
-/* Use read() to load a buffer -- return -1 on error, otherwise 0.  Read from 
-   state->fd, and update state->eof, state->err, and state->msg as appropriate. 
-   This function needs to loop on read(), since read() is not guaranteed to 
-   read the number of bytes requested, depending on the type of descriptor. */ 
-local int gz_load(state, buf, len, have) 
-    gz_statep state; 
-    unsigned char *buf; 
-    unsigned len; 
-    unsigned *have; 
-{ 
-    int ret; 
+
+/* Use read() to load a buffer -- return -1 on error, otherwise 0.  Read from
+   state->fd, and update state->eof, state->err, and state->msg as appropriate.
+   This function needs to loop on read(), since read() is not guaranteed to
+   read the number of bytes requested, depending on the type of descriptor. */
+local int gz_load(state, buf, len, have)
+    gz_statep state;
+    unsigned char *buf;
+    unsigned len;
+    unsigned *have;
+{
+    int ret;
     unsigned get, max = ((unsigned)-1 >> 2) + 1;
- 
-    *have = 0; 
-    do { 
+
+    *have = 0;
+    do {
         get = len - *have;
         if (get > max)
             get = max;
         ret = read(state->fd, buf + *have, get);
-        if (ret <= 0) 
-            break; 
+        if (ret <= 0)
+            break;
         *have += (unsigned)ret;
-    } while (*have < len); 
-    if (ret < 0) { 
-        gz_error(state, Z_ERRNO, zstrerror()); 
-        return -1; 
-    } 
-    if (ret == 0) 
-        state->eof = 1; 
-    return 0; 
-} 
- 
-/* Load up input buffer and set eof flag if last data loaded -- return -1 on 
-   error, 0 otherwise.  Note that the eof flag is set when the end of the input 
-   file is reached, even though there may be unused data in the buffer.  Once 
-   that data has been used, no more attempts will be made to read the file. 
-   If strm->avail_in != 0, then the current data is moved to the beginning of 
-   the input buffer, and then the remainder of the buffer is loaded with the 
-   available data from the input file. */ 
-local int gz_avail(state) 
-    gz_statep state; 
-{ 
-    unsigned got; 
-    z_streamp strm = &(state->strm); 
- 
-    if (state->err != Z_OK && state->err != Z_BUF_ERROR) 
-        return -1; 
-    if (state->eof == 0) { 
-        if (strm->avail_in) {       /* copy what's there to the start */ 
-            unsigned char *p = state->in; 
-            unsigned const char *q = strm->next_in; 
-            unsigned n = strm->avail_in; 
-            do { 
-                *p++ = *q++; 
-            } while (--n); 
-        } 
-        if (gz_load(state, state->in + strm->avail_in, 
-                    state->size - strm->avail_in, &got) == -1) 
-            return -1; 
-        strm->avail_in += got; 
-        strm->next_in = state->in; 
-    } 
-    return 0; 
-} 
- 
-/* Look for gzip header, set up for inflate or copy.  state->x.have must be 0. 
-   If this is the first time in, allocate required memory.  state->how will be 
-   left unchanged if there is no more input data available, will be set to COPY 
-   if there is no gzip header and direct copying will be performed, or it will 
-   be set to GZIP for decompression.  If direct copying, then leftover input 
-   data from the input buffer will be copied to the output buffer.  In that 
-   case, all further file reads will be directly to either the output buffer or 
-   a user buffer.  If decompressing, the inflate state will be initialized. 
-   gz_look() will return 0 on success or -1 on failure. */ 
-local int gz_look(state) 
-    gz_statep state; 
-{ 
-    z_streamp strm = &(state->strm); 
- 
-    /* allocate read buffers and inflate memory */ 
-    if (state->size == 0) { 
-        /* allocate buffers */ 
-        state->in = (unsigned char *)malloc(state->want); 
-        state->out = (unsigned char *)malloc(state->want << 1); 
-        if (state->in == NULL || state->out == NULL) { 
+    } while (*have < len);
+    if (ret < 0) {
+        gz_error(state, Z_ERRNO, zstrerror());
+        return -1;
+    }
+    if (ret == 0)
+        state->eof = 1;
+    return 0;
+}
+
+/* Load up input buffer and set eof flag if last data loaded -- return -1 on
+   error, 0 otherwise.  Note that the eof flag is set when the end of the input
+   file is reached, even though there may be unused data in the buffer.  Once
+   that data has been used, no more attempts will be made to read the file.
+   If strm->avail_in != 0, then the current data is moved to the beginning of
+   the input buffer, and then the remainder of the buffer is loaded with the
+   available data from the input file. */
+local int gz_avail(state)
+    gz_statep state;
+{
+    unsigned got;
+    z_streamp strm = &(state->strm);
+
+    if (state->err != Z_OK && state->err != Z_BUF_ERROR)
+        return -1;
+    if (state->eof == 0) {
+        if (strm->avail_in) {       /* copy what's there to the start */
+            unsigned char *p = state->in;
+            unsigned const char *q = strm->next_in;
+            unsigned n = strm->avail_in;
+            do {
+                *p++ = *q++;
+            } while (--n);
+        }
+        if (gz_load(state, state->in + strm->avail_in,
+                    state->size - strm->avail_in, &got) == -1)
+            return -1;
+        strm->avail_in += got;
+        strm->next_in = state->in;
+    }
+    return 0;
+}
+
+/* Look for gzip header, set up for inflate or copy.  state->x.have must be 0.
+   If this is the first time in, allocate required memory.  state->how will be
+   left unchanged if there is no more input data available, will be set to COPY
+   if there is no gzip header and direct copying will be performed, or it will
+   be set to GZIP for decompression.  If direct copying, then leftover input
+   data from the input buffer will be copied to the output buffer.  In that
+   case, all further file reads will be directly to either the output buffer or
+   a user buffer.  If decompressing, the inflate state will be initialized.
+   gz_look() will return 0 on success or -1 on failure. */
+local int gz_look(state)
+    gz_statep state;
+{
+    z_streamp strm = &(state->strm);
+
+    /* allocate read buffers and inflate memory */
+    if (state->size == 0) {
+        /* allocate buffers */
+        state->in = (unsigned char *)malloc(state->want);
+        state->out = (unsigned char *)malloc(state->want << 1);
+        if (state->in == NULL || state->out == NULL) {
             free(state->out);
             free(state->in);
-            gz_error(state, Z_MEM_ERROR, "out of memory"); 
-            return -1; 
-        } 
-        state->size = state->want; 
- 
-        /* allocate inflate memory */ 
-        state->strm.zalloc = Z_NULL; 
-        state->strm.zfree = Z_NULL; 
-        state->strm.opaque = Z_NULL; 
-        state->strm.avail_in = 0; 
-        state->strm.next_in = Z_NULL; 
-        if (inflateInit2(&(state->strm), 15 + 16) != Z_OK) {    /* gunzip */ 
-            free(state->out); 
-            free(state->in); 
-            state->size = 0; 
-            gz_error(state, Z_MEM_ERROR, "out of memory"); 
-            return -1; 
-        } 
-    } 
- 
-    /* get at least the magic bytes in the input buffer */ 
-    if (strm->avail_in < 2) { 
-        if (gz_avail(state) == -1) 
-            return -1; 
-        if (strm->avail_in == 0) 
-            return 0; 
-    } 
- 
-    /* look for gzip magic bytes -- if there, do gzip decoding (note: there is 
-       a logical dilemma here when considering the case of a partially written 
-       gzip file, to wit, if a single 31 byte is written, then we cannot tell 
-       whether this is a single-byte file, or just a partially written gzip 
-       file -- for here we assume that if a gzip file is being written, then 
-       the header will be written in a single operation, so that reading a 
-       single byte is sufficient indication that it is not a gzip file) */ 
-    if (strm->avail_in > 1 && 
-            strm->next_in[0] == 31 && strm->next_in[1] == 139) { 
-        inflateReset(strm); 
-        state->how = GZIP; 
-        state->direct = 0; 
-        return 0; 
-    } 
- 
-    /* no gzip header -- if we were decoding gzip before, then this is trailing 
-       garbage.  Ignore the trailing garbage and finish. */ 
-    if (state->direct == 0) { 
-        strm->avail_in = 0; 
-        state->eof = 1; 
-        state->x.have = 0; 
-        return 0; 
-    } 
- 
-    /* doing raw i/o, copy any leftover input to output -- this assumes that 
-       the output buffer is larger than the input buffer, which also assures 
-       space for gzungetc() */ 
-    state->x.next = state->out; 
-    if (strm->avail_in) { 
-        memcpy(state->x.next, strm->next_in, strm->avail_in); 
-        state->x.have = strm->avail_in; 
-        strm->avail_in = 0; 
-    } 
-    state->how = COPY; 
-    state->direct = 1; 
-    return 0; 
-} 
- 
-/* Decompress from input to the provided next_out and avail_out in the state. 
-   On return, state->x.have and state->x.next point to the just decompressed 
-   data.  If the gzip stream completes, state->how is reset to LOOK to look for 
-   the next gzip stream or raw data, once state->x.have is depleted.  Returns 0 
-   on success, -1 on failure. */ 
-local int gz_decomp(state) 
-    gz_statep state; 
-{ 
-    int ret = Z_OK; 
-    unsigned had; 
-    z_streamp strm = &(state->strm); 
- 
-    /* fill output buffer up to end of deflate stream */ 
-    had = strm->avail_out; 
-    do { 
-        /* get more input for inflate() */ 
-        if (strm->avail_in == 0 && gz_avail(state) == -1) 
-            return -1; 
-        if (strm->avail_in == 0) { 
-            gz_error(state, Z_BUF_ERROR, "unexpected end of file"); 
-            break; 
-        } 
- 
-        /* decompress and handle errors */ 
-        ret = inflate(strm, Z_NO_FLUSH); 
-        if (ret == Z_STREAM_ERROR || ret == Z_NEED_DICT) { 
-            gz_error(state, Z_STREAM_ERROR, 
-                     "internal error: inflate stream corrupt"); 
-            return -1; 
-        } 
-        if (ret == Z_MEM_ERROR) { 
-            gz_error(state, Z_MEM_ERROR, "out of memory"); 
-            return -1; 
-        } 
-        if (ret == Z_DATA_ERROR) {              /* deflate stream invalid */ 
-            gz_error(state, Z_DATA_ERROR, 
-                     strm->msg == NULL ? "compressed data error" : strm->msg); 
-            return -1; 
-        } 
-    } while (strm->avail_out && ret != Z_STREAM_END); 
- 
-    /* update available output */ 
-    state->x.have = had - strm->avail_out; 
-    state->x.next = strm->next_out - state->x.have; 
- 
-    /* if the gzip stream completed successfully, look for another */ 
-    if (ret == Z_STREAM_END) 
-        state->how = LOOK; 
- 
-    /* good decompression */ 
-    return 0; 
-} 
- 
-/* Fetch data and put it in the output buffer.  Assumes state->x.have is 0. 
-   Data is either copied from the input file or decompressed from the input 
-   file depending on state->how.  If state->how is LOOK, then a gzip header is 
-   looked for to determine whether to copy or decompress.  Returns -1 on error, 
-   otherwise 0.  gz_fetch() will leave state->how as COPY or GZIP unless the 
-   end of the input file has been reached and all data has been processed.  */ 
-local int gz_fetch(state) 
-    gz_statep state; 
-{ 
-    z_streamp strm = &(state->strm); 
- 
-    do { 
-        switch(state->how) { 
-        case LOOK:      /* -> LOOK, COPY (only if never GZIP), or GZIP */ 
-            if (gz_look(state) == -1) 
-                return -1; 
-            if (state->how == LOOK) 
-                return 0; 
-            break; 
-        case COPY:      /* -> COPY */ 
-            if (gz_load(state, state->out, state->size << 1, &(state->x.have)) 
-                    == -1) 
-                return -1; 
-            state->x.next = state->out; 
-            return 0; 
-        case GZIP:      /* -> GZIP or LOOK (if end of gzip stream) */ 
-            strm->avail_out = state->size << 1; 
-            strm->next_out = state->out; 
-            if (gz_decomp(state) == -1) 
-                return -1; 
-        } 
-    } while (state->x.have == 0 && (!state->eof || strm->avail_in)); 
-    return 0; 
-} 
- 
-/* Skip len uncompressed bytes of output.  Return -1 on error, 0 on success. */ 
-local int gz_skip(state, len) 
-    gz_statep state; 
-    z_off64_t len; 
-{ 
-    unsigned n; 
- 
-    /* skip over len bytes or reach end-of-file, whichever comes first */ 
-    while (len) 
-        /* skip over whatever is in output buffer */ 
-        if (state->x.have) { 
-            n = GT_OFF(state->x.have) || (z_off64_t)state->x.have > len ? 
-                (unsigned)len : state->x.have; 
-            state->x.have -= n; 
-            state->x.next += n; 
-            state->x.pos += n; 
-            len -= n; 
-        } 
- 
-        /* output buffer empty -- return if we're at the end of the input */ 
-        else if (state->eof && state->strm.avail_in == 0) 
-            break; 
- 
-        /* need more data to skip -- load up output buffer */ 
-        else { 
-            /* get more output, looking for header if required */ 
-            if (gz_fetch(state) == -1) 
-                return -1; 
-        } 
-    return 0; 
-} 
- 
+            gz_error(state, Z_MEM_ERROR, "out of memory");
+            return -1;
+        }
+        state->size = state->want;
+
+        /* allocate inflate memory */
+        state->strm.zalloc = Z_NULL;
+        state->strm.zfree = Z_NULL;
+        state->strm.opaque = Z_NULL;
+        state->strm.avail_in = 0;
+        state->strm.next_in = Z_NULL;
+        if (inflateInit2(&(state->strm), 15 + 16) != Z_OK) {    /* gunzip */
+            free(state->out);
+            free(state->in);
+            state->size = 0;
+            gz_error(state, Z_MEM_ERROR, "out of memory");
+            return -1;
+        }
+    }
+
+    /* get at least the magic bytes in the input buffer */
+    if (strm->avail_in < 2) {
+        if (gz_avail(state) == -1)
+            return -1;
+        if (strm->avail_in == 0)
+            return 0;
+    }
+
+    /* look for gzip magic bytes -- if there, do gzip decoding (note: there is
+       a logical dilemma here when considering the case of a partially written
+       gzip file, to wit, if a single 31 byte is written, then we cannot tell
+       whether this is a single-byte file, or just a partially written gzip
+       file -- for here we assume that if a gzip file is being written, then
+       the header will be written in a single operation, so that reading a
+       single byte is sufficient indication that it is not a gzip file) */
+    if (strm->avail_in > 1 &&
+            strm->next_in[0] == 31 && strm->next_in[1] == 139) {
+        inflateReset(strm);
+        state->how = GZIP;
+        state->direct = 0;
+        return 0;
+    }
+
+    /* no gzip header -- if we were decoding gzip before, then this is trailing
+       garbage.  Ignore the trailing garbage and finish. */
+    if (state->direct == 0) {
+        strm->avail_in = 0;
+        state->eof = 1;
+        state->x.have = 0;
+        return 0;
+    }
+
+    /* doing raw i/o, copy any leftover input to output -- this assumes that
+       the output buffer is larger than the input buffer, which also assures
+       space for gzungetc() */
+    state->x.next = state->out;
+    if (strm->avail_in) {
+        memcpy(state->x.next, strm->next_in, strm->avail_in);
+        state->x.have = strm->avail_in;
+        strm->avail_in = 0;
+    }
+    state->how = COPY;
+    state->direct = 1;
+    return 0;
+}
+
+/* Decompress from input to the provided next_out and avail_out in the state.
+   On return, state->x.have and state->x.next point to the just decompressed
+   data.  If the gzip stream completes, state->how is reset to LOOK to look for
+   the next gzip stream or raw data, once state->x.have is depleted.  Returns 0
+   on success, -1 on failure. */
+local int gz_decomp(state)
+    gz_statep state;
+{
+    int ret = Z_OK;
+    unsigned had;
+    z_streamp strm = &(state->strm);
+
+    /* fill output buffer up to end of deflate stream */
+    had = strm->avail_out;
+    do {
+        /* get more input for inflate() */
+        if (strm->avail_in == 0 && gz_avail(state) == -1)
+            return -1;
+        if (strm->avail_in == 0) {
+            gz_error(state, Z_BUF_ERROR, "unexpected end of file");
+            break;
+        }
+
+        /* decompress and handle errors */
+        ret = inflate(strm, Z_NO_FLUSH);
+        if (ret == Z_STREAM_ERROR || ret == Z_NEED_DICT) {
+            gz_error(state, Z_STREAM_ERROR,
+                     "internal error: inflate stream corrupt");
+            return -1;
+        }
+        if (ret == Z_MEM_ERROR) {
+            gz_error(state, Z_MEM_ERROR, "out of memory");
+            return -1;
+        }
+        if (ret == Z_DATA_ERROR) {              /* deflate stream invalid */
+            gz_error(state, Z_DATA_ERROR,
+                     strm->msg == NULL ? "compressed data error" : strm->msg);
+            return -1;
+        }
+    } while (strm->avail_out && ret != Z_STREAM_END);
+
+    /* update available output */
+    state->x.have = had - strm->avail_out;
+    state->x.next = strm->next_out - state->x.have;
+
+    /* if the gzip stream completed successfully, look for another */
+    if (ret == Z_STREAM_END)
+        state->how = LOOK;
+
+    /* good decompression */
+    return 0;
+}
+
+/* Fetch data and put it in the output buffer.  Assumes state->x.have is 0.
+   Data is either copied from the input file or decompressed from the input
+   file depending on state->how.  If state->how is LOOK, then a gzip header is
+   looked for to determine whether to copy or decompress.  Returns -1 on error,
+   otherwise 0.  gz_fetch() will leave state->how as COPY or GZIP unless the
+   end of the input file has been reached and all data has been processed.  */
+local int gz_fetch(state)
+    gz_statep state;
+{
+    z_streamp strm = &(state->strm);
+
+    do {
+        switch(state->how) {
+        case LOOK:      /* -> LOOK, COPY (only if never GZIP), or GZIP */
+            if (gz_look(state) == -1)
+                return -1;
+            if (state->how == LOOK)
+                return 0;
+            break;
+        case COPY:      /* -> COPY */
+            if (gz_load(state, state->out, state->size << 1, &(state->x.have))
+                    == -1)
+                return -1;
+            state->x.next = state->out;
+            return 0;
+        case GZIP:      /* -> GZIP or LOOK (if end of gzip stream) */
+            strm->avail_out = state->size << 1;
+            strm->next_out = state->out;
+            if (gz_decomp(state) == -1)
+                return -1;
+        }
+    } while (state->x.have == 0 && (!state->eof || strm->avail_in));
+    return 0;
+}
+
+/* Skip len uncompressed bytes of output.  Return -1 on error, 0 on success. */
+local int gz_skip(state, len)
+    gz_statep state;
+    z_off64_t len;
+{
+    unsigned n;
+
+    /* skip over len bytes or reach end-of-file, whichever comes first */
+    while (len)
+        /* skip over whatever is in output buffer */
+        if (state->x.have) {
+            n = GT_OFF(state->x.have) || (z_off64_t)state->x.have > len ?
+                (unsigned)len : state->x.have;
+            state->x.have -= n;
+            state->x.next += n;
+            state->x.pos += n;
+            len -= n;
+        }
+
+        /* output buffer empty -- return if we're at the end of the input */
+        else if (state->eof && state->strm.avail_in == 0)
+            break;
+
+        /* need more data to skip -- load up output buffer */
+        else {
+            /* get more output, looking for header if required */
+            if (gz_fetch(state) == -1)
+                return -1;
+        }
+    return 0;
+}
+
 /* Read len bytes into buf from file, or less than len up to the end of the
    input.  Return the number of bytes read.  If zero is returned, either the
    end of file was reached, or there was an error.  state->err must be
    consulted in that case to determine which. */
 local z_size_t gz_read(state, buf, len)
     gz_statep state;
-    voidp buf; 
+    voidp buf;
     z_size_t len;
-{ 
+{
     z_size_t got;
     unsigned n;
- 
-    /* if len is zero, avoid unnecessary operations */ 
-    if (len == 0) 
-        return 0; 
- 
-    /* process a skip request */ 
-    if (state->seek) { 
-        state->seek = 0; 
-        if (gz_skip(state, state->skip) == -1) 
+
+    /* if len is zero, avoid unnecessary operations */
+    if (len == 0)
+        return 0;
+
+    /* process a skip request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_skip(state, state->skip) == -1)
             return 0;
-    } 
- 
-    /* get len bytes to buf, or less than len if at the end */ 
-    got = 0; 
-    do { 
+    }
+
+    /* get len bytes to buf, or less than len if at the end */
+    got = 0;
+    do {
         /* set n to the maximum amount of len that fits in an unsigned int */
         n = -1;
         if (n > len)
             n = len;
 
-        /* first just try copying data from the output buffer */ 
-        if (state->x.have) { 
+        /* first just try copying data from the output buffer */
+        if (state->x.have) {
             if (state->x.have < n)
                 n = state->x.have;
-            memcpy(buf, state->x.next, n); 
-            state->x.next += n; 
-            state->x.have -= n; 
-        } 
- 
-        /* output buffer empty -- return if we're at the end of the input */ 
+            memcpy(buf, state->x.next, n);
+            state->x.next += n;
+            state->x.have -= n;
+        }
+
+        /* output buffer empty -- return if we're at the end of the input */
         else if (state->eof && state->strm.avail_in == 0) {
-            state->past = 1;        /* tried to read past end */ 
-            break; 
-        } 
- 
-        /* need output data -- for small len or new stream load up our output 
-           buffer */ 
+            state->past = 1;        /* tried to read past end */
+            break;
+        }
+
+        /* need output data -- for small len or new stream load up our output
+           buffer */
         else if (state->how == LOOK || n < (state->size << 1)) {
-            /* get more output, looking for header if required */ 
-            if (gz_fetch(state) == -1) 
+            /* get more output, looking for header if required */
+            if (gz_fetch(state) == -1)
                 return 0;
-            continue;       /* no progress yet -- go back to copy above */ 
-            /* the copy above assures that we will leave with space in the 
-               output buffer, allowing at least one gzungetc() to succeed */ 
-        } 
- 
-        /* large len -- read directly into user buffer */ 
-        else if (state->how == COPY) {      /* read directly */ 
+            continue;       /* no progress yet -- go back to copy above */
+            /* the copy above assures that we will leave with space in the
+               output buffer, allowing at least one gzungetc() to succeed */
+        }
+
+        /* large len -- read directly into user buffer */
+        else if (state->how == COPY) {      /* read directly */
             if (gz_load(state, (unsigned char *)buf, n, &n) == -1)
                 return 0;
-        } 
- 
-        /* large len -- decompress directly into user buffer */ 
-        else {  /* state->how == GZIP */ 
+        }
+
+        /* large len -- decompress directly into user buffer */
+        else {  /* state->how == GZIP */
             state->strm.avail_out = n;
             state->strm.next_out = (unsigned char *)buf;
-            if (gz_decomp(state) == -1) 
+            if (gz_decomp(state) == -1)
                 return 0;
-            n = state->x.have; 
-            state->x.have = 0; 
-        } 
- 
-        /* update progress */ 
-        len -= n; 
-        buf = (char *)buf + n; 
-        got += n; 
-        state->x.pos += n; 
-    } while (len); 
- 
+            n = state->x.have;
+            state->x.have = 0;
+        }
+
+        /* update progress */
+        len -= n;
+        buf = (char *)buf + n;
+        got += n;
+        state->x.pos += n;
+    } while (len);
+
     /* return number of bytes read into user buffer */
     return got;
-} 
- 
-/* -- see zlib.h -- */ 
+}
+
+/* -- see zlib.h -- */
 int ZEXPORT gzread(file, buf, len)
     gzFile file;
     voidp buf;
@@ -439,216 +439,216 @@ z_size_t ZEXPORT gzfread(buf, size, nitems, file)
 }
 
 /* -- see zlib.h -- */
-#ifdef Z_PREFIX_SET 
+#ifdef Z_PREFIX_SET
 #  undef z_gzgetc
-#else 
-#  undef gzgetc 
-#endif 
-int ZEXPORT gzgetc(file) 
-    gzFile file; 
-{ 
-    int ret; 
-    unsigned char buf[1]; 
-    gz_statep state; 
- 
-    /* get internal structure */ 
-    if (file == NULL) 
-        return -1; 
-    state = (gz_statep)file; 
- 
-    /* check that we're reading and that there's no (serious) error */ 
-    if (state->mode != GZ_READ || 
-        (state->err != Z_OK && state->err != Z_BUF_ERROR)) 
-        return -1; 
- 
-    /* try output buffer (no need to check for skip request) */ 
-    if (state->x.have) { 
-        state->x.have--; 
-        state->x.pos++; 
-        return *(state->x.next)++; 
-    } 
- 
+#else
+#  undef gzgetc
+#endif
+int ZEXPORT gzgetc(file)
+    gzFile file;
+{
+    int ret;
+    unsigned char buf[1];
+    gz_statep state;
+
+    /* get internal structure */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+
+    /* check that we're reading and that there's no (serious) error */
+    if (state->mode != GZ_READ ||
+        (state->err != Z_OK && state->err != Z_BUF_ERROR))
+        return -1;
+
+    /* try output buffer (no need to check for skip request) */
+    if (state->x.have) {
+        state->x.have--;
+        state->x.pos++;
+        return *(state->x.next)++;
+    }
+
     /* nothing there -- try gz_read() */
     ret = gz_read(state, buf, 1);
-    return ret < 1 ? -1 : buf[0]; 
-} 
- 
-int ZEXPORT gzgetc_(file) 
-gzFile file; 
-{ 
-    return gzgetc(file); 
-} 
- 
-/* -- see zlib.h -- */ 
-int ZEXPORT gzungetc(c, file) 
-    int c; 
-    gzFile file; 
-{ 
-    gz_statep state; 
- 
-    /* get internal structure */ 
-    if (file == NULL) 
-        return -1; 
-    state = (gz_statep)file; 
- 
-    /* check that we're reading and that there's no (serious) error */ 
-    if (state->mode != GZ_READ || 
-        (state->err != Z_OK && state->err != Z_BUF_ERROR)) 
-        return -1; 
- 
-    /* process a skip request */ 
-    if (state->seek) { 
-        state->seek = 0; 
-        if (gz_skip(state, state->skip) == -1) 
-            return -1; 
-    } 
- 
-    /* can't push EOF */ 
-    if (c < 0) 
-        return -1; 
- 
-    /* if output buffer empty, put byte at end (allows more pushing) */ 
-    if (state->x.have == 0) { 
-        state->x.have = 1; 
-        state->x.next = state->out + (state->size << 1) - 1; 
+    return ret < 1 ? -1 : buf[0];
+}
+
+int ZEXPORT gzgetc_(file)
+gzFile file;
+{
+    return gzgetc(file);
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzungetc(c, file)
+    int c;
+    gzFile file;
+{
+    gz_statep state;
+
+    /* get internal structure */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+
+    /* check that we're reading and that there's no (serious) error */
+    if (state->mode != GZ_READ ||
+        (state->err != Z_OK && state->err != Z_BUF_ERROR))
+        return -1;
+
+    /* process a skip request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_skip(state, state->skip) == -1)
+            return -1;
+    }
+
+    /* can't push EOF */
+    if (c < 0)
+        return -1;
+
+    /* if output buffer empty, put byte at end (allows more pushing) */
+    if (state->x.have == 0) {
+        state->x.have = 1;
+        state->x.next = state->out + (state->size << 1) - 1;
         state->x.next[0] = (unsigned char)c;
-        state->x.pos--; 
-        state->past = 0; 
-        return c; 
-    } 
- 
-    /* if no room, give up (must have already done a gzungetc()) */ 
-    if (state->x.have == (state->size << 1)) { 
-        gz_error(state, Z_DATA_ERROR, "out of room to push characters"); 
-        return -1; 
-    } 
- 
-    /* slide output data if needed and insert byte before existing data */ 
-    if (state->x.next == state->out) { 
-        unsigned char *src = state->out + state->x.have; 
-        unsigned char *dest = state->out + (state->size << 1); 
-        while (src > state->out) 
-            *--dest = *--src; 
-        state->x.next = dest; 
-    } 
-    state->x.have++; 
-    state->x.next--; 
+        state->x.pos--;
+        state->past = 0;
+        return c;
+    }
+
+    /* if no room, give up (must have already done a gzungetc()) */
+    if (state->x.have == (state->size << 1)) {
+        gz_error(state, Z_DATA_ERROR, "out of room to push characters");
+        return -1;
+    }
+
+    /* slide output data if needed and insert byte before existing data */
+    if (state->x.next == state->out) {
+        unsigned char *src = state->out + state->x.have;
+        unsigned char *dest = state->out + (state->size << 1);
+        while (src > state->out)
+            *--dest = *--src;
+        state->x.next = dest;
+    }
+    state->x.have++;
+    state->x.next--;
     state->x.next[0] = (unsigned char)c;
-    state->x.pos--; 
-    state->past = 0; 
-    return c; 
-} 
- 
-/* -- see zlib.h -- */ 
-char * ZEXPORT gzgets(file, buf, len) 
-    gzFile file; 
-    char *buf; 
-    int len; 
-{ 
-    unsigned left, n; 
-    char *str; 
-    unsigned char *eol; 
-    gz_statep state; 
- 
-    /* check parameters and get internal structure */ 
-    if (file == NULL || buf == NULL || len < 1) 
-        return NULL; 
-    state = (gz_statep)file; 
- 
-    /* check that we're reading and that there's no (serious) error */ 
-    if (state->mode != GZ_READ || 
-        (state->err != Z_OK && state->err != Z_BUF_ERROR)) 
-        return NULL; 
- 
-    /* process a skip request */ 
-    if (state->seek) { 
-        state->seek = 0; 
-        if (gz_skip(state, state->skip) == -1) 
-            return NULL; 
-    } 
- 
-    /* copy output bytes up to new line or len - 1, whichever comes first -- 
-       append a terminating zero to the string (we don't check for a zero in 
-       the contents, let the user worry about that) */ 
-    str = buf; 
-    left = (unsigned)len - 1; 
-    if (left) do { 
-        /* assure that something is in the output buffer */ 
-        if (state->x.have == 0 && gz_fetch(state) == -1) 
-            return NULL;                /* error */ 
-        if (state->x.have == 0) {       /* end of file */ 
-            state->past = 1;            /* read past end */ 
-            break;                      /* return what we have */ 
-        } 
- 
-        /* look for end-of-line in current output buffer */ 
-        n = state->x.have > left ? left : state->x.have; 
-        eol = (unsigned char *)memchr(state->x.next, '\n', n); 
-        if (eol != NULL) 
-            n = (unsigned)(eol - state->x.next) + 1; 
- 
-        /* copy through end-of-line, or remainder if not found */ 
-        memcpy(buf, state->x.next, n); 
-        state->x.have -= n; 
-        state->x.next += n; 
-        state->x.pos += n; 
-        left -= n; 
-        buf += n; 
-    } while (left && eol == NULL); 
- 
-    /* return terminated string, or if nothing, end of file */ 
-    if (buf == str) 
-        return NULL; 
-    buf[0] = 0; 
-    return str; 
-} 
- 
-/* -- see zlib.h -- */ 
-int ZEXPORT gzdirect(file) 
-    gzFile file; 
-{ 
-    gz_statep state; 
- 
-    /* get internal structure */ 
-    if (file == NULL) 
-        return 0; 
-    state = (gz_statep)file; 
- 
-    /* if the state is not known, but we can find out, then do so (this is 
-       mainly for right after a gzopen() or gzdopen()) */ 
-    if (state->mode == GZ_READ && state->how == LOOK && state->x.have == 0) 
-        (void)gz_look(state); 
- 
-    /* return 1 if transparent, 0 if processing a gzip stream */ 
-    return state->direct; 
-} 
- 
-/* -- see zlib.h -- */ 
-int ZEXPORT gzclose_r(file) 
-    gzFile file; 
-{ 
-    int ret, err; 
-    gz_statep state; 
- 
-    /* get internal structure */ 
-    if (file == NULL) 
-        return Z_STREAM_ERROR; 
-    state = (gz_statep)file; 
- 
-    /* check that we're reading */ 
-    if (state->mode != GZ_READ) 
-        return Z_STREAM_ERROR; 
- 
-    /* free memory and close file */ 
-    if (state->size) { 
-        inflateEnd(&(state->strm)); 
-        free(state->out); 
-        free(state->in); 
-    } 
-    err = state->err == Z_BUF_ERROR ? Z_BUF_ERROR : Z_OK; 
-    gz_error(state, Z_OK, NULL); 
-    free(state->path); 
-    ret = close(state->fd); 
-    free(state); 
-    return ret ? Z_ERRNO : err; 
-} 
+    state->x.pos--;
+    state->past = 0;
+    return c;
+}
+
+/* -- see zlib.h -- */
+char * ZEXPORT gzgets(file, buf, len)
+    gzFile file;
+    char *buf;
+    int len;
+{
+    unsigned left, n;
+    char *str;
+    unsigned char *eol;
+    gz_statep state;
+
+    /* check parameters and get internal structure */
+    if (file == NULL || buf == NULL || len < 1)
+        return NULL;
+    state = (gz_statep)file;
+
+    /* check that we're reading and that there's no (serious) error */
+    if (state->mode != GZ_READ ||
+        (state->err != Z_OK && state->err != Z_BUF_ERROR))
+        return NULL;
+
+    /* process a skip request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_skip(state, state->skip) == -1)
+            return NULL;
+    }
+
+    /* copy output bytes up to new line or len - 1, whichever comes first --
+       append a terminating zero to the string (we don't check for a zero in
+       the contents, let the user worry about that) */
+    str = buf;
+    left = (unsigned)len - 1;
+    if (left) do {
+        /* assure that something is in the output buffer */
+        if (state->x.have == 0 && gz_fetch(state) == -1)
+            return NULL;                /* error */
+        if (state->x.have == 0) {       /* end of file */
+            state->past = 1;            /* read past end */
+            break;                      /* return what we have */
+        }
+
+        /* look for end-of-line in current output buffer */
+        n = state->x.have > left ? left : state->x.have;
+        eol = (unsigned char *)memchr(state->x.next, '\n', n);
+        if (eol != NULL)
+            n = (unsigned)(eol - state->x.next) + 1;
+
+        /* copy through end-of-line, or remainder if not found */
+        memcpy(buf, state->x.next, n);
+        state->x.have -= n;
+        state->x.next += n;
+        state->x.pos += n;
+        left -= n;
+        buf += n;
+    } while (left && eol == NULL);
+
+    /* return terminated string, or if nothing, end of file */
+    if (buf == str)
+        return NULL;
+    buf[0] = 0;
+    return str;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzdirect(file)
+    gzFile file;
+{
+    gz_statep state;
+
+    /* get internal structure */
+    if (file == NULL)
+        return 0;
+    state = (gz_statep)file;
+
+    /* if the state is not known, but we can find out, then do so (this is
+       mainly for right after a gzopen() or gzdopen()) */
+    if (state->mode == GZ_READ && state->how == LOOK && state->x.have == 0)
+        (void)gz_look(state);
+
+    /* return 1 if transparent, 0 if processing a gzip stream */
+    return state->direct;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzclose_r(file)
+    gzFile file;
+{
+    int ret, err;
+    gz_statep state;
+
+    /* get internal structure */
+    if (file == NULL)
+        return Z_STREAM_ERROR;
+    state = (gz_statep)file;
+
+    /* check that we're reading */
+    if (state->mode != GZ_READ)
+        return Z_STREAM_ERROR;
+
+    /* free memory and close file */
+    if (state->size) {
+        inflateEnd(&(state->strm));
+        free(state->out);
+        free(state->in);
+    }
+    err = state->err == Z_BUF_ERROR ? Z_BUF_ERROR : Z_OK;
+    gz_error(state, Z_OK, NULL);
+    free(state->path);
+    ret = close(state->fd);
+    free(state);
+    return ret ? Z_ERRNO : err;
+}
diff --git a/contrib/libs/zlib/gzwrite.c b/contrib/libs/zlib/gzwrite.c
index 26aa87d5d5..c7b5651d70 100644
--- a/contrib/libs/zlib/gzwrite.c
+++ b/contrib/libs/zlib/gzwrite.c
@@ -1,89 +1,89 @@
-/* gzwrite.c -- zlib functions for writing gzip files 
+/* gzwrite.c -- zlib functions for writing gzip files
  * Copyright (C) 2004-2017 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */ 
- 
-#include "gzguts.h" 
- 
-/* Local functions */ 
-local int gz_init OF((gz_statep)); 
-local int gz_comp OF((gz_statep, int)); 
-local int gz_zero OF((gz_statep, z_off64_t)); 
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "gzguts.h"
+
+/* Local functions */
+local int gz_init OF((gz_statep));
+local int gz_comp OF((gz_statep, int));
+local int gz_zero OF((gz_statep, z_off64_t));
 local z_size_t gz_write OF((gz_statep, voidpc, z_size_t));
- 
-/* Initialize state for writing a gzip file.  Mark initialization by setting 
+
+/* Initialize state for writing a gzip file.  Mark initialization by setting
    state->size to non-zero.  Return -1 on a memory allocation failure, or 0 on
    success. */
-local int gz_init(state) 
-    gz_statep state; 
-{ 
-    int ret; 
-    z_streamp strm = &(state->strm); 
- 
+local int gz_init(state)
+    gz_statep state;
+{
+    int ret;
+    z_streamp strm = &(state->strm);
+
     /* allocate input buffer (double size for gzprintf) */
     state->in = (unsigned char *)malloc(state->want << 1);
-    if (state->in == NULL) { 
-        gz_error(state, Z_MEM_ERROR, "out of memory"); 
-        return -1; 
-    } 
- 
-    /* only need output buffer and deflate state if compressing */ 
-    if (!state->direct) { 
-        /* allocate output buffer */ 
-        state->out = (unsigned char *)malloc(state->want); 
-        if (state->out == NULL) { 
-            free(state->in); 
-            gz_error(state, Z_MEM_ERROR, "out of memory"); 
-            return -1; 
-        } 
- 
-        /* allocate deflate memory, set up for gzip compression */ 
-        strm->zalloc = Z_NULL; 
-        strm->zfree = Z_NULL; 
-        strm->opaque = Z_NULL; 
-        ret = deflateInit2(strm, state->level, Z_DEFLATED, 
-                           MAX_WBITS + 16, DEF_MEM_LEVEL, state->strategy); 
-        if (ret != Z_OK) { 
-            free(state->out); 
-            free(state->in); 
-            gz_error(state, Z_MEM_ERROR, "out of memory"); 
-            return -1; 
-        } 
+    if (state->in == NULL) {
+        gz_error(state, Z_MEM_ERROR, "out of memory");
+        return -1;
+    }
+
+    /* only need output buffer and deflate state if compressing */
+    if (!state->direct) {
+        /* allocate output buffer */
+        state->out = (unsigned char *)malloc(state->want);
+        if (state->out == NULL) {
+            free(state->in);
+            gz_error(state, Z_MEM_ERROR, "out of memory");
+            return -1;
+        }
+
+        /* allocate deflate memory, set up for gzip compression */
+        strm->zalloc = Z_NULL;
+        strm->zfree = Z_NULL;
+        strm->opaque = Z_NULL;
+        ret = deflateInit2(strm, state->level, Z_DEFLATED,
+                           MAX_WBITS + 16, DEF_MEM_LEVEL, state->strategy);
+        if (ret != Z_OK) {
+            free(state->out);
+            free(state->in);
+            gz_error(state, Z_MEM_ERROR, "out of memory");
+            return -1;
+        }
         strm->next_in = NULL;
-    } 
- 
-    /* mark state as initialized */ 
-    state->size = state->want; 
- 
-    /* initialize write buffer if compressing */ 
-    if (!state->direct) { 
-        strm->avail_out = state->size; 
-        strm->next_out = state->out; 
-        state->x.next = strm->next_out; 
-    } 
-    return 0; 
-} 
- 
-/* Compress whatever is at avail_in and next_in and write to the output file. 
+    }
+
+    /* mark state as initialized */
+    state->size = state->want;
+
+    /* initialize write buffer if compressing */
+    if (!state->direct) {
+        strm->avail_out = state->size;
+        strm->next_out = state->out;
+        state->x.next = strm->next_out;
+    }
+    return 0;
+}
+
+/* Compress whatever is at avail_in and next_in and write to the output file.
    Return -1 if there is an error writing to the output file or if gz_init()
    fails to allocate memory, otherwise 0.  flush is assumed to be a valid
    deflate() flush value.  If flush is Z_FINISH, then the deflate() state is
    reset to start a new gzip stream.  If gz->direct is true, then simply write
    to the output file without compressing, and ignore flush. */
-local int gz_comp(state, flush) 
-    gz_statep state; 
-    int flush; 
-{ 
+local int gz_comp(state, flush)
+    gz_statep state;
+    int flush;
+{
     int ret, writ;
     unsigned have, put, max = ((unsigned)-1 >> 2) + 1;
-    z_streamp strm = &(state->strm); 
- 
-    /* allocate memory if this is the first time through */ 
-    if (state->size == 0 && gz_init(state) == -1) 
-        return -1; 
- 
-    /* write directly if requested */ 
-    if (state->direct) { 
+    z_streamp strm = &(state->strm);
+
+    /* allocate memory if this is the first time through */
+    if (state->size == 0 && gz_init(state) == -1)
+        return -1;
+
+    /* write directly if requested */
+    if (state->direct) {
         while (strm->avail_in) {
             put = strm->avail_in > max ? max : strm->avail_in;
             writ = write(state->fd, strm->next_in, put);
@@ -93,17 +93,17 @@ local int gz_comp(state, flush)
             }
             strm->avail_in -= (unsigned)writ;
             strm->next_in += writ;
-        } 
-        return 0; 
-    } 
- 
-    /* run deflate() on provided input until it produces no more output */ 
-    ret = Z_OK; 
-    do { 
-        /* write out current buffer contents if full, or if flushing, but if 
-           doing Z_FINISH then don't write until we get to Z_STREAM_END */ 
-        if (strm->avail_out == 0 || (flush != Z_NO_FLUSH && 
-            (flush != Z_FINISH || ret == Z_STREAM_END))) { 
+        }
+        return 0;
+    }
+
+    /* run deflate() on provided input until it produces no more output */
+    ret = Z_OK;
+    do {
+        /* write out current buffer contents if full, or if flushing, but if
+           doing Z_FINISH then don't write until we get to Z_STREAM_END */
+        if (strm->avail_out == 0 || (flush != Z_NO_FLUSH &&
+            (flush != Z_FINISH || ret == Z_STREAM_END))) {
             while (strm->next_out > state->x.next) {
                 put = strm->next_out - state->x.next > (int)max ? max :
                       (unsigned)(strm->next_out - state->x.next);
@@ -113,118 +113,118 @@ local int gz_comp(state, flush)
                     return -1;
                 }
                 state->x.next += writ;
-            } 
-            if (strm->avail_out == 0) { 
-                strm->avail_out = state->size; 
-                strm->next_out = state->out; 
+            }
+            if (strm->avail_out == 0) {
+                strm->avail_out = state->size;
+                strm->next_out = state->out;
                 state->x.next = state->out;
-            } 
-        } 
- 
-        /* compress */ 
-        have = strm->avail_out; 
-        ret = deflate(strm, flush); 
-        if (ret == Z_STREAM_ERROR) { 
-            gz_error(state, Z_STREAM_ERROR, 
-                      "internal error: deflate stream corrupt"); 
-            return -1; 
-        } 
-        have -= strm->avail_out; 
-    } while (have); 
- 
-    /* if that completed a deflate stream, allow another to start */ 
-    if (flush == Z_FINISH) 
-        deflateReset(strm); 
- 
-    /* all done, no errors */ 
-    return 0; 
-} 
- 
+            }
+        }
+
+        /* compress */
+        have = strm->avail_out;
+        ret = deflate(strm, flush);
+        if (ret == Z_STREAM_ERROR) {
+            gz_error(state, Z_STREAM_ERROR,
+                      "internal error: deflate stream corrupt");
+            return -1;
+        }
+        have -= strm->avail_out;
+    } while (have);
+
+    /* if that completed a deflate stream, allow another to start */
+    if (flush == Z_FINISH)
+        deflateReset(strm);
+
+    /* all done, no errors */
+    return 0;
+}
+
 /* Compress len zeros to output.  Return -1 on a write error or memory
    allocation failure by gz_comp(), or 0 on success. */
-local int gz_zero(state, len) 
-    gz_statep state; 
-    z_off64_t len; 
-{ 
-    int first; 
-    unsigned n; 
-    z_streamp strm = &(state->strm); 
- 
-    /* consume whatever's left in the input buffer */ 
-    if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1) 
-        return -1; 
- 
-    /* compress len zeros (len guaranteed > 0) */ 
-    first = 1; 
-    while (len) { 
-        n = GT_OFF(state->size) || (z_off64_t)state->size > len ? 
-            (unsigned)len : state->size; 
-        if (first) { 
-            memset(state->in, 0, n); 
-            first = 0; 
-        } 
-        strm->avail_in = n; 
-        strm->next_in = state->in; 
-        state->x.pos += n; 
-        if (gz_comp(state, Z_NO_FLUSH) == -1) 
-            return -1; 
-        len -= n; 
-    } 
-    return 0; 
-} 
- 
+local int gz_zero(state, len)
+    gz_statep state;
+    z_off64_t len;
+{
+    int first;
+    unsigned n;
+    z_streamp strm = &(state->strm);
+
+    /* consume whatever's left in the input buffer */
+    if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
+        return -1;
+
+    /* compress len zeros (len guaranteed > 0) */
+    first = 1;
+    while (len) {
+        n = GT_OFF(state->size) || (z_off64_t)state->size > len ?
+            (unsigned)len : state->size;
+        if (first) {
+            memset(state->in, 0, n);
+            first = 0;
+        }
+        strm->avail_in = n;
+        strm->next_in = state->in;
+        state->x.pos += n;
+        if (gz_comp(state, Z_NO_FLUSH) == -1)
+            return -1;
+        len -= n;
+    }
+    return 0;
+}
+
 /* Write len bytes from buf to file.  Return the number of bytes written.  If
    the returned value is less than len, then there was an error. */
 local z_size_t gz_write(state, buf, len)
     gz_statep state;
-    voidpc buf; 
+    voidpc buf;
     z_size_t len;
-{ 
+{
     z_size_t put = len;
- 
-    /* if len is zero, avoid unnecessary operations */ 
-    if (len == 0) 
-        return 0; 
- 
-    /* allocate memory if this is the first time through */ 
-    if (state->size == 0 && gz_init(state) == -1) 
-        return 0; 
- 
-    /* check for seek request */ 
-    if (state->seek) { 
-        state->seek = 0; 
-        if (gz_zero(state, state->skip) == -1) 
-            return 0; 
-    } 
- 
-    /* for small len, copy to input buffer, otherwise compress directly */ 
-    if (len < state->size) { 
-        /* copy to input buffer, compress when full */ 
-        do { 
-            unsigned have, copy; 
- 
+
+    /* if len is zero, avoid unnecessary operations */
+    if (len == 0)
+        return 0;
+
+    /* allocate memory if this is the first time through */
+    if (state->size == 0 && gz_init(state) == -1)
+        return 0;
+
+    /* check for seek request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_zero(state, state->skip) == -1)
+            return 0;
+    }
+
+    /* for small len, copy to input buffer, otherwise compress directly */
+    if (len < state->size) {
+        /* copy to input buffer, compress when full */
+        do {
+            unsigned have, copy;
+
             if (state->strm.avail_in == 0)
                 state->strm.next_in = state->in;
             have = (unsigned)((state->strm.next_in + state->strm.avail_in) -
                               state->in);
-            copy = state->size - have; 
-            if (copy > len) 
-                copy = len; 
-            memcpy(state->in + have, buf, copy); 
+            copy = state->size - have;
+            if (copy > len)
+                copy = len;
+            memcpy(state->in + have, buf, copy);
             state->strm.avail_in += copy;
-            state->x.pos += copy; 
-            buf = (const char *)buf + copy; 
-            len -= copy; 
-            if (len && gz_comp(state, Z_NO_FLUSH) == -1) 
-                return 0; 
-        } while (len); 
-    } 
-    else { 
-        /* consume whatever's left in the input buffer */ 
+            state->x.pos += copy;
+            buf = (const char *)buf + copy;
+            len -= copy;
+            if (len && gz_comp(state, Z_NO_FLUSH) == -1)
+                return 0;
+        } while (len);
+    }
+    else {
+        /* consume whatever's left in the input buffer */
         if (state->strm.avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
-            return 0; 
- 
-        /* directly compress user buffer to file */ 
+            return 0;
+
+        /* directly compress user buffer to file */
         state->strm.next_in = (z_const Bytef *)buf;
         do {
             unsigned n = (unsigned)-1;
@@ -236,13 +236,13 @@ local z_size_t gz_write(state, buf, len)
                 return 0;
             len -= n;
         } while (len);
-    } 
- 
+    }
+
     /* input was all buffered or compressed */
     return put;
-} 
- 
-/* -- see zlib.h -- */ 
+}
+
+/* -- see zlib.h -- */
 int ZEXPORT gzwrite(file, buf, len)
     gzFile file;
     voidpc buf;
@@ -301,62 +301,62 @@ z_size_t ZEXPORT gzfwrite(buf, size, nitems, file)
 }
 
 /* -- see zlib.h -- */
-int ZEXPORT gzputc(file, c) 
-    gzFile file; 
-    int c; 
-{ 
-    unsigned have; 
-    unsigned char buf[1]; 
-    gz_statep state; 
-    z_streamp strm; 
- 
-    /* get internal structure */ 
-    if (file == NULL) 
-        return -1; 
-    state = (gz_statep)file; 
-    strm = &(state->strm); 
- 
-    /* check that we're writing and that there's no error */ 
-    if (state->mode != GZ_WRITE || state->err != Z_OK) 
-        return -1; 
- 
-    /* check for seek request */ 
-    if (state->seek) { 
-        state->seek = 0; 
-        if (gz_zero(state, state->skip) == -1) 
-            return -1; 
-    } 
- 
-    /* try writing to input buffer for speed (state->size == 0 if buffer not 
-       initialized) */ 
-    if (state->size) { 
-        if (strm->avail_in == 0) 
-            strm->next_in = state->in; 
-        have = (unsigned)((strm->next_in + strm->avail_in) - state->in); 
-        if (have < state->size) { 
+int ZEXPORT gzputc(file, c)
+    gzFile file;
+    int c;
+{
+    unsigned have;
+    unsigned char buf[1];
+    gz_statep state;
+    z_streamp strm;
+
+    /* get internal structure */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+    strm = &(state->strm);
+
+    /* check that we're writing and that there's no error */
+    if (state->mode != GZ_WRITE || state->err != Z_OK)
+        return -1;
+
+    /* check for seek request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_zero(state, state->skip) == -1)
+            return -1;
+    }
+
+    /* try writing to input buffer for speed (state->size == 0 if buffer not
+       initialized) */
+    if (state->size) {
+        if (strm->avail_in == 0)
+            strm->next_in = state->in;
+        have = (unsigned)((strm->next_in + strm->avail_in) - state->in);
+        if (have < state->size) {
             state->in[have] = (unsigned char)c;
-            strm->avail_in++; 
-            state->x.pos++; 
-            return c & 0xff; 
-        } 
-    } 
- 
-    /* no room in buffer or not initialized, use gz_write() */ 
+            strm->avail_in++;
+            state->x.pos++;
+            return c & 0xff;
+        }
+    }
+
+    /* no room in buffer or not initialized, use gz_write() */
     buf[0] = (unsigned char)c;
     if (gz_write(state, buf, 1) != 1)
-        return -1; 
-    return c & 0xff; 
-} 
- 
-/* -- see zlib.h -- */ 
-int ZEXPORT gzputs(file, str) 
-    gzFile file; 
-    const char *str; 
-{ 
-    int ret; 
+        return -1;
+    return c & 0xff;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzputs(file, str)
+    gzFile file;
+    const char *str;
+{
+    int ret;
     z_size_t len;
     gz_statep state;
- 
+
     /* get internal structure */
     if (file == NULL)
         return -1;
@@ -366,45 +366,45 @@ int ZEXPORT gzputs(file, str)
     if (state->mode != GZ_WRITE || state->err != Z_OK)
         return -1;
 
-    /* write string */ 
+    /* write string */
     len = strlen(str);
     ret = gz_write(state, str, len);
-    return ret == 0 && len != 0 ? -1 : ret; 
-} 
- 
-#if defined(STDC) || defined(Z_HAVE_STDARG_H) 
-#include <stdarg.h> 
- 
-/* -- see zlib.h -- */ 
-int ZEXPORTVA gzvprintf(gzFile file, const char *format, va_list va) 
-{ 
+    return ret == 0 && len != 0 ? -1 : ret;
+}
+
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#include <stdarg.h>
+
+/* -- see zlib.h -- */
+int ZEXPORTVA gzvprintf(gzFile file, const char *format, va_list va)
+{
     int len;
     unsigned left;
     char *next;
-    gz_statep state; 
-    z_streamp strm; 
- 
-    /* get internal structure */ 
-    if (file == NULL) 
+    gz_statep state;
+    z_streamp strm;
+
+    /* get internal structure */
+    if (file == NULL)
         return Z_STREAM_ERROR;
-    state = (gz_statep)file; 
-    strm = &(state->strm); 
- 
-    /* check that we're writing and that there's no error */ 
-    if (state->mode != GZ_WRITE || state->err != Z_OK) 
+    state = (gz_statep)file;
+    strm = &(state->strm);
+
+    /* check that we're writing and that there's no error */
+    if (state->mode != GZ_WRITE || state->err != Z_OK)
         return Z_STREAM_ERROR;
- 
-    /* make sure we have some buffer space */ 
-    if (state->size == 0 && gz_init(state) == -1) 
+
+    /* make sure we have some buffer space */
+    if (state->size == 0 && gz_init(state) == -1)
         return state->err;
- 
-    /* check for seek request */ 
-    if (state->seek) { 
-        state->seek = 0; 
-        if (gz_zero(state, state->skip) == -1) 
+
+    /* check for seek request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_zero(state, state->skip) == -1)
             return state->err;
-    } 
- 
+    }
+
     /* do the printf() into the input buffer, put length in len -- the input
        buffer is double-sized just for this function, so there is guaranteed to
        be state->size bytes available after the current contents */
@@ -412,30 +412,30 @@ int ZEXPORTVA gzvprintf(gzFile file, const char *format, va_list va)
         strm->next_in = state->in;
     next = (char *)(state->in + (strm->next_in - state->in) + strm->avail_in);
     next[state->size - 1] = 0;
-#ifdef NO_vsnprintf 
-#  ifdef HAS_vsprintf_void 
+#ifdef NO_vsnprintf
+#  ifdef HAS_vsprintf_void
     (void)vsprintf(next, format, va);
     for (len = 0; len < state->size; len++)
         if (next[len] == 0) break;
-#  else 
+#  else
     len = vsprintf(next, format, va);
-#  endif 
-#else 
-#  ifdef HAS_vsnprintf_void 
+#  endif
+#else
+#  ifdef HAS_vsnprintf_void
     (void)vsnprintf(next, state->size, format, va);
     len = strlen(next);
-#  else 
+#  else
     len = vsnprintf(next, state->size, format, va);
-#  endif 
-#endif 
- 
-    /* check that printf() results fit in buffer */ 
+#  endif
+#endif
+
+    /* check that printf() results fit in buffer */
     if (len == 0 || (unsigned)len >= state->size || next[state->size - 1] != 0)
-        return 0; 
- 
+        return 0;
+
     /* update buffer and position, compress first half if past that */
     strm->avail_in += (unsigned)len;
-    state->x.pos += len; 
+    state->x.pos += len;
     if (strm->avail_in >= state->size) {
         left = strm->avail_in - state->size;
         strm->avail_in = state->size;
@@ -445,60 +445,60 @@ int ZEXPORTVA gzvprintf(gzFile file, const char *format, va_list va)
         strm->next_in = state->in;
         strm->avail_in = left;
     }
-    return len; 
-} 
- 
-int ZEXPORTVA gzprintf(gzFile file, const char *format, ...) 
-{ 
-    va_list va; 
-    int ret; 
- 
-    va_start(va, format); 
-    ret = gzvprintf(file, format, va); 
-    va_end(va); 
-    return ret; 
-} 
- 
-#else /* !STDC && !Z_HAVE_STDARG_H */ 
- 
-/* -- see zlib.h -- */ 
-int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, 
-                       a11, a12, a13, a14, a15, a16, a17, a18, a19, a20) 
-    gzFile file; 
-    const char *format; 
-    int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, 
-        a11, a12, a13, a14, a15, a16, a17, a18, a19, a20; 
-{ 
+    return len;
+}
+
+int ZEXPORTVA gzprintf(gzFile file, const char *format, ...)
+{
+    va_list va;
+    int ret;
+
+    va_start(va, format);
+    ret = gzvprintf(file, format, va);
+    va_end(va);
+    return ret;
+}
+
+#else /* !STDC && !Z_HAVE_STDARG_H */
+
+/* -- see zlib.h -- */
+int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
+                       a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)
+    gzFile file;
+    const char *format;
+    int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
+        a11, a12, a13, a14, a15, a16, a17, a18, a19, a20;
+{
     unsigned len, left;
     char *next;
-    gz_statep state; 
-    z_streamp strm; 
- 
-    /* get internal structure */ 
-    if (file == NULL) 
+    gz_statep state;
+    z_streamp strm;
+
+    /* get internal structure */
+    if (file == NULL)
         return Z_STREAM_ERROR;
-    state = (gz_statep)file; 
-    strm = &(state->strm); 
- 
-    /* check that can really pass pointer in ints */ 
-    if (sizeof(int) != sizeof(void *)) 
+    state = (gz_statep)file;
+    strm = &(state->strm);
+
+    /* check that can really pass pointer in ints */
+    if (sizeof(int) != sizeof(void *))
         return Z_STREAM_ERROR;
- 
-    /* check that we're writing and that there's no error */ 
-    if (state->mode != GZ_WRITE || state->err != Z_OK) 
+
+    /* check that we're writing and that there's no error */
+    if (state->mode != GZ_WRITE || state->err != Z_OK)
         return Z_STREAM_ERROR;
- 
-    /* make sure we have some buffer space */ 
-    if (state->size == 0 && gz_init(state) == -1) 
+
+    /* make sure we have some buffer space */
+    if (state->size == 0 && gz_init(state) == -1)
         return state->error;
- 
-    /* check for seek request */ 
-    if (state->seek) { 
-        state->seek = 0; 
-        if (gz_zero(state, state->skip) == -1) 
+
+    /* check for seek request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_zero(state, state->skip) == -1)
             return state->error;
-    } 
- 
+    }
+
     /* do the printf() into the input buffer, put length in len -- the input
        buffer is double-sized just for this function, so there is guaranteed to
        be state->size bytes available after the current contents */
@@ -506,35 +506,35 @@ int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
         strm->next_in = state->in;
     next = (char *)(strm->next_in + strm->avail_in);
     next[state->size - 1] = 0;
-#ifdef NO_snprintf 
-#  ifdef HAS_sprintf_void 
+#ifdef NO_snprintf
+#  ifdef HAS_sprintf_void
     sprintf(next, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12,
             a13, a14, a15, a16, a17, a18, a19, a20);
-    for (len = 0; len < size; len++) 
+    for (len = 0; len < size; len++)
         if (next[len] == 0)
             break;
-#  else 
+#  else
     len = sprintf(next, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11,
                   a12, a13, a14, a15, a16, a17, a18, a19, a20);
-#  endif 
-#else 
-#  ifdef HAS_snprintf_void 
+#  endif
+#else
+#  ifdef HAS_snprintf_void
     snprintf(next, state->size, format, a1, a2, a3, a4, a5, a6, a7, a8, a9,
              a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
     len = strlen(next);
-#  else 
+#  else
     len = snprintf(next, state->size, format, a1, a2, a3, a4, a5, a6, a7, a8,
                    a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
-#  endif 
-#endif 
- 
-    /* check that printf() results fit in buffer */ 
+#  endif
+#endif
+
+    /* check that printf() results fit in buffer */
     if (len == 0 || len >= state->size || next[state->size - 1] != 0)
-        return 0; 
- 
+        return 0;
+
     /* update buffer and position, compress first half if past that */
     strm->avail_in += len;
-    state->x.pos += len; 
+    state->x.pos += len;
     if (strm->avail_in >= state->size) {
         left = strm->avail_in - state->size;
         strm->avail_in = state->size;
@@ -545,121 +545,121 @@ int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
         strm->avail_in = left;
     }
     return (int)len;
-} 
- 
-#endif 
- 
-/* -- see zlib.h -- */ 
-int ZEXPORT gzflush(file, flush) 
-    gzFile file; 
-    int flush; 
-{ 
-    gz_statep state; 
- 
-    /* get internal structure */ 
-    if (file == NULL) 
+}
+
+#endif
+
+/* -- see zlib.h -- */
+int ZEXPORT gzflush(file, flush)
+    gzFile file;
+    int flush;
+{
+    gz_statep state;
+
+    /* get internal structure */
+    if (file == NULL)
         return Z_STREAM_ERROR;
-    state = (gz_statep)file; 
- 
-    /* check that we're writing and that there's no error */ 
-    if (state->mode != GZ_WRITE || state->err != Z_OK) 
-        return Z_STREAM_ERROR; 
- 
-    /* check flush parameter */ 
-    if (flush < 0 || flush > Z_FINISH) 
-        return Z_STREAM_ERROR; 
- 
-    /* check for seek request */ 
-    if (state->seek) { 
-        state->seek = 0; 
-        if (gz_zero(state, state->skip) == -1) 
+    state = (gz_statep)file;
+
+    /* check that we're writing and that there's no error */
+    if (state->mode != GZ_WRITE || state->err != Z_OK)
+        return Z_STREAM_ERROR;
+
+    /* check flush parameter */
+    if (flush < 0 || flush > Z_FINISH)
+        return Z_STREAM_ERROR;
+
+    /* check for seek request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_zero(state, state->skip) == -1)
             return state->err;
-    } 
- 
-    /* compress remaining data with requested flush */ 
+    }
+
+    /* compress remaining data with requested flush */
     (void)gz_comp(state, flush);
-    return state->err; 
-} 
- 
-/* -- see zlib.h -- */ 
-int ZEXPORT gzsetparams(file, level, strategy) 
-    gzFile file; 
-    int level; 
-    int strategy; 
-{ 
-    gz_statep state; 
-    z_streamp strm; 
- 
-    /* get internal structure */ 
-    if (file == NULL) 
-        return Z_STREAM_ERROR; 
-    state = (gz_statep)file; 
-    strm = &(state->strm); 
- 
-    /* check that we're writing and that there's no error */ 
-    if (state->mode != GZ_WRITE || state->err != Z_OK) 
-        return Z_STREAM_ERROR; 
- 
-    /* if no change is requested, then do nothing */ 
-    if (level == state->level && strategy == state->strategy) 
-        return Z_OK; 
- 
-    /* check for seek request */ 
-    if (state->seek) { 
-        state->seek = 0; 
-        if (gz_zero(state, state->skip) == -1) 
+    return state->err;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzsetparams(file, level, strategy)
+    gzFile file;
+    int level;
+    int strategy;
+{
+    gz_statep state;
+    z_streamp strm;
+
+    /* get internal structure */
+    if (file == NULL)
+        return Z_STREAM_ERROR;
+    state = (gz_statep)file;
+    strm = &(state->strm);
+
+    /* check that we're writing and that there's no error */
+    if (state->mode != GZ_WRITE || state->err != Z_OK)
+        return Z_STREAM_ERROR;
+
+    /* if no change is requested, then do nothing */
+    if (level == state->level && strategy == state->strategy)
+        return Z_OK;
+
+    /* check for seek request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_zero(state, state->skip) == -1)
             return state->err;
-    } 
- 
-    /* change compression parameters for subsequent input */ 
-    if (state->size) { 
-        /* flush previous input with previous parameters before changing */ 
+    }
+
+    /* change compression parameters for subsequent input */
+    if (state->size) {
+        /* flush previous input with previous parameters before changing */
         if (strm->avail_in && gz_comp(state, Z_BLOCK) == -1)
-            return state->err; 
-        deflateParams(strm, level, strategy); 
-    } 
-    state->level = level; 
-    state->strategy = strategy; 
-    return Z_OK; 
-} 
- 
-/* -- see zlib.h -- */ 
-int ZEXPORT gzclose_w(file) 
-    gzFile file; 
-{ 
-    int ret = Z_OK; 
-    gz_statep state; 
- 
-    /* get internal structure */ 
-    if (file == NULL) 
-        return Z_STREAM_ERROR; 
-    state = (gz_statep)file; 
- 
-    /* check that we're writing */ 
-    if (state->mode != GZ_WRITE) 
-        return Z_STREAM_ERROR; 
- 
-    /* check for seek request */ 
-    if (state->seek) { 
-        state->seek = 0; 
-        if (gz_zero(state, state->skip) == -1) 
-            ret = state->err; 
-    } 
- 
-    /* flush, free memory, and close file */ 
-    if (gz_comp(state, Z_FINISH) == -1) 
-        ret = state->err; 
-    if (state->size) { 
-        if (!state->direct) { 
-            (void)deflateEnd(&(state->strm)); 
-            free(state->out); 
-        } 
-        free(state->in); 
-    } 
-    gz_error(state, Z_OK, NULL); 
-    free(state->path); 
-    if (close(state->fd) == -1) 
-        ret = Z_ERRNO; 
-    free(state); 
-    return ret; 
-} 
+            return state->err;
+        deflateParams(strm, level, strategy);
+    }
+    state->level = level;
+    state->strategy = strategy;
+    return Z_OK;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzclose_w(file)
+    gzFile file;
+{
+    int ret = Z_OK;
+    gz_statep state;
+
+    /* get internal structure */
+    if (file == NULL)
+        return Z_STREAM_ERROR;
+    state = (gz_statep)file;
+
+    /* check that we're writing */
+    if (state->mode != GZ_WRITE)
+        return Z_STREAM_ERROR;
+
+    /* check for seek request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_zero(state, state->skip) == -1)
+            ret = state->err;
+    }
+
+    /* flush, free memory, and close file */
+    if (gz_comp(state, Z_FINISH) == -1)
+        ret = state->err;
+    if (state->size) {
+        if (!state->direct) {
+            (void)deflateEnd(&(state->strm));
+            free(state->out);
+        }
+        free(state->in);
+    }
+    gz_error(state, Z_OK, NULL);
+    free(state->path);
+    if (close(state->fd) == -1)
+        ret = Z_ERRNO;
+    free(state);
+    return ret;
+}
diff --git a/contrib/libs/zlib/infback.c b/contrib/libs/zlib/infback.c
index a6823246ae..59679ecbfc 100644
--- a/contrib/libs/zlib/infback.c
+++ b/contrib/libs/zlib/infback.c
@@ -1,640 +1,640 @@
-/* infback.c -- inflate using a call-back interface 
+/* infback.c -- inflate using a call-back interface
  * Copyright (C) 1995-2016 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */ 
- 
-/* 
-   This code is largely copied from inflate.c.  Normally either infback.o or 
-   inflate.o would be linked into an application--not both.  The interface 
-   with inffast.c is retained so that optimized assembler-coded versions of 
-   inflate_fast() can be used with either inflate.c or infback.c. 
- */ 
- 
-#include "zutil.h" 
-#include "inftrees.h" 
-#include "inflate.h" 
-#include "inffast.h" 
- 
-/* function prototypes */ 
-local void fixedtables OF((struct inflate_state FAR *state)); 
- 
-/* 
-   strm provides memory allocation functions in zalloc and zfree, or 
-   Z_NULL to use the library memory allocation functions. 
- 
-   windowBits is in the range 8..15, and window is a user-supplied 
-   window and output buffer that is 2**windowBits bytes. 
- */ 
-int ZEXPORT inflateBackInit_(strm, windowBits, window, version, stream_size) 
-z_streamp strm; 
-int windowBits; 
-unsigned char FAR *window; 
-const char *version; 
-int stream_size; 
-{ 
-    struct inflate_state FAR *state; 
- 
-    if (version == Z_NULL || version[0] != ZLIB_VERSION[0] || 
-        stream_size != (int)(sizeof(z_stream))) 
-        return Z_VERSION_ERROR; 
-    if (strm == Z_NULL || window == Z_NULL || 
-        windowBits < 8 || windowBits > 15) 
-        return Z_STREAM_ERROR; 
-    strm->msg = Z_NULL;                 /* in case we return an error */ 
-    if (strm->zalloc == (alloc_func)0) { 
-#ifdef Z_SOLO 
-        return Z_STREAM_ERROR; 
-#else 
-        strm->zalloc = zcalloc; 
-        strm->opaque = (voidpf)0; 
-#endif 
-    } 
-    if (strm->zfree == (free_func)0) 
-#ifdef Z_SOLO 
-        return Z_STREAM_ERROR; 
-#else 
-    strm->zfree = zcfree; 
-#endif 
-    state = (struct inflate_state FAR *)ZALLOC(strm, 1, 
-                                               sizeof(struct inflate_state)); 
-    if (state == Z_NULL) return Z_MEM_ERROR; 
-    Tracev((stderr, "inflate: allocated\n")); 
-    strm->state = (struct internal_state FAR *)state; 
-    state->dmax = 32768U; 
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/*
+   This code is largely copied from inflate.c.  Normally either infback.o or
+   inflate.o would be linked into an application--not both.  The interface
+   with inffast.c is retained so that optimized assembler-coded versions of
+   inflate_fast() can be used with either inflate.c or infback.c.
+ */
+
+#include "zutil.h"
+#include "inftrees.h"
+#include "inflate.h"
+#include "inffast.h"
+
+/* function prototypes */
+local void fixedtables OF((struct inflate_state FAR *state));
+
+/*
+   strm provides memory allocation functions in zalloc and zfree, or
+   Z_NULL to use the library memory allocation functions.
+
+   windowBits is in the range 8..15, and window is a user-supplied
+   window and output buffer that is 2**windowBits bytes.
+ */
+int ZEXPORT inflateBackInit_(strm, windowBits, window, version, stream_size)
+z_streamp strm;
+int windowBits;
+unsigned char FAR *window;
+const char *version;
+int stream_size;
+{
+    struct inflate_state FAR *state;
+
+    if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
+        stream_size != (int)(sizeof(z_stream)))
+        return Z_VERSION_ERROR;
+    if (strm == Z_NULL || window == Z_NULL ||
+        windowBits < 8 || windowBits > 15)
+        return Z_STREAM_ERROR;
+    strm->msg = Z_NULL;                 /* in case we return an error */
+    if (strm->zalloc == (alloc_func)0) {
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
+        strm->zalloc = zcalloc;
+        strm->opaque = (voidpf)0;
+#endif
+    }
+    if (strm->zfree == (free_func)0)
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
+    strm->zfree = zcfree;
+#endif
+    state = (struct inflate_state FAR *)ZALLOC(strm, 1,
+                                               sizeof(struct inflate_state));
+    if (state == Z_NULL) return Z_MEM_ERROR;
+    Tracev((stderr, "inflate: allocated\n"));
+    strm->state = (struct internal_state FAR *)state;
+    state->dmax = 32768U;
     state->wbits = (uInt)windowBits;
-    state->wsize = 1U << windowBits; 
-    state->window = window; 
-    state->wnext = 0; 
-    state->whave = 0; 
-    return Z_OK; 
-} 
- 
-/* 
-   Return state with length and distance decoding tables and index sizes set to 
-   fixed code decoding.  Normally this returns fixed tables from inffixed.h. 
-   If BUILDFIXED is defined, then instead this routine builds the tables the 
-   first time it's called, and returns those tables the first time and 
-   thereafter.  This reduces the size of the code by about 2K bytes, in 
-   exchange for a little execution time.  However, BUILDFIXED should not be 
-   used for threaded applications, since the rewriting of the tables and virgin 
-   may not be thread-safe. 
- */ 
-local void fixedtables(state) 
-struct inflate_state FAR *state; 
-{ 
-#ifdef BUILDFIXED 
-    static int virgin = 1; 
-    static code *lenfix, *distfix; 
-    static code fixed[544]; 
- 
-    /* build fixed huffman tables if first call (may not be thread safe) */ 
-    if (virgin) { 
-        unsigned sym, bits; 
-        static code *next; 
- 
-        /* literal/length table */ 
-        sym = 0; 
-        while (sym < 144) state->lens[sym++] = 8; 
-        while (sym < 256) state->lens[sym++] = 9; 
-        while (sym < 280) state->lens[sym++] = 7; 
-        while (sym < 288) state->lens[sym++] = 8; 
-        next = fixed; 
-        lenfix = next; 
-        bits = 9; 
-        inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work); 
- 
-        /* distance table */ 
-        sym = 0; 
-        while (sym < 32) state->lens[sym++] = 5; 
-        distfix = next; 
-        bits = 5; 
-        inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work); 
- 
-        /* do this just once */ 
-        virgin = 0; 
-    } 
-#else /* !BUILDFIXED */ 
-#   include "inffixed.h" 
-#endif /* BUILDFIXED */ 
-    state->lencode = lenfix; 
-    state->lenbits = 9; 
-    state->distcode = distfix; 
-    state->distbits = 5; 
-} 
- 
-/* Macros for inflateBack(): */ 
- 
-/* Load returned state from inflate_fast() */ 
-#define LOAD() \ 
-    do { \ 
-        put = strm->next_out; \ 
-        left = strm->avail_out; \ 
-        next = strm->next_in; \ 
-        have = strm->avail_in; \ 
-        hold = state->hold; \ 
-        bits = state->bits; \ 
-    } while (0) 
- 
-/* Set state from registers for inflate_fast() */ 
-#define RESTORE() \ 
-    do { \ 
-        strm->next_out = put; \ 
-        strm->avail_out = left; \ 
-        strm->next_in = next; \ 
-        strm->avail_in = have; \ 
-        state->hold = hold; \ 
-        state->bits = bits; \ 
-    } while (0) 
- 
-/* Clear the input bit accumulator */ 
-#define INITBITS() \ 
-    do { \ 
-        hold = 0; \ 
-        bits = 0; \ 
-    } while (0) 
- 
-/* Assure that some input is available.  If input is requested, but denied, 
-   then return a Z_BUF_ERROR from inflateBack(). */ 
-#define PULL() \ 
-    do { \ 
-        if (have == 0) { \ 
-            have = in(in_desc, &next); \ 
-            if (have == 0) { \ 
-                next = Z_NULL; \ 
-                ret = Z_BUF_ERROR; \ 
-                goto inf_leave; \ 
-            } \ 
-        } \ 
-    } while (0) 
- 
-/* Get a byte of input into the bit accumulator, or return from inflateBack() 
-   with an error if there is no input available. */ 
-#define PULLBYTE() \ 
-    do { \ 
-        PULL(); \ 
-        have--; \ 
-        hold += (unsigned long)(*next++) << bits; \ 
-        bits += 8; \ 
-    } while (0) 
- 
-/* Assure that there are at least n bits in the bit accumulator.  If there is 
-   not enough available input to do that, then return from inflateBack() with 
-   an error. */ 
-#define NEEDBITS(n) \ 
-    do { \ 
-        while (bits < (unsigned)(n)) \ 
-            PULLBYTE(); \ 
-    } while (0) 
- 
-/* Return the low n bits of the bit accumulator (n < 16) */ 
-#define BITS(n) \ 
-    ((unsigned)hold & ((1U << (n)) - 1)) 
- 
-/* Remove n bits from the bit accumulator */ 
-#define DROPBITS(n) \ 
-    do { \ 
-        hold >>= (n); \ 
-        bits -= (unsigned)(n); \ 
-    } while (0) 
- 
-/* Remove zero to seven bits as needed to go to a byte boundary */ 
-#define BYTEBITS() \ 
-    do { \ 
-        hold >>= bits & 7; \ 
-        bits -= bits & 7; \ 
-    } while (0) 
- 
-/* Assure that some output space is available, by writing out the window 
-   if it's full.  If the write fails, return from inflateBack() with a 
-   Z_BUF_ERROR. */ 
-#define ROOM() \ 
-    do { \ 
-        if (left == 0) { \ 
-            put = state->window; \ 
-            left = state->wsize; \ 
-            state->whave = left; \ 
-            if (out(out_desc, put, left)) { \ 
-                ret = Z_BUF_ERROR; \ 
-                goto inf_leave; \ 
-            } \ 
-        } \ 
-    } while (0) 
- 
-/* 
-   strm provides the memory allocation functions and window buffer on input, 
-   and provides information on the unused input on return.  For Z_DATA_ERROR 
-   returns, strm will also provide an error message. 
- 
-   in() and out() are the call-back input and output functions.  When 
-   inflateBack() needs more input, it calls in().  When inflateBack() has 
-   filled the window with output, or when it completes with data in the 
-   window, it calls out() to write out the data.  The application must not 
-   change the provided input until in() is called again or inflateBack() 
-   returns.  The application must not change the window/output buffer until 
-   inflateBack() returns. 
- 
-   in() and out() are called with a descriptor parameter provided in the 
-   inflateBack() call.  This parameter can be a structure that provides the 
-   information required to do the read or write, as well as accumulated 
-   information on the input and output such as totals and check values. 
- 
-   in() should return zero on failure.  out() should return non-zero on 
-   failure.  If either in() or out() fails, than inflateBack() returns a 
-   Z_BUF_ERROR.  strm->next_in can be checked for Z_NULL to see whether it 
-   was in() or out() that caused in the error.  Otherwise,  inflateBack() 
-   returns Z_STREAM_END on success, Z_DATA_ERROR for an deflate format 
-   error, or Z_MEM_ERROR if it could not allocate memory for the state. 
-   inflateBack() can also return Z_STREAM_ERROR if the input parameters 
-   are not correct, i.e. strm is Z_NULL or the state was not initialized. 
- */ 
-int ZEXPORT inflateBack(strm, in, in_desc, out, out_desc) 
-z_streamp strm; 
-in_func in; 
-void FAR *in_desc; 
-out_func out; 
-void FAR *out_desc; 
-{ 
-    struct inflate_state FAR *state; 
-    z_const unsigned char FAR *next;    /* next input */ 
-    unsigned char FAR *put;     /* next output */ 
-    unsigned have, left;        /* available input and output */ 
-    unsigned long hold;         /* bit buffer */ 
-    unsigned bits;              /* bits in bit buffer */ 
-    unsigned copy;              /* number of stored or match bytes to copy */ 
-    unsigned char FAR *from;    /* where to copy match bytes from */ 
-    code here;                  /* current decoding table entry */ 
-    code last;                  /* parent table entry */ 
-    unsigned len;               /* length to copy for repeats, bits to drop */ 
-    int ret;                    /* return code */ 
-    static const unsigned short order[19] = /* permutation of code lengths */ 
-        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; 
- 
-    /* Check that the strm exists and that the state was initialized */ 
-    if (strm == Z_NULL || strm->state == Z_NULL) 
-        return Z_STREAM_ERROR; 
-    state = (struct inflate_state FAR *)strm->state; 
- 
-    /* Reset the state */ 
-    strm->msg = Z_NULL; 
-    state->mode = TYPE; 
-    state->last = 0; 
-    state->whave = 0; 
-    next = strm->next_in; 
-    have = next != Z_NULL ? strm->avail_in : 0; 
-    hold = 0; 
-    bits = 0; 
-    put = state->window; 
-    left = state->wsize; 
- 
-    /* Inflate until end of block marked as last */ 
-    for (;;) 
-        switch (state->mode) { 
-        case TYPE: 
-            /* determine and dispatch block type */ 
-            if (state->last) { 
-                BYTEBITS(); 
-                state->mode = DONE; 
-                break; 
-            } 
-            NEEDBITS(3); 
-            state->last = BITS(1); 
-            DROPBITS(1); 
-            switch (BITS(2)) { 
-            case 0:                             /* stored block */ 
-                Tracev((stderr, "inflate:     stored block%s\n", 
-                        state->last ? " (last)" : "")); 
-                state->mode = STORED; 
-                break; 
-            case 1:                             /* fixed block */ 
-                fixedtables(state); 
-                Tracev((stderr, "inflate:     fixed codes block%s\n", 
-                        state->last ? " (last)" : "")); 
-                state->mode = LEN;              /* decode codes */ 
-                break; 
-            case 2:                             /* dynamic block */ 
-                Tracev((stderr, "inflate:     dynamic codes block%s\n", 
-                        state->last ? " (last)" : "")); 
-                state->mode = TABLE; 
-                break; 
-            case 3: 
-                strm->msg = (char *)"invalid block type"; 
-                state->mode = BAD; 
-            } 
-            DROPBITS(2); 
-            break; 
- 
-        case STORED: 
-            /* get and verify stored block length */ 
-            BYTEBITS();                         /* go to byte boundary */ 
-            NEEDBITS(32); 
-            if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) { 
-                strm->msg = (char *)"invalid stored block lengths"; 
-                state->mode = BAD; 
-                break; 
-            } 
-            state->length = (unsigned)hold & 0xffff; 
-            Tracev((stderr, "inflate:       stored length %u\n", 
-                    state->length)); 
-            INITBITS(); 
- 
-            /* copy stored block from input to output */ 
-            while (state->length != 0) { 
-                copy = state->length; 
-                PULL(); 
-                ROOM(); 
-                if (copy > have) copy = have; 
-                if (copy > left) copy = left; 
-                zmemcpy(put, next, copy); 
-                have -= copy; 
-                next += copy; 
-                left -= copy; 
-                put += copy; 
-                state->length -= copy; 
-            } 
-            Tracev((stderr, "inflate:       stored end\n")); 
-            state->mode = TYPE; 
-            break; 
- 
-        case TABLE: 
-            /* get dynamic table entries descriptor */ 
-            NEEDBITS(14); 
-            state->nlen = BITS(5) + 257; 
-            DROPBITS(5); 
-            state->ndist = BITS(5) + 1; 
-            DROPBITS(5); 
-            state->ncode = BITS(4) + 4; 
-            DROPBITS(4); 
-#ifndef PKZIP_BUG_WORKAROUND 
-            if (state->nlen > 286 || state->ndist > 30) { 
-                strm->msg = (char *)"too many length or distance symbols"; 
-                state->mode = BAD; 
-                break; 
-            } 
-#endif 
-            Tracev((stderr, "inflate:       table sizes ok\n")); 
- 
-            /* get code length code lengths (not a typo) */ 
-            state->have = 0; 
-            while (state->have < state->ncode) { 
-                NEEDBITS(3); 
-                state->lens[order[state->have++]] = (unsigned short)BITS(3); 
-                DROPBITS(3); 
-            } 
-            while (state->have < 19) 
-                state->lens[order[state->have++]] = 0; 
-            state->next = state->codes; 
-            state->lencode = (code const FAR *)(state->next); 
-            state->lenbits = 7; 
-            ret = inflate_table(CODES, state->lens, 19, &(state->next), 
-                                &(state->lenbits), state->work); 
-            if (ret) { 
-                strm->msg = (char *)"invalid code lengths set"; 
-                state->mode = BAD; 
-                break; 
-            } 
-            Tracev((stderr, "inflate:       code lengths ok\n")); 
- 
-            /* get length and distance code code lengths */ 
-            state->have = 0; 
-            while (state->have < state->nlen + state->ndist) { 
-                for (;;) { 
-                    here = state->lencode[BITS(state->lenbits)]; 
-                    if ((unsigned)(here.bits) <= bits) break; 
-                    PULLBYTE(); 
-                } 
-                if (here.val < 16) { 
-                    DROPBITS(here.bits); 
-                    state->lens[state->have++] = here.val; 
-                } 
-                else { 
-                    if (here.val == 16) { 
-                        NEEDBITS(here.bits + 2); 
-                        DROPBITS(here.bits); 
-                        if (state->have == 0) { 
-                            strm->msg = (char *)"invalid bit length repeat"; 
-                            state->mode = BAD; 
-                            break; 
-                        } 
-                        len = (unsigned)(state->lens[state->have - 1]); 
-                        copy = 3 + BITS(2); 
-                        DROPBITS(2); 
-                    } 
-                    else if (here.val == 17) { 
-                        NEEDBITS(here.bits + 3); 
-                        DROPBITS(here.bits); 
-                        len = 0; 
-                        copy = 3 + BITS(3); 
-                        DROPBITS(3); 
-                    } 
-                    else { 
-                        NEEDBITS(here.bits + 7); 
-                        DROPBITS(here.bits); 
-                        len = 0; 
-                        copy = 11 + BITS(7); 
-                        DROPBITS(7); 
-                    } 
-                    if (state->have + copy > state->nlen + state->ndist) { 
-                        strm->msg = (char *)"invalid bit length repeat"; 
-                        state->mode = BAD; 
-                        break; 
-                    } 
-                    while (copy--) 
-                        state->lens[state->have++] = (unsigned short)len; 
-                } 
-            } 
- 
-            /* handle error breaks in while */ 
-            if (state->mode == BAD) break; 
- 
-            /* check for end-of-block code (better have one) */ 
-            if (state->lens[256] == 0) { 
-                strm->msg = (char *)"invalid code -- missing end-of-block"; 
-                state->mode = BAD; 
-                break; 
-            } 
- 
-            /* build code tables -- note: do not change the lenbits or distbits 
-               values here (9 and 6) without reading the comments in inftrees.h 
-               concerning the ENOUGH constants, which depend on those values */ 
-            state->next = state->codes; 
-            state->lencode = (code const FAR *)(state->next); 
-            state->lenbits = 9; 
-            ret = inflate_table(LENS, state->lens, state->nlen, &(state->next), 
-                                &(state->lenbits), state->work); 
-            if (ret) { 
-                strm->msg = (char *)"invalid literal/lengths set"; 
-                state->mode = BAD; 
-                break; 
-            } 
-            state->distcode = (code const FAR *)(state->next); 
-            state->distbits = 6; 
-            ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist, 
-                            &(state->next), &(state->distbits), state->work); 
-            if (ret) { 
-                strm->msg = (char *)"invalid distances set"; 
-                state->mode = BAD; 
-                break; 
-            } 
-            Tracev((stderr, "inflate:       codes ok\n")); 
-            state->mode = LEN; 
- 
-        case LEN: 
-            /* use inflate_fast() if we have enough input and output */ 
-            if (have >= 6 && left >= 258) { 
-                RESTORE(); 
-                if (state->whave < state->wsize) 
-                    state->whave = state->wsize - left; 
-                inflate_fast(strm, state->wsize); 
-                LOAD(); 
-                break; 
-            } 
- 
-            /* get a literal, length, or end-of-block code */ 
-            for (;;) { 
-                here = state->lencode[BITS(state->lenbits)]; 
-                if ((unsigned)(here.bits) <= bits) break; 
-                PULLBYTE(); 
-            } 
-            if (here.op && (here.op & 0xf0) == 0) { 
-                last = here; 
-                for (;;) { 
-                    here = state->lencode[last.val + 
-                            (BITS(last.bits + last.op) >> last.bits)]; 
-                    if ((unsigned)(last.bits + here.bits) <= bits) break; 
-                    PULLBYTE(); 
-                } 
-                DROPBITS(last.bits); 
-            } 
-            DROPBITS(here.bits); 
-            state->length = (unsigned)here.val; 
- 
-            /* process literal */ 
-            if (here.op == 0) { 
-                Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ? 
-                        "inflate:         literal '%c'\n" : 
-                        "inflate:         literal 0x%02x\n", here.val)); 
-                ROOM(); 
-                *put++ = (unsigned char)(state->length); 
-                left--; 
-                state->mode = LEN; 
-                break; 
-            } 
- 
-            /* process end of block */ 
-            if (here.op & 32) { 
-                Tracevv((stderr, "inflate:         end of block\n")); 
-                state->mode = TYPE; 
-                break; 
-            } 
- 
-            /* invalid code */ 
-            if (here.op & 64) { 
-                strm->msg = (char *)"invalid literal/length code"; 
-                state->mode = BAD; 
-                break; 
-            } 
- 
-            /* length code -- get extra bits, if any */ 
-            state->extra = (unsigned)(here.op) & 15; 
-            if (state->extra != 0) { 
-                NEEDBITS(state->extra); 
-                state->length += BITS(state->extra); 
-                DROPBITS(state->extra); 
-            } 
-            Tracevv((stderr, "inflate:         length %u\n", state->length)); 
- 
-            /* get distance code */ 
-            for (;;) { 
-                here = state->distcode[BITS(state->distbits)]; 
-                if ((unsigned)(here.bits) <= bits) break; 
-                PULLBYTE(); 
-            } 
-            if ((here.op & 0xf0) == 0) { 
-                last = here; 
-                for (;;) { 
-                    here = state->distcode[last.val + 
-                            (BITS(last.bits + last.op) >> last.bits)]; 
-                    if ((unsigned)(last.bits + here.bits) <= bits) break; 
-                    PULLBYTE(); 
-                } 
-                DROPBITS(last.bits); 
-            } 
-            DROPBITS(here.bits); 
-            if (here.op & 64) { 
-                strm->msg = (char *)"invalid distance code"; 
-                state->mode = BAD; 
-                break; 
-            } 
-            state->offset = (unsigned)here.val; 
- 
-            /* get distance extra bits, if any */ 
-            state->extra = (unsigned)(here.op) & 15; 
-            if (state->extra != 0) { 
-                NEEDBITS(state->extra); 
-                state->offset += BITS(state->extra); 
-                DROPBITS(state->extra); 
-            } 
-            if (state->offset > state->wsize - (state->whave < state->wsize ? 
-                                                left : 0)) { 
-                strm->msg = (char *)"invalid distance too far back"; 
-                state->mode = BAD; 
-                break; 
-            } 
-            Tracevv((stderr, "inflate:         distance %u\n", state->offset)); 
- 
-            /* copy match from window to output */ 
-            do { 
-                ROOM(); 
-                copy = state->wsize - state->offset; 
-                if (copy < left) { 
-                    from = put + copy; 
-                    copy = left - copy; 
-                } 
-                else { 
-                    from = put - state->offset; 
-                    copy = left; 
-                } 
-                if (copy > state->length) copy = state->length; 
-                state->length -= copy; 
-                left -= copy; 
-                do { 
-                    *put++ = *from++; 
-                } while (--copy); 
-            } while (state->length != 0); 
-            break; 
- 
-        case DONE: 
-            /* inflate stream terminated properly -- write leftover output */ 
-            ret = Z_STREAM_END; 
-            if (left < state->wsize) { 
-                if (out(out_desc, state->window, state->wsize - left)) 
-                    ret = Z_BUF_ERROR; 
-            } 
-            goto inf_leave; 
- 
-        case BAD: 
-            ret = Z_DATA_ERROR; 
-            goto inf_leave; 
- 
-        default:                /* can't happen, but makes compilers happy */ 
-            ret = Z_STREAM_ERROR; 
-            goto inf_leave; 
-        } 
- 
-    /* Return unused input */ 
-  inf_leave: 
-    strm->next_in = next; 
-    strm->avail_in = have; 
-    return ret; 
-} 
- 
-int ZEXPORT inflateBackEnd(strm) 
-z_streamp strm; 
-{ 
-    if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0) 
-        return Z_STREAM_ERROR; 
-    ZFREE(strm, strm->state); 
-    strm->state = Z_NULL; 
-    Tracev((stderr, "inflate: end\n")); 
-    return Z_OK; 
-} 
+    state->wsize = 1U << windowBits;
+    state->window = window;
+    state->wnext = 0;
+    state->whave = 0;
+    return Z_OK;
+}
+
+/*
+   Return state with length and distance decoding tables and index sizes set to
+   fixed code decoding.  Normally this returns fixed tables from inffixed.h.
+   If BUILDFIXED is defined, then instead this routine builds the tables the
+   first time it's called, and returns those tables the first time and
+   thereafter.  This reduces the size of the code by about 2K bytes, in
+   exchange for a little execution time.  However, BUILDFIXED should not be
+   used for threaded applications, since the rewriting of the tables and virgin
+   may not be thread-safe.
+ */
+local void fixedtables(state)
+struct inflate_state FAR *state;
+{
+#ifdef BUILDFIXED
+    static int virgin = 1;
+    static code *lenfix, *distfix;
+    static code fixed[544];
+
+    /* build fixed huffman tables if first call (may not be thread safe) */
+    if (virgin) {
+        unsigned sym, bits;
+        static code *next;
+
+        /* literal/length table */
+        sym = 0;
+        while (sym < 144) state->lens[sym++] = 8;
+        while (sym < 256) state->lens[sym++] = 9;
+        while (sym < 280) state->lens[sym++] = 7;
+        while (sym < 288) state->lens[sym++] = 8;
+        next = fixed;
+        lenfix = next;
+        bits = 9;
+        inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work);
+
+        /* distance table */
+        sym = 0;
+        while (sym < 32) state->lens[sym++] = 5;
+        distfix = next;
+        bits = 5;
+        inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work);
+
+        /* do this just once */
+        virgin = 0;
+    }
+#else /* !BUILDFIXED */
+#   include "inffixed.h"
+#endif /* BUILDFIXED */
+    state->lencode = lenfix;
+    state->lenbits = 9;
+    state->distcode = distfix;
+    state->distbits = 5;
+}
+
+/* Macros for inflateBack(): */
+
+/* Load returned state from inflate_fast() */
+#define LOAD() \
+    do { \
+        put = strm->next_out; \
+        left = strm->avail_out; \
+        next = strm->next_in; \
+        have = strm->avail_in; \
+        hold = state->hold; \
+        bits = state->bits; \
+    } while (0)
+
+/* Set state from registers for inflate_fast() */
+#define RESTORE() \
+    do { \
+        strm->next_out = put; \
+        strm->avail_out = left; \
+        strm->next_in = next; \
+        strm->avail_in = have; \
+        state->hold = hold; \
+        state->bits = bits; \
+    } while (0)
+
+/* Clear the input bit accumulator */
+#define INITBITS() \
+    do { \
+        hold = 0; \
+        bits = 0; \
+    } while (0)
+
+/* Assure that some input is available.  If input is requested, but denied,
+   then return a Z_BUF_ERROR from inflateBack(). */
+#define PULL() \
+    do { \
+        if (have == 0) { \
+            have = in(in_desc, &next); \
+            if (have == 0) { \
+                next = Z_NULL; \
+                ret = Z_BUF_ERROR; \
+                goto inf_leave; \
+            } \
+        } \
+    } while (0)
+
+/* Get a byte of input into the bit accumulator, or return from inflateBack()
+   with an error if there is no input available. */
+#define PULLBYTE() \
+    do { \
+        PULL(); \
+        have--; \
+        hold += (unsigned long)(*next++) << bits; \
+        bits += 8; \
+    } while (0)
+
+/* Assure that there are at least n bits in the bit accumulator.  If there is
+   not enough available input to do that, then return from inflateBack() with
+   an error. */
+#define NEEDBITS(n) \
+    do { \
+        while (bits < (unsigned)(n)) \
+            PULLBYTE(); \
+    } while (0)
+
+/* Return the low n bits of the bit accumulator (n < 16) */
+#define BITS(n) \
+    ((unsigned)hold & ((1U << (n)) - 1))
+
+/* Remove n bits from the bit accumulator */
+#define DROPBITS(n) \
+    do { \
+        hold >>= (n); \
+        bits -= (unsigned)(n); \
+    } while (0)
+
+/* Remove zero to seven bits as needed to go to a byte boundary */
+#define BYTEBITS() \
+    do { \
+        hold >>= bits & 7; \
+        bits -= bits & 7; \
+    } while (0)
+
+/* Assure that some output space is available, by writing out the window
+   if it's full.  If the write fails, return from inflateBack() with a
+   Z_BUF_ERROR. */
+#define ROOM() \
+    do { \
+        if (left == 0) { \
+            put = state->window; \
+            left = state->wsize; \
+            state->whave = left; \
+            if (out(out_desc, put, left)) { \
+                ret = Z_BUF_ERROR; \
+                goto inf_leave; \
+            } \
+        } \
+    } while (0)
+
+/*
+   strm provides the memory allocation functions and window buffer on input,
+   and provides information on the unused input on return.  For Z_DATA_ERROR
+   returns, strm will also provide an error message.
+
+   in() and out() are the call-back input and output functions.  When
+   inflateBack() needs more input, it calls in().  When inflateBack() has
+   filled the window with output, or when it completes with data in the
+   window, it calls out() to write out the data.  The application must not
+   change the provided input until in() is called again or inflateBack()
+   returns.  The application must not change the window/output buffer until
+   inflateBack() returns.
+
+   in() and out() are called with a descriptor parameter provided in the
+   inflateBack() call.  This parameter can be a structure that provides the
+   information required to do the read or write, as well as accumulated
+   information on the input and output such as totals and check values.
+
+   in() should return zero on failure.  out() should return non-zero on
+   failure.  If either in() or out() fails, than inflateBack() returns a
+   Z_BUF_ERROR.  strm->next_in can be checked for Z_NULL to see whether it
+   was in() or out() that caused in the error.  Otherwise,  inflateBack()
+   returns Z_STREAM_END on success, Z_DATA_ERROR for an deflate format
+   error, or Z_MEM_ERROR if it could not allocate memory for the state.
+   inflateBack() can also return Z_STREAM_ERROR if the input parameters
+   are not correct, i.e. strm is Z_NULL or the state was not initialized.
+ */
+int ZEXPORT inflateBack(strm, in, in_desc, out, out_desc)
+z_streamp strm;
+in_func in;
+void FAR *in_desc;
+out_func out;
+void FAR *out_desc;
+{
+    struct inflate_state FAR *state;
+    z_const unsigned char FAR *next;    /* next input */
+    unsigned char FAR *put;     /* next output */
+    unsigned have, left;        /* available input and output */
+    unsigned long hold;         /* bit buffer */
+    unsigned bits;              /* bits in bit buffer */
+    unsigned copy;              /* number of stored or match bytes to copy */
+    unsigned char FAR *from;    /* where to copy match bytes from */
+    code here;                  /* current decoding table entry */
+    code last;                  /* parent table entry */
+    unsigned len;               /* length to copy for repeats, bits to drop */
+    int ret;                    /* return code */
+    static const unsigned short order[19] = /* permutation of code lengths */
+        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
+
+    /* Check that the strm exists and that the state was initialized */
+    if (strm == Z_NULL || strm->state == Z_NULL)
+        return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+
+    /* Reset the state */
+    strm->msg = Z_NULL;
+    state->mode = TYPE;
+    state->last = 0;
+    state->whave = 0;
+    next = strm->next_in;
+    have = next != Z_NULL ? strm->avail_in : 0;
+    hold = 0;
+    bits = 0;
+    put = state->window;
+    left = state->wsize;
+
+    /* Inflate until end of block marked as last */
+    for (;;)
+        switch (state->mode) {
+        case TYPE:
+            /* determine and dispatch block type */
+            if (state->last) {
+                BYTEBITS();
+                state->mode = DONE;
+                break;
+            }
+            NEEDBITS(3);
+            state->last = BITS(1);
+            DROPBITS(1);
+            switch (BITS(2)) {
+            case 0:                             /* stored block */
+                Tracev((stderr, "inflate:     stored block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = STORED;
+                break;
+            case 1:                             /* fixed block */
+                fixedtables(state);
+                Tracev((stderr, "inflate:     fixed codes block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = LEN;              /* decode codes */
+                break;
+            case 2:                             /* dynamic block */
+                Tracev((stderr, "inflate:     dynamic codes block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = TABLE;
+                break;
+            case 3:
+                strm->msg = (char *)"invalid block type";
+                state->mode = BAD;
+            }
+            DROPBITS(2);
+            break;
+
+        case STORED:
+            /* get and verify stored block length */
+            BYTEBITS();                         /* go to byte boundary */
+            NEEDBITS(32);
+            if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
+                strm->msg = (char *)"invalid stored block lengths";
+                state->mode = BAD;
+                break;
+            }
+            state->length = (unsigned)hold & 0xffff;
+            Tracev((stderr, "inflate:       stored length %u\n",
+                    state->length));
+            INITBITS();
+
+            /* copy stored block from input to output */
+            while (state->length != 0) {
+                copy = state->length;
+                PULL();
+                ROOM();
+                if (copy > have) copy = have;
+                if (copy > left) copy = left;
+                zmemcpy(put, next, copy);
+                have -= copy;
+                next += copy;
+                left -= copy;
+                put += copy;
+                state->length -= copy;
+            }
+            Tracev((stderr, "inflate:       stored end\n"));
+            state->mode = TYPE;
+            break;
+
+        case TABLE:
+            /* get dynamic table entries descriptor */
+            NEEDBITS(14);
+            state->nlen = BITS(5) + 257;
+            DROPBITS(5);
+            state->ndist = BITS(5) + 1;
+            DROPBITS(5);
+            state->ncode = BITS(4) + 4;
+            DROPBITS(4);
+#ifndef PKZIP_BUG_WORKAROUND
+            if (state->nlen > 286 || state->ndist > 30) {
+                strm->msg = (char *)"too many length or distance symbols";
+                state->mode = BAD;
+                break;
+            }
+#endif
+            Tracev((stderr, "inflate:       table sizes ok\n"));
+
+            /* get code length code lengths (not a typo) */
+            state->have = 0;
+            while (state->have < state->ncode) {
+                NEEDBITS(3);
+                state->lens[order[state->have++]] = (unsigned short)BITS(3);
+                DROPBITS(3);
+            }
+            while (state->have < 19)
+                state->lens[order[state->have++]] = 0;
+            state->next = state->codes;
+            state->lencode = (code const FAR *)(state->next);
+            state->lenbits = 7;
+            ret = inflate_table(CODES, state->lens, 19, &(state->next),
+                                &(state->lenbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid code lengths set";
+                state->mode = BAD;
+                break;
+            }
+            Tracev((stderr, "inflate:       code lengths ok\n"));
+
+            /* get length and distance code code lengths */
+            state->have = 0;
+            while (state->have < state->nlen + state->ndist) {
+                for (;;) {
+                    here = state->lencode[BITS(state->lenbits)];
+                    if ((unsigned)(here.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                if (here.val < 16) {
+                    DROPBITS(here.bits);
+                    state->lens[state->have++] = here.val;
+                }
+                else {
+                    if (here.val == 16) {
+                        NEEDBITS(here.bits + 2);
+                        DROPBITS(here.bits);
+                        if (state->have == 0) {
+                            strm->msg = (char *)"invalid bit length repeat";
+                            state->mode = BAD;
+                            break;
+                        }
+                        len = (unsigned)(state->lens[state->have - 1]);
+                        copy = 3 + BITS(2);
+                        DROPBITS(2);
+                    }
+                    else if (here.val == 17) {
+                        NEEDBITS(here.bits + 3);
+                        DROPBITS(here.bits);
+                        len = 0;
+                        copy = 3 + BITS(3);
+                        DROPBITS(3);
+                    }
+                    else {
+                        NEEDBITS(here.bits + 7);
+                        DROPBITS(here.bits);
+                        len = 0;
+                        copy = 11 + BITS(7);
+                        DROPBITS(7);
+                    }
+                    if (state->have + copy > state->nlen + state->ndist) {
+                        strm->msg = (char *)"invalid bit length repeat";
+                        state->mode = BAD;
+                        break;
+                    }
+                    while (copy--)
+                        state->lens[state->have++] = (unsigned short)len;
+                }
+            }
+
+            /* handle error breaks in while */
+            if (state->mode == BAD) break;
+
+            /* check for end-of-block code (better have one) */
+            if (state->lens[256] == 0) {
+                strm->msg = (char *)"invalid code -- missing end-of-block";
+                state->mode = BAD;
+                break;
+            }
+
+            /* build code tables -- note: do not change the lenbits or distbits
+               values here (9 and 6) without reading the comments in inftrees.h
+               concerning the ENOUGH constants, which depend on those values */
+            state->next = state->codes;
+            state->lencode = (code const FAR *)(state->next);
+            state->lenbits = 9;
+            ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
+                                &(state->lenbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid literal/lengths set";
+                state->mode = BAD;
+                break;
+            }
+            state->distcode = (code const FAR *)(state->next);
+            state->distbits = 6;
+            ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
+                            &(state->next), &(state->distbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid distances set";
+                state->mode = BAD;
+                break;
+            }
+            Tracev((stderr, "inflate:       codes ok\n"));
+            state->mode = LEN;
+
+        case LEN:
+            /* use inflate_fast() if we have enough input and output */
+            if (have >= 6 && left >= 258) {
+                RESTORE();
+                if (state->whave < state->wsize)
+                    state->whave = state->wsize - left;
+                inflate_fast(strm, state->wsize);
+                LOAD();
+                break;
+            }
+
+            /* get a literal, length, or end-of-block code */
+            for (;;) {
+                here = state->lencode[BITS(state->lenbits)];
+                if ((unsigned)(here.bits) <= bits) break;
+                PULLBYTE();
+            }
+            if (here.op && (here.op & 0xf0) == 0) {
+                last = here;
+                for (;;) {
+                    here = state->lencode[last.val +
+                            (BITS(last.bits + last.op) >> last.bits)];
+                    if ((unsigned)(last.bits + here.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                DROPBITS(last.bits);
+            }
+            DROPBITS(here.bits);
+            state->length = (unsigned)here.val;
+
+            /* process literal */
+            if (here.op == 0) {
+                Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
+                        "inflate:         literal '%c'\n" :
+                        "inflate:         literal 0x%02x\n", here.val));
+                ROOM();
+                *put++ = (unsigned char)(state->length);
+                left--;
+                state->mode = LEN;
+                break;
+            }
+
+            /* process end of block */
+            if (here.op & 32) {
+                Tracevv((stderr, "inflate:         end of block\n"));
+                state->mode = TYPE;
+                break;
+            }
+
+            /* invalid code */
+            if (here.op & 64) {
+                strm->msg = (char *)"invalid literal/length code";
+                state->mode = BAD;
+                break;
+            }
+
+            /* length code -- get extra bits, if any */
+            state->extra = (unsigned)(here.op) & 15;
+            if (state->extra != 0) {
+                NEEDBITS(state->extra);
+                state->length += BITS(state->extra);
+                DROPBITS(state->extra);
+            }
+            Tracevv((stderr, "inflate:         length %u\n", state->length));
+
+            /* get distance code */
+            for (;;) {
+                here = state->distcode[BITS(state->distbits)];
+                if ((unsigned)(here.bits) <= bits) break;
+                PULLBYTE();
+            }
+            if ((here.op & 0xf0) == 0) {
+                last = here;
+                for (;;) {
+                    here = state->distcode[last.val +
+                            (BITS(last.bits + last.op) >> last.bits)];
+                    if ((unsigned)(last.bits + here.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                DROPBITS(last.bits);
+            }
+            DROPBITS(here.bits);
+            if (here.op & 64) {
+                strm->msg = (char *)"invalid distance code";
+                state->mode = BAD;
+                break;
+            }
+            state->offset = (unsigned)here.val;
+
+            /* get distance extra bits, if any */
+            state->extra = (unsigned)(here.op) & 15;
+            if (state->extra != 0) {
+                NEEDBITS(state->extra);
+                state->offset += BITS(state->extra);
+                DROPBITS(state->extra);
+            }
+            if (state->offset > state->wsize - (state->whave < state->wsize ?
+                                                left : 0)) {
+                strm->msg = (char *)"invalid distance too far back";
+                state->mode = BAD;
+                break;
+            }
+            Tracevv((stderr, "inflate:         distance %u\n", state->offset));
+
+            /* copy match from window to output */
+            do {
+                ROOM();
+                copy = state->wsize - state->offset;
+                if (copy < left) {
+                    from = put + copy;
+                    copy = left - copy;
+                }
+                else {
+                    from = put - state->offset;
+                    copy = left;
+                }
+                if (copy > state->length) copy = state->length;
+                state->length -= copy;
+                left -= copy;
+                do {
+                    *put++ = *from++;
+                } while (--copy);
+            } while (state->length != 0);
+            break;
+
+        case DONE:
+            /* inflate stream terminated properly -- write leftover output */
+            ret = Z_STREAM_END;
+            if (left < state->wsize) {
+                if (out(out_desc, state->window, state->wsize - left))
+                    ret = Z_BUF_ERROR;
+            }
+            goto inf_leave;
+
+        case BAD:
+            ret = Z_DATA_ERROR;
+            goto inf_leave;
+
+        default:                /* can't happen, but makes compilers happy */
+            ret = Z_STREAM_ERROR;
+            goto inf_leave;
+        }
+
+    /* Return unused input */
+  inf_leave:
+    strm->next_in = next;
+    strm->avail_in = have;
+    return ret;
+}
+
+int ZEXPORT inflateBackEnd(strm)
+z_streamp strm;
+{
+    if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
+        return Z_STREAM_ERROR;
+    ZFREE(strm, strm->state);
+    strm->state = Z_NULL;
+    Tracev((stderr, "inflate: end\n"));
+    return Z_OK;
+}
diff --git a/contrib/libs/zlib/inffast.c b/contrib/libs/zlib/inffast.c
index 4ddefa714e..0dbd1dbc09 100644
--- a/contrib/libs/zlib/inffast.c
+++ b/contrib/libs/zlib/inffast.c
@@ -1,323 +1,323 @@
-/* inffast.c -- fast decoding 
+/* inffast.c -- fast decoding
  * Copyright (C) 1995-2017 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */ 
- 
-#include "zutil.h" 
-#include "inftrees.h" 
-#include "inflate.h" 
-#include "inffast.h" 
- 
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "zutil.h"
+#include "inftrees.h"
+#include "inflate.h"
+#include "inffast.h"
+
 #ifdef ASMINF
 #  pragma message("Assembler code may have bugs -- use at your own risk")
-#else 
- 
-/* 
-   Decode literal, length, and distance codes and write out the resulting 
-   literal and match bytes until either not enough input or output is 
-   available, an end-of-block is encountered, or a data error is encountered. 
-   When large enough input and output buffers are supplied to inflate(), for 
-   example, a 16K input buffer and a 64K output buffer, more than 95% of the 
-   inflate execution time is spent in this routine. 
- 
-   Entry assumptions: 
- 
-        state->mode == LEN 
-        strm->avail_in >= 6 
-        strm->avail_out >= 258 
-        start >= strm->avail_out 
-        state->bits < 8 
- 
-   On return, state->mode is one of: 
- 
-        LEN -- ran out of enough output space or enough available input 
-        TYPE -- reached end of block code, inflate() to interpret next block 
-        BAD -- error in block data 
- 
-   Notes: 
- 
-    - The maximum input bits used by a length/distance pair is 15 bits for the 
-      length code, 5 bits for the length extra, 15 bits for the distance code, 
-      and 13 bits for the distance extra.  This totals 48 bits, or six bytes. 
-      Therefore if strm->avail_in >= 6, then there is enough input to avoid 
-      checking for available input while decoding. 
- 
-    - The maximum bytes that a single length/distance pair can output is 258 
-      bytes, which is the maximum length that can be coded.  inflate_fast() 
-      requires strm->avail_out >= 258 for each loop to avoid checking for 
-      output space. 
- */ 
-void ZLIB_INTERNAL inflate_fast(strm, start) 
-z_streamp strm; 
-unsigned start;         /* inflate()'s starting value for strm->avail_out */ 
-{ 
-    struct inflate_state FAR *state; 
-    z_const unsigned char FAR *in;      /* local strm->next_in */ 
-    z_const unsigned char FAR *last;    /* have enough input while in < last */ 
-    unsigned char FAR *out;     /* local strm->next_out */ 
-    unsigned char FAR *beg;     /* inflate()'s initial strm->next_out */ 
-    unsigned char FAR *end;     /* while out < end, enough space available */ 
-#ifdef INFLATE_STRICT 
-    unsigned dmax;              /* maximum distance from zlib header */ 
-#endif 
-    unsigned wsize;             /* window size or zero if not using window */ 
-    unsigned whave;             /* valid bytes in the window */ 
-    unsigned wnext;             /* window write index */ 
-    unsigned char FAR *window;  /* allocated sliding window, if wsize != 0 */ 
-    unsigned long hold;         /* local strm->hold */ 
-    unsigned bits;              /* local strm->bits */ 
-    code const FAR *lcode;      /* local strm->lencode */ 
-    code const FAR *dcode;      /* local strm->distcode */ 
-    unsigned lmask;             /* mask for first level of length codes */ 
-    unsigned dmask;             /* mask for first level of distance codes */ 
-    code here;                  /* retrieved table entry */ 
-    unsigned op;                /* code bits, operation, extra bits, or */ 
-                                /*  window position, window bytes to copy */ 
-    unsigned len;               /* match length, unused bytes */ 
-    unsigned dist;              /* match distance */ 
-    unsigned char FAR *from;    /* where to copy match from */ 
- 
-    /* copy state to local variables */ 
-    state = (struct inflate_state FAR *)strm->state; 
+#else
+
+/*
+   Decode literal, length, and distance codes and write out the resulting
+   literal and match bytes until either not enough input or output is
+   available, an end-of-block is encountered, or a data error is encountered.
+   When large enough input and output buffers are supplied to inflate(), for
+   example, a 16K input buffer and a 64K output buffer, more than 95% of the
+   inflate execution time is spent in this routine.
+
+   Entry assumptions:
+
+        state->mode == LEN
+        strm->avail_in >= 6
+        strm->avail_out >= 258
+        start >= strm->avail_out
+        state->bits < 8
+
+   On return, state->mode is one of:
+
+        LEN -- ran out of enough output space or enough available input
+        TYPE -- reached end of block code, inflate() to interpret next block
+        BAD -- error in block data
+
+   Notes:
+
+    - The maximum input bits used by a length/distance pair is 15 bits for the
+      length code, 5 bits for the length extra, 15 bits for the distance code,
+      and 13 bits for the distance extra.  This totals 48 bits, or six bytes.
+      Therefore if strm->avail_in >= 6, then there is enough input to avoid
+      checking for available input while decoding.
+
+    - The maximum bytes that a single length/distance pair can output is 258
+      bytes, which is the maximum length that can be coded.  inflate_fast()
+      requires strm->avail_out >= 258 for each loop to avoid checking for
+      output space.
+ */
+void ZLIB_INTERNAL inflate_fast(strm, start)
+z_streamp strm;
+unsigned start;         /* inflate()'s starting value for strm->avail_out */
+{
+    struct inflate_state FAR *state;
+    z_const unsigned char FAR *in;      /* local strm->next_in */
+    z_const unsigned char FAR *last;    /* have enough input while in < last */
+    unsigned char FAR *out;     /* local strm->next_out */
+    unsigned char FAR *beg;     /* inflate()'s initial strm->next_out */
+    unsigned char FAR *end;     /* while out < end, enough space available */
+#ifdef INFLATE_STRICT
+    unsigned dmax;              /* maximum distance from zlib header */
+#endif
+    unsigned wsize;             /* window size or zero if not using window */
+    unsigned whave;             /* valid bytes in the window */
+    unsigned wnext;             /* window write index */
+    unsigned char FAR *window;  /* allocated sliding window, if wsize != 0 */
+    unsigned long hold;         /* local strm->hold */
+    unsigned bits;              /* local strm->bits */
+    code const FAR *lcode;      /* local strm->lencode */
+    code const FAR *dcode;      /* local strm->distcode */
+    unsigned lmask;             /* mask for first level of length codes */
+    unsigned dmask;             /* mask for first level of distance codes */
+    code here;                  /* retrieved table entry */
+    unsigned op;                /* code bits, operation, extra bits, or */
+                                /*  window position, window bytes to copy */
+    unsigned len;               /* match length, unused bytes */
+    unsigned dist;              /* match distance */
+    unsigned char FAR *from;    /* where to copy match from */
+
+    /* copy state to local variables */
+    state = (struct inflate_state FAR *)strm->state;
     in = strm->next_in;
-    last = in + (strm->avail_in - 5); 
+    last = in + (strm->avail_in - 5);
     out = strm->next_out;
-    beg = out - (start - strm->avail_out); 
-    end = out + (strm->avail_out - 257); 
-#ifdef INFLATE_STRICT 
-    dmax = state->dmax; 
-#endif 
-    wsize = state->wsize; 
-    whave = state->whave; 
-    wnext = state->wnext; 
-    window = state->window; 
-    hold = state->hold; 
-    bits = state->bits; 
-    lcode = state->lencode; 
-    dcode = state->distcode; 
-    lmask = (1U << state->lenbits) - 1; 
-    dmask = (1U << state->distbits) - 1; 
- 
-    /* decode literals and length/distances until end-of-block or not enough 
-       input data or output space */ 
-    do { 
-        if (bits < 15) { 
+    beg = out - (start - strm->avail_out);
+    end = out + (strm->avail_out - 257);
+#ifdef INFLATE_STRICT
+    dmax = state->dmax;
+#endif
+    wsize = state->wsize;
+    whave = state->whave;
+    wnext = state->wnext;
+    window = state->window;
+    hold = state->hold;
+    bits = state->bits;
+    lcode = state->lencode;
+    dcode = state->distcode;
+    lmask = (1U << state->lenbits) - 1;
+    dmask = (1U << state->distbits) - 1;
+
+    /* decode literals and length/distances until end-of-block or not enough
+       input data or output space */
+    do {
+        if (bits < 15) {
             hold += (unsigned long)(*in++) << bits;
-            bits += 8; 
+            bits += 8;
             hold += (unsigned long)(*in++) << bits;
-            bits += 8; 
-        } 
-        here = lcode[hold & lmask]; 
-      dolen: 
-        op = (unsigned)(here.bits); 
-        hold >>= op; 
-        bits -= op; 
-        op = (unsigned)(here.op); 
-        if (op == 0) {                          /* literal */ 
-            Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ? 
-                    "inflate:         literal '%c'\n" : 
-                    "inflate:         literal 0x%02x\n", here.val)); 
+            bits += 8;
+        }
+        here = lcode[hold & lmask];
+      dolen:
+        op = (unsigned)(here.bits);
+        hold >>= op;
+        bits -= op;
+        op = (unsigned)(here.op);
+        if (op == 0) {                          /* literal */
+            Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
+                    "inflate:         literal '%c'\n" :
+                    "inflate:         literal 0x%02x\n", here.val));
             *out++ = (unsigned char)(here.val);
-        } 
-        else if (op & 16) {                     /* length base */ 
-            len = (unsigned)(here.val); 
-            op &= 15;                           /* number of extra bits */ 
-            if (op) { 
-                if (bits < op) { 
+        }
+        else if (op & 16) {                     /* length base */
+            len = (unsigned)(here.val);
+            op &= 15;                           /* number of extra bits */
+            if (op) {
+                if (bits < op) {
                     hold += (unsigned long)(*in++) << bits;
-                    bits += 8; 
-                } 
-                len += (unsigned)hold & ((1U << op) - 1); 
-                hold >>= op; 
-                bits -= op; 
-            } 
-            Tracevv((stderr, "inflate:         length %u\n", len)); 
-            if (bits < 15) { 
+                    bits += 8;
+                }
+                len += (unsigned)hold & ((1U << op) - 1);
+                hold >>= op;
+                bits -= op;
+            }
+            Tracevv((stderr, "inflate:         length %u\n", len));
+            if (bits < 15) {
                 hold += (unsigned long)(*in++) << bits;
-                bits += 8; 
+                bits += 8;
                 hold += (unsigned long)(*in++) << bits;
-                bits += 8; 
-            } 
-            here = dcode[hold & dmask]; 
-          dodist: 
-            op = (unsigned)(here.bits); 
-            hold >>= op; 
-            bits -= op; 
-            op = (unsigned)(here.op); 
-            if (op & 16) {                      /* distance base */ 
-                dist = (unsigned)(here.val); 
-                op &= 15;                       /* number of extra bits */ 
-                if (bits < op) { 
+                bits += 8;
+            }
+            here = dcode[hold & dmask];
+          dodist:
+            op = (unsigned)(here.bits);
+            hold >>= op;
+            bits -= op;
+            op = (unsigned)(here.op);
+            if (op & 16) {                      /* distance base */
+                dist = (unsigned)(here.val);
+                op &= 15;                       /* number of extra bits */
+                if (bits < op) {
                     hold += (unsigned long)(*in++) << bits;
-                    bits += 8; 
-                    if (bits < op) { 
+                    bits += 8;
+                    if (bits < op) {
                         hold += (unsigned long)(*in++) << bits;
-                        bits += 8; 
-                    } 
-                } 
-                dist += (unsigned)hold & ((1U << op) - 1); 
-#ifdef INFLATE_STRICT 
-                if (dist > dmax) { 
-                    strm->msg = (char *)"invalid distance too far back"; 
-                    state->mode = BAD; 
-                    break; 
-                } 
-#endif 
-                hold >>= op; 
-                bits -= op; 
-                Tracevv((stderr, "inflate:         distance %u\n", dist)); 
-                op = (unsigned)(out - beg);     /* max distance in output */ 
-                if (dist > op) {                /* see if copy from window */ 
-                    op = dist - op;             /* distance back in window */ 
-                    if (op > whave) { 
-                        if (state->sane) { 
-                            strm->msg = 
-                                (char *)"invalid distance too far back"; 
-                            state->mode = BAD; 
-                            break; 
-                        } 
-#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR 
-                        if (len <= op - whave) { 
-                            do { 
+                        bits += 8;
+                    }
+                }
+                dist += (unsigned)hold & ((1U << op) - 1);
+#ifdef INFLATE_STRICT
+                if (dist > dmax) {
+                    strm->msg = (char *)"invalid distance too far back";
+                    state->mode = BAD;
+                    break;
+                }
+#endif
+                hold >>= op;
+                bits -= op;
+                Tracevv((stderr, "inflate:         distance %u\n", dist));
+                op = (unsigned)(out - beg);     /* max distance in output */
+                if (dist > op) {                /* see if copy from window */
+                    op = dist - op;             /* distance back in window */
+                    if (op > whave) {
+                        if (state->sane) {
+                            strm->msg =
+                                (char *)"invalid distance too far back";
+                            state->mode = BAD;
+                            break;
+                        }
+#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
+                        if (len <= op - whave) {
+                            do {
                                 *out++ = 0;
-                            } while (--len); 
-                            continue; 
-                        } 
-                        len -= op - whave; 
-                        do { 
+                            } while (--len);
+                            continue;
+                        }
+                        len -= op - whave;
+                        do {
                             *out++ = 0;
-                        } while (--op > whave); 
-                        if (op == 0) { 
-                            from = out - dist; 
-                            do { 
+                        } while (--op > whave);
+                        if (op == 0) {
+                            from = out - dist;
+                            do {
                                 *out++ = *from++;
-                            } while (--len); 
-                            continue; 
-                        } 
-#endif 
-                    } 
+                            } while (--len);
+                            continue;
+                        }
+#endif
+                    }
                     from = window;
-                    if (wnext == 0) {           /* very common case */ 
-                        from += wsize - op; 
-                        if (op < len) {         /* some from window */ 
-                            len -= op; 
-                            do { 
+                    if (wnext == 0) {           /* very common case */
+                        from += wsize - op;
+                        if (op < len) {         /* some from window */
+                            len -= op;
+                            do {
                                 *out++ = *from++;
-                            } while (--op); 
-                            from = out - dist;  /* rest from output */ 
-                        } 
-                    } 
-                    else if (wnext < op) {      /* wrap around window */ 
-                        from += wsize + wnext - op; 
-                        op -= wnext; 
-                        if (op < len) {         /* some from end of window */ 
-                            len -= op; 
-                            do { 
+                            } while (--op);
+                            from = out - dist;  /* rest from output */
+                        }
+                    }
+                    else if (wnext < op) {      /* wrap around window */
+                        from += wsize + wnext - op;
+                        op -= wnext;
+                        if (op < len) {         /* some from end of window */
+                            len -= op;
+                            do {
                                 *out++ = *from++;
-                            } while (--op); 
+                            } while (--op);
                             from = window;
-                            if (wnext < len) {  /* some from start of window */ 
-                                op = wnext; 
-                                len -= op; 
-                                do { 
+                            if (wnext < len) {  /* some from start of window */
+                                op = wnext;
+                                len -= op;
+                                do {
                                     *out++ = *from++;
-                                } while (--op); 
-                                from = out - dist;      /* rest from output */ 
-                            } 
-                        } 
-                    } 
-                    else {                      /* contiguous in window */ 
-                        from += wnext - op; 
-                        if (op < len) {         /* some from window */ 
-                            len -= op; 
-                            do { 
+                                } while (--op);
+                                from = out - dist;      /* rest from output */
+                            }
+                        }
+                    }
+                    else {                      /* contiguous in window */
+                        from += wnext - op;
+                        if (op < len) {         /* some from window */
+                            len -= op;
+                            do {
                                 *out++ = *from++;
-                            } while (--op); 
-                            from = out - dist;  /* rest from output */ 
-                        } 
-                    } 
-                    while (len > 2) { 
+                            } while (--op);
+                            from = out - dist;  /* rest from output */
+                        }
+                    }
+                    while (len > 2) {
                         *out++ = *from++;
                         *out++ = *from++;
                         *out++ = *from++;
-                        len -= 3; 
-                    } 
-                    if (len) { 
+                        len -= 3;
+                    }
+                    if (len) {
                         *out++ = *from++;
-                        if (len > 1) 
+                        if (len > 1)
                             *out++ = *from++;
-                    } 
-                } 
-                else { 
-                    from = out - dist;          /* copy direct from output */ 
-                    do {                        /* minimum length is three */ 
+                    }
+                }
+                else {
+                    from = out - dist;          /* copy direct from output */
+                    do {                        /* minimum length is three */
                         *out++ = *from++;
                         *out++ = *from++;
                         *out++ = *from++;
-                        len -= 3; 
-                    } while (len > 2); 
-                    if (len) { 
+                        len -= 3;
+                    } while (len > 2);
+                    if (len) {
                         *out++ = *from++;
-                        if (len > 1) 
+                        if (len > 1)
                             *out++ = *from++;
-                    } 
-                } 
-            } 
-            else if ((op & 64) == 0) {          /* 2nd level distance code */ 
-                here = dcode[here.val + (hold & ((1U << op) - 1))]; 
-                goto dodist; 
-            } 
-            else { 
-                strm->msg = (char *)"invalid distance code"; 
-                state->mode = BAD; 
-                break; 
-            } 
-        } 
-        else if ((op & 64) == 0) {              /* 2nd level length code */ 
-            here = lcode[here.val + (hold & ((1U << op) - 1))]; 
-            goto dolen; 
-        } 
-        else if (op & 32) {                     /* end-of-block */ 
-            Tracevv((stderr, "inflate:         end of block\n")); 
-            state->mode = TYPE; 
-            break; 
-        } 
-        else { 
-            strm->msg = (char *)"invalid literal/length code"; 
-            state->mode = BAD; 
-            break; 
-        } 
-    } while (in < last && out < end); 
- 
-    /* return unused bytes (on entry, bits < 8, so in won't go too far back) */ 
-    len = bits >> 3; 
-    in -= len; 
-    bits -= len << 3; 
-    hold &= (1U << bits) - 1; 
- 
-    /* update state and return */ 
+                    }
+                }
+            }
+            else if ((op & 64) == 0) {          /* 2nd level distance code */
+                here = dcode[here.val + (hold & ((1U << op) - 1))];
+                goto dodist;
+            }
+            else {
+                strm->msg = (char *)"invalid distance code";
+                state->mode = BAD;
+                break;
+            }
+        }
+        else if ((op & 64) == 0) {              /* 2nd level length code */
+            here = lcode[here.val + (hold & ((1U << op) - 1))];
+            goto dolen;
+        }
+        else if (op & 32) {                     /* end-of-block */
+            Tracevv((stderr, "inflate:         end of block\n"));
+            state->mode = TYPE;
+            break;
+        }
+        else {
+            strm->msg = (char *)"invalid literal/length code";
+            state->mode = BAD;
+            break;
+        }
+    } while (in < last && out < end);
+
+    /* return unused bytes (on entry, bits < 8, so in won't go too far back) */
+    len = bits >> 3;
+    in -= len;
+    bits -= len << 3;
+    hold &= (1U << bits) - 1;
+
+    /* update state and return */
     strm->next_in = in;
     strm->next_out = out;
-    strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last)); 
-    strm->avail_out = (unsigned)(out < end ? 
-                                 257 + (end - out) : 257 - (out - end)); 
-    state->hold = hold; 
-    state->bits = bits; 
-    return; 
-} 
- 
-/* 
-   inflate_fast() speedups that turned out slower (on a PowerPC G3 750CXe): 
-   - Using bit fields for code structure 
-   - Different op definition to avoid & for extra bits (do & for table bits) 
-   - Three separate decoding do-loops for direct, window, and wnext == 0 
-   - Special case for distance > 1 copies to do overlapped load and store copy 
-   - Explicit branch predictions (based on measured branch probabilities) 
-   - Deferring match copy and interspersed it with decoding subsequent codes 
-   - Swapping literal/length else 
-   - Swapping window/direct else 
-   - Larger unrolled copy loops (three is about right) 
-   - Moving len -= 3 statement into middle of loop 
- */ 
- 
-#endif /* !ASMINF */ 
+    strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last));
+    strm->avail_out = (unsigned)(out < end ?
+                                 257 + (end - out) : 257 - (out - end));
+    state->hold = hold;
+    state->bits = bits;
+    return;
+}
+
+/*
+   inflate_fast() speedups that turned out slower (on a PowerPC G3 750CXe):
+   - Using bit fields for code structure
+   - Different op definition to avoid & for extra bits (do & for table bits)
+   - Three separate decoding do-loops for direct, window, and wnext == 0
+   - Special case for distance > 1 copies to do overlapped load and store copy
+   - Explicit branch predictions (based on measured branch probabilities)
+   - Deferring match copy and interspersed it with decoding subsequent codes
+   - Swapping literal/length else
+   - Swapping window/direct else
+   - Larger unrolled copy loops (three is about right)
+   - Moving len -= 3 statement into middle of loop
+ */
+
+#endif /* !ASMINF */
diff --git a/contrib/libs/zlib/inffast.h b/contrib/libs/zlib/inffast.h
index 8746f66e77..e5c1aa4ca8 100644
--- a/contrib/libs/zlib/inffast.h
+++ b/contrib/libs/zlib/inffast.h
@@ -1,11 +1,11 @@
-/* inffast.h -- header to use inffast.c 
- * Copyright (C) 1995-2003, 2010 Mark Adler 
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */ 
- 
-/* WARNING: this file should *not* be used by applications. It is 
-   part of the implementation of the compression library and is 
-   subject to change. Applications should only use zlib.h. 
- */ 
- 
-void ZLIB_INTERNAL inflate_fast OF((z_streamp strm, unsigned start)); 
+/* inffast.h -- header to use inffast.c
+ * Copyright (C) 1995-2003, 2010 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+void ZLIB_INTERNAL inflate_fast OF((z_streamp strm, unsigned start));
diff --git a/contrib/libs/zlib/inffixed.h b/contrib/libs/zlib/inffixed.h
index b7e4abc2bd..d628327769 100644
--- a/contrib/libs/zlib/inffixed.h
+++ b/contrib/libs/zlib/inffixed.h
@@ -1,94 +1,94 @@
     /* inffixed.h -- table for decoding fixed codes
-     * Generated automatically by makefixed(). 
-     */ 
- 
-    /* WARNING: this file should *not* be used by applications. 
-       It is part of the implementation of this library and is 
-       subject to change. Applications should only use zlib.h. 
-     */ 
- 
-    static const code lenfix[512] = { 
-        {96,7,0},{0,8,80},{0,8,16},{20,8,115},{18,7,31},{0,8,112},{0,8,48}, 
-        {0,9,192},{16,7,10},{0,8,96},{0,8,32},{0,9,160},{0,8,0},{0,8,128}, 
-        {0,8,64},{0,9,224},{16,7,6},{0,8,88},{0,8,24},{0,9,144},{19,7,59}, 
-        {0,8,120},{0,8,56},{0,9,208},{17,7,17},{0,8,104},{0,8,40},{0,9,176}, 
-        {0,8,8},{0,8,136},{0,8,72},{0,9,240},{16,7,4},{0,8,84},{0,8,20}, 
-        {21,8,227},{19,7,43},{0,8,116},{0,8,52},{0,9,200},{17,7,13},{0,8,100}, 
-        {0,8,36},{0,9,168},{0,8,4},{0,8,132},{0,8,68},{0,9,232},{16,7,8}, 
-        {0,8,92},{0,8,28},{0,9,152},{20,7,83},{0,8,124},{0,8,60},{0,9,216}, 
-        {18,7,23},{0,8,108},{0,8,44},{0,9,184},{0,8,12},{0,8,140},{0,8,76}, 
-        {0,9,248},{16,7,3},{0,8,82},{0,8,18},{21,8,163},{19,7,35},{0,8,114}, 
-        {0,8,50},{0,9,196},{17,7,11},{0,8,98},{0,8,34},{0,9,164},{0,8,2}, 
-        {0,8,130},{0,8,66},{0,9,228},{16,7,7},{0,8,90},{0,8,26},{0,9,148}, 
-        {20,7,67},{0,8,122},{0,8,58},{0,9,212},{18,7,19},{0,8,106},{0,8,42}, 
-        {0,9,180},{0,8,10},{0,8,138},{0,8,74},{0,9,244},{16,7,5},{0,8,86}, 
-        {0,8,22},{64,8,0},{19,7,51},{0,8,118},{0,8,54},{0,9,204},{17,7,15}, 
-        {0,8,102},{0,8,38},{0,9,172},{0,8,6},{0,8,134},{0,8,70},{0,9,236}, 
-        {16,7,9},{0,8,94},{0,8,30},{0,9,156},{20,7,99},{0,8,126},{0,8,62}, 
-        {0,9,220},{18,7,27},{0,8,110},{0,8,46},{0,9,188},{0,8,14},{0,8,142}, 
-        {0,8,78},{0,9,252},{96,7,0},{0,8,81},{0,8,17},{21,8,131},{18,7,31}, 
-        {0,8,113},{0,8,49},{0,9,194},{16,7,10},{0,8,97},{0,8,33},{0,9,162}, 
-        {0,8,1},{0,8,129},{0,8,65},{0,9,226},{16,7,6},{0,8,89},{0,8,25}, 
-        {0,9,146},{19,7,59},{0,8,121},{0,8,57},{0,9,210},{17,7,17},{0,8,105}, 
-        {0,8,41},{0,9,178},{0,8,9},{0,8,137},{0,8,73},{0,9,242},{16,7,4}, 
-        {0,8,85},{0,8,21},{16,8,258},{19,7,43},{0,8,117},{0,8,53},{0,9,202}, 
-        {17,7,13},{0,8,101},{0,8,37},{0,9,170},{0,8,5},{0,8,133},{0,8,69}, 
-        {0,9,234},{16,7,8},{0,8,93},{0,8,29},{0,9,154},{20,7,83},{0,8,125}, 
-        {0,8,61},{0,9,218},{18,7,23},{0,8,109},{0,8,45},{0,9,186},{0,8,13}, 
-        {0,8,141},{0,8,77},{0,9,250},{16,7,3},{0,8,83},{0,8,19},{21,8,195}, 
-        {19,7,35},{0,8,115},{0,8,51},{0,9,198},{17,7,11},{0,8,99},{0,8,35}, 
-        {0,9,166},{0,8,3},{0,8,131},{0,8,67},{0,9,230},{16,7,7},{0,8,91}, 
-        {0,8,27},{0,9,150},{20,7,67},{0,8,123},{0,8,59},{0,9,214},{18,7,19}, 
-        {0,8,107},{0,8,43},{0,9,182},{0,8,11},{0,8,139},{0,8,75},{0,9,246}, 
-        {16,7,5},{0,8,87},{0,8,23},{64,8,0},{19,7,51},{0,8,119},{0,8,55}, 
-        {0,9,206},{17,7,15},{0,8,103},{0,8,39},{0,9,174},{0,8,7},{0,8,135}, 
-        {0,8,71},{0,9,238},{16,7,9},{0,8,95},{0,8,31},{0,9,158},{20,7,99}, 
-        {0,8,127},{0,8,63},{0,9,222},{18,7,27},{0,8,111},{0,8,47},{0,9,190}, 
-        {0,8,15},{0,8,143},{0,8,79},{0,9,254},{96,7,0},{0,8,80},{0,8,16}, 
-        {20,8,115},{18,7,31},{0,8,112},{0,8,48},{0,9,193},{16,7,10},{0,8,96}, 
-        {0,8,32},{0,9,161},{0,8,0},{0,8,128},{0,8,64},{0,9,225},{16,7,6}, 
-        {0,8,88},{0,8,24},{0,9,145},{19,7,59},{0,8,120},{0,8,56},{0,9,209}, 
-        {17,7,17},{0,8,104},{0,8,40},{0,9,177},{0,8,8},{0,8,136},{0,8,72}, 
-        {0,9,241},{16,7,4},{0,8,84},{0,8,20},{21,8,227},{19,7,43},{0,8,116}, 
-        {0,8,52},{0,9,201},{17,7,13},{0,8,100},{0,8,36},{0,9,169},{0,8,4}, 
-        {0,8,132},{0,8,68},{0,9,233},{16,7,8},{0,8,92},{0,8,28},{0,9,153}, 
-        {20,7,83},{0,8,124},{0,8,60},{0,9,217},{18,7,23},{0,8,108},{0,8,44}, 
-        {0,9,185},{0,8,12},{0,8,140},{0,8,76},{0,9,249},{16,7,3},{0,8,82}, 
-        {0,8,18},{21,8,163},{19,7,35},{0,8,114},{0,8,50},{0,9,197},{17,7,11}, 
-        {0,8,98},{0,8,34},{0,9,165},{0,8,2},{0,8,130},{0,8,66},{0,9,229}, 
-        {16,7,7},{0,8,90},{0,8,26},{0,9,149},{20,7,67},{0,8,122},{0,8,58}, 
-        {0,9,213},{18,7,19},{0,8,106},{0,8,42},{0,9,181},{0,8,10},{0,8,138}, 
-        {0,8,74},{0,9,245},{16,7,5},{0,8,86},{0,8,22},{64,8,0},{19,7,51}, 
-        {0,8,118},{0,8,54},{0,9,205},{17,7,15},{0,8,102},{0,8,38},{0,9,173}, 
-        {0,8,6},{0,8,134},{0,8,70},{0,9,237},{16,7,9},{0,8,94},{0,8,30}, 
-        {0,9,157},{20,7,99},{0,8,126},{0,8,62},{0,9,221},{18,7,27},{0,8,110}, 
-        {0,8,46},{0,9,189},{0,8,14},{0,8,142},{0,8,78},{0,9,253},{96,7,0}, 
-        {0,8,81},{0,8,17},{21,8,131},{18,7,31},{0,8,113},{0,8,49},{0,9,195}, 
-        {16,7,10},{0,8,97},{0,8,33},{0,9,163},{0,8,1},{0,8,129},{0,8,65}, 
-        {0,9,227},{16,7,6},{0,8,89},{0,8,25},{0,9,147},{19,7,59},{0,8,121}, 
-        {0,8,57},{0,9,211},{17,7,17},{0,8,105},{0,8,41},{0,9,179},{0,8,9}, 
-        {0,8,137},{0,8,73},{0,9,243},{16,7,4},{0,8,85},{0,8,21},{16,8,258}, 
-        {19,7,43},{0,8,117},{0,8,53},{0,9,203},{17,7,13},{0,8,101},{0,8,37}, 
-        {0,9,171},{0,8,5},{0,8,133},{0,8,69},{0,9,235},{16,7,8},{0,8,93}, 
-        {0,8,29},{0,9,155},{20,7,83},{0,8,125},{0,8,61},{0,9,219},{18,7,23}, 
-        {0,8,109},{0,8,45},{0,9,187},{0,8,13},{0,8,141},{0,8,77},{0,9,251}, 
-        {16,7,3},{0,8,83},{0,8,19},{21,8,195},{19,7,35},{0,8,115},{0,8,51}, 
-        {0,9,199},{17,7,11},{0,8,99},{0,8,35},{0,9,167},{0,8,3},{0,8,131}, 
-        {0,8,67},{0,9,231},{16,7,7},{0,8,91},{0,8,27},{0,9,151},{20,7,67}, 
-        {0,8,123},{0,8,59},{0,9,215},{18,7,19},{0,8,107},{0,8,43},{0,9,183}, 
-        {0,8,11},{0,8,139},{0,8,75},{0,9,247},{16,7,5},{0,8,87},{0,8,23}, 
-        {64,8,0},{19,7,51},{0,8,119},{0,8,55},{0,9,207},{17,7,15},{0,8,103}, 
-        {0,8,39},{0,9,175},{0,8,7},{0,8,135},{0,8,71},{0,9,239},{16,7,9}, 
-        {0,8,95},{0,8,31},{0,9,159},{20,7,99},{0,8,127},{0,8,63},{0,9,223}, 
-        {18,7,27},{0,8,111},{0,8,47},{0,9,191},{0,8,15},{0,8,143},{0,8,79}, 
-        {0,9,255} 
-    }; 
- 
-    static const code distfix[32] = { 
-        {16,5,1},{23,5,257},{19,5,17},{27,5,4097},{17,5,5},{25,5,1025}, 
-        {21,5,65},{29,5,16385},{16,5,3},{24,5,513},{20,5,33},{28,5,8193}, 
-        {18,5,9},{26,5,2049},{22,5,129},{64,5,0},{16,5,2},{23,5,385}, 
-        {19,5,25},{27,5,6145},{17,5,7},{25,5,1537},{21,5,97},{29,5,24577}, 
-        {16,5,4},{24,5,769},{20,5,49},{28,5,12289},{18,5,13},{26,5,3073}, 
-        {22,5,193},{64,5,0} 
-    }; 
+     * Generated automatically by makefixed().
+     */
+
+    /* WARNING: this file should *not* be used by applications.
+       It is part of the implementation of this library and is
+       subject to change. Applications should only use zlib.h.
+     */
+
+    static const code lenfix[512] = {
+        {96,7,0},{0,8,80},{0,8,16},{20,8,115},{18,7,31},{0,8,112},{0,8,48},
+        {0,9,192},{16,7,10},{0,8,96},{0,8,32},{0,9,160},{0,8,0},{0,8,128},
+        {0,8,64},{0,9,224},{16,7,6},{0,8,88},{0,8,24},{0,9,144},{19,7,59},
+        {0,8,120},{0,8,56},{0,9,208},{17,7,17},{0,8,104},{0,8,40},{0,9,176},
+        {0,8,8},{0,8,136},{0,8,72},{0,9,240},{16,7,4},{0,8,84},{0,8,20},
+        {21,8,227},{19,7,43},{0,8,116},{0,8,52},{0,9,200},{17,7,13},{0,8,100},
+        {0,8,36},{0,9,168},{0,8,4},{0,8,132},{0,8,68},{0,9,232},{16,7,8},
+        {0,8,92},{0,8,28},{0,9,152},{20,7,83},{0,8,124},{0,8,60},{0,9,216},
+        {18,7,23},{0,8,108},{0,8,44},{0,9,184},{0,8,12},{0,8,140},{0,8,76},
+        {0,9,248},{16,7,3},{0,8,82},{0,8,18},{21,8,163},{19,7,35},{0,8,114},
+        {0,8,50},{0,9,196},{17,7,11},{0,8,98},{0,8,34},{0,9,164},{0,8,2},
+        {0,8,130},{0,8,66},{0,9,228},{16,7,7},{0,8,90},{0,8,26},{0,9,148},
+        {20,7,67},{0,8,122},{0,8,58},{0,9,212},{18,7,19},{0,8,106},{0,8,42},
+        {0,9,180},{0,8,10},{0,8,138},{0,8,74},{0,9,244},{16,7,5},{0,8,86},
+        {0,8,22},{64,8,0},{19,7,51},{0,8,118},{0,8,54},{0,9,204},{17,7,15},
+        {0,8,102},{0,8,38},{0,9,172},{0,8,6},{0,8,134},{0,8,70},{0,9,236},
+        {16,7,9},{0,8,94},{0,8,30},{0,9,156},{20,7,99},{0,8,126},{0,8,62},
+        {0,9,220},{18,7,27},{0,8,110},{0,8,46},{0,9,188},{0,8,14},{0,8,142},
+        {0,8,78},{0,9,252},{96,7,0},{0,8,81},{0,8,17},{21,8,131},{18,7,31},
+        {0,8,113},{0,8,49},{0,9,194},{16,7,10},{0,8,97},{0,8,33},{0,9,162},
+        {0,8,1},{0,8,129},{0,8,65},{0,9,226},{16,7,6},{0,8,89},{0,8,25},
+        {0,9,146},{19,7,59},{0,8,121},{0,8,57},{0,9,210},{17,7,17},{0,8,105},
+        {0,8,41},{0,9,178},{0,8,9},{0,8,137},{0,8,73},{0,9,242},{16,7,4},
+        {0,8,85},{0,8,21},{16,8,258},{19,7,43},{0,8,117},{0,8,53},{0,9,202},
+        {17,7,13},{0,8,101},{0,8,37},{0,9,170},{0,8,5},{0,8,133},{0,8,69},
+        {0,9,234},{16,7,8},{0,8,93},{0,8,29},{0,9,154},{20,7,83},{0,8,125},
+        {0,8,61},{0,9,218},{18,7,23},{0,8,109},{0,8,45},{0,9,186},{0,8,13},
+        {0,8,141},{0,8,77},{0,9,250},{16,7,3},{0,8,83},{0,8,19},{21,8,195},
+        {19,7,35},{0,8,115},{0,8,51},{0,9,198},{17,7,11},{0,8,99},{0,8,35},
+        {0,9,166},{0,8,3},{0,8,131},{0,8,67},{0,9,230},{16,7,7},{0,8,91},
+        {0,8,27},{0,9,150},{20,7,67},{0,8,123},{0,8,59},{0,9,214},{18,7,19},
+        {0,8,107},{0,8,43},{0,9,182},{0,8,11},{0,8,139},{0,8,75},{0,9,246},
+        {16,7,5},{0,8,87},{0,8,23},{64,8,0},{19,7,51},{0,8,119},{0,8,55},
+        {0,9,206},{17,7,15},{0,8,103},{0,8,39},{0,9,174},{0,8,7},{0,8,135},
+        {0,8,71},{0,9,238},{16,7,9},{0,8,95},{0,8,31},{0,9,158},{20,7,99},
+        {0,8,127},{0,8,63},{0,9,222},{18,7,27},{0,8,111},{0,8,47},{0,9,190},
+        {0,8,15},{0,8,143},{0,8,79},{0,9,254},{96,7,0},{0,8,80},{0,8,16},
+        {20,8,115},{18,7,31},{0,8,112},{0,8,48},{0,9,193},{16,7,10},{0,8,96},
+        {0,8,32},{0,9,161},{0,8,0},{0,8,128},{0,8,64},{0,9,225},{16,7,6},
+        {0,8,88},{0,8,24},{0,9,145},{19,7,59},{0,8,120},{0,8,56},{0,9,209},
+        {17,7,17},{0,8,104},{0,8,40},{0,9,177},{0,8,8},{0,8,136},{0,8,72},
+        {0,9,241},{16,7,4},{0,8,84},{0,8,20},{21,8,227},{19,7,43},{0,8,116},
+        {0,8,52},{0,9,201},{17,7,13},{0,8,100},{0,8,36},{0,9,169},{0,8,4},
+        {0,8,132},{0,8,68},{0,9,233},{16,7,8},{0,8,92},{0,8,28},{0,9,153},
+        {20,7,83},{0,8,124},{0,8,60},{0,9,217},{18,7,23},{0,8,108},{0,8,44},
+        {0,9,185},{0,8,12},{0,8,140},{0,8,76},{0,9,249},{16,7,3},{0,8,82},
+        {0,8,18},{21,8,163},{19,7,35},{0,8,114},{0,8,50},{0,9,197},{17,7,11},
+        {0,8,98},{0,8,34},{0,9,165},{0,8,2},{0,8,130},{0,8,66},{0,9,229},
+        {16,7,7},{0,8,90},{0,8,26},{0,9,149},{20,7,67},{0,8,122},{0,8,58},
+        {0,9,213},{18,7,19},{0,8,106},{0,8,42},{0,9,181},{0,8,10},{0,8,138},
+        {0,8,74},{0,9,245},{16,7,5},{0,8,86},{0,8,22},{64,8,0},{19,7,51},
+        {0,8,118},{0,8,54},{0,9,205},{17,7,15},{0,8,102},{0,8,38},{0,9,173},
+        {0,8,6},{0,8,134},{0,8,70},{0,9,237},{16,7,9},{0,8,94},{0,8,30},
+        {0,9,157},{20,7,99},{0,8,126},{0,8,62},{0,9,221},{18,7,27},{0,8,110},
+        {0,8,46},{0,9,189},{0,8,14},{0,8,142},{0,8,78},{0,9,253},{96,7,0},
+        {0,8,81},{0,8,17},{21,8,131},{18,7,31},{0,8,113},{0,8,49},{0,9,195},
+        {16,7,10},{0,8,97},{0,8,33},{0,9,163},{0,8,1},{0,8,129},{0,8,65},
+        {0,9,227},{16,7,6},{0,8,89},{0,8,25},{0,9,147},{19,7,59},{0,8,121},
+        {0,8,57},{0,9,211},{17,7,17},{0,8,105},{0,8,41},{0,9,179},{0,8,9},
+        {0,8,137},{0,8,73},{0,9,243},{16,7,4},{0,8,85},{0,8,21},{16,8,258},
+        {19,7,43},{0,8,117},{0,8,53},{0,9,203},{17,7,13},{0,8,101},{0,8,37},
+        {0,9,171},{0,8,5},{0,8,133},{0,8,69},{0,9,235},{16,7,8},{0,8,93},
+        {0,8,29},{0,9,155},{20,7,83},{0,8,125},{0,8,61},{0,9,219},{18,7,23},
+        {0,8,109},{0,8,45},{0,9,187},{0,8,13},{0,8,141},{0,8,77},{0,9,251},
+        {16,7,3},{0,8,83},{0,8,19},{21,8,195},{19,7,35},{0,8,115},{0,8,51},
+        {0,9,199},{17,7,11},{0,8,99},{0,8,35},{0,9,167},{0,8,3},{0,8,131},
+        {0,8,67},{0,9,231},{16,7,7},{0,8,91},{0,8,27},{0,9,151},{20,7,67},
+        {0,8,123},{0,8,59},{0,9,215},{18,7,19},{0,8,107},{0,8,43},{0,9,183},
+        {0,8,11},{0,8,139},{0,8,75},{0,9,247},{16,7,5},{0,8,87},{0,8,23},
+        {64,8,0},{19,7,51},{0,8,119},{0,8,55},{0,9,207},{17,7,15},{0,8,103},
+        {0,8,39},{0,9,175},{0,8,7},{0,8,135},{0,8,71},{0,9,239},{16,7,9},
+        {0,8,95},{0,8,31},{0,9,159},{20,7,99},{0,8,127},{0,8,63},{0,9,223},
+        {18,7,27},{0,8,111},{0,8,47},{0,9,191},{0,8,15},{0,8,143},{0,8,79},
+        {0,9,255}
+    };
+
+    static const code distfix[32] = {
+        {16,5,1},{23,5,257},{19,5,17},{27,5,4097},{17,5,5},{25,5,1025},
+        {21,5,65},{29,5,16385},{16,5,3},{24,5,513},{20,5,33},{28,5,8193},
+        {18,5,9},{26,5,2049},{22,5,129},{64,5,0},{16,5,2},{23,5,385},
+        {19,5,25},{27,5,6145},{17,5,7},{25,5,1537},{21,5,97},{29,5,24577},
+        {16,5,4},{24,5,769},{20,5,49},{28,5,12289},{18,5,13},{26,5,3073},
+        {22,5,193},{64,5,0}
+    };
diff --git a/contrib/libs/zlib/inflate.c b/contrib/libs/zlib/inflate.c
index 65f36fd300..ac333e8c2e 100644
--- a/contrib/libs/zlib/inflate.c
+++ b/contrib/libs/zlib/inflate.c
@@ -1,107 +1,107 @@
-/* inflate.c -- zlib decompression 
+/* inflate.c -- zlib decompression
  * Copyright (C) 1995-2016 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */ 
- 
-/* 
- * Change history: 
- * 
- * 1.2.beta0    24 Nov 2002 
- * - First version -- complete rewrite of inflate to simplify code, avoid 
- *   creation of window when not needed, minimize use of window when it is 
- *   needed, make inffast.c even faster, implement gzip decoding, and to 
- *   improve code readability and style over the previous zlib inflate code 
- * 
- * 1.2.beta1    25 Nov 2002 
- * - Use pointers for available input and output checking in inffast.c 
- * - Remove input and output counters in inffast.c 
- * - Change inffast.c entry and loop from avail_in >= 7 to >= 6 
- * - Remove unnecessary second byte pull from length extra in inffast.c 
- * - Unroll direct copy to three copies per loop in inffast.c 
- * 
- * 1.2.beta2    4 Dec 2002 
- * - Change external routine names to reduce potential conflicts 
- * - Correct filename to inffixed.h for fixed tables in inflate.c 
- * - Make hbuf[] unsigned char to match parameter type in inflate.c 
- * - Change strm->next_out[-state->offset] to *(strm->next_out - state->offset) 
- *   to avoid negation problem on Alphas (64 bit) in inflate.c 
- * 
- * 1.2.beta3    22 Dec 2002 
- * - Add comments on state->bits assertion in inffast.c 
- * - Add comments on op field in inftrees.h 
- * - Fix bug in reuse of allocated window after inflateReset() 
- * - Remove bit fields--back to byte structure for speed 
- * - Remove distance extra == 0 check in inflate_fast()--only helps for lengths 
- * - Change post-increments to pre-increments in inflate_fast(), PPC biased? 
- * - Add compile time option, POSTINC, to use post-increments instead (Intel?) 
- * - Make MATCH copy in inflate() much faster for when inflate_fast() not used 
- * - Use local copies of stream next and avail values, as well as local bit 
- *   buffer and bit count in inflate()--for speed when inflate_fast() not used 
- * 
- * 1.2.beta4    1 Jan 2003 
- * - Split ptr - 257 statements in inflate_table() to avoid compiler warnings 
- * - Move a comment on output buffer sizes from inffast.c to inflate.c 
- * - Add comments in inffast.c to introduce the inflate_fast() routine 
- * - Rearrange window copies in inflate_fast() for speed and simplification 
- * - Unroll last copy for window match in inflate_fast() 
- * - Use local copies of window variables in inflate_fast() for speed 
- * - Pull out common wnext == 0 case for speed in inflate_fast() 
- * - Make op and len in inflate_fast() unsigned for consistency 
- * - Add FAR to lcode and dcode declarations in inflate_fast() 
- * - Simplified bad distance check in inflate_fast() 
- * - Added inflateBackInit(), inflateBack(), and inflateBackEnd() in new 
- *   source file infback.c to provide a call-back interface to inflate for 
- *   programs like gzip and unzip -- uses window as output buffer to avoid 
- *   window copying 
- * 
- * 1.2.beta5    1 Jan 2003 
- * - Improved inflateBack() interface to allow the caller to provide initial 
- *   input in strm. 
- * - Fixed stored blocks bug in inflateBack() 
- * 
- * 1.2.beta6    4 Jan 2003 
- * - Added comments in inffast.c on effectiveness of POSTINC 
- * - Typecasting all around to reduce compiler warnings 
- * - Changed loops from while (1) or do {} while (1) to for (;;), again to 
- *   make compilers happy 
- * - Changed type of window in inflateBackInit() to unsigned char * 
- * 
- * 1.2.beta7    27 Jan 2003 
- * - Changed many types to unsigned or unsigned short to avoid warnings 
- * - Added inflateCopy() function 
- * 
- * 1.2.0        9 Mar 2003 
- * - Changed inflateBack() interface to provide separate opaque descriptors 
- *   for the in() and out() functions 
- * - Changed inflateBack() argument and in_func typedef to swap the length 
- *   and buffer address return values for the input function 
- * - Check next_in and next_out for Z_NULL on entry to inflate() 
- * 
- * The history for versions after 1.2.0 are in ChangeLog in zlib distribution. 
- */ 
- 
-#include "zutil.h" 
-#include "inftrees.h" 
-#include "inflate.h" 
-#include "inffast.h" 
- 
-#ifdef MAKEFIXED 
-#  ifndef BUILDFIXED 
-#    define BUILDFIXED 
-#  endif 
-#endif 
- 
-/* function prototypes */ 
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/*
+ * Change history:
+ *
+ * 1.2.beta0    24 Nov 2002
+ * - First version -- complete rewrite of inflate to simplify code, avoid
+ *   creation of window when not needed, minimize use of window when it is
+ *   needed, make inffast.c even faster, implement gzip decoding, and to
+ *   improve code readability and style over the previous zlib inflate code
+ *
+ * 1.2.beta1    25 Nov 2002
+ * - Use pointers for available input and output checking in inffast.c
+ * - Remove input and output counters in inffast.c
+ * - Change inffast.c entry and loop from avail_in >= 7 to >= 6
+ * - Remove unnecessary second byte pull from length extra in inffast.c
+ * - Unroll direct copy to three copies per loop in inffast.c
+ *
+ * 1.2.beta2    4 Dec 2002
+ * - Change external routine names to reduce potential conflicts
+ * - Correct filename to inffixed.h for fixed tables in inflate.c
+ * - Make hbuf[] unsigned char to match parameter type in inflate.c
+ * - Change strm->next_out[-state->offset] to *(strm->next_out - state->offset)
+ *   to avoid negation problem on Alphas (64 bit) in inflate.c
+ *
+ * 1.2.beta3    22 Dec 2002
+ * - Add comments on state->bits assertion in inffast.c
+ * - Add comments on op field in inftrees.h
+ * - Fix bug in reuse of allocated window after inflateReset()
+ * - Remove bit fields--back to byte structure for speed
+ * - Remove distance extra == 0 check in inflate_fast()--only helps for lengths
+ * - Change post-increments to pre-increments in inflate_fast(), PPC biased?
+ * - Add compile time option, POSTINC, to use post-increments instead (Intel?)
+ * - Make MATCH copy in inflate() much faster for when inflate_fast() not used
+ * - Use local copies of stream next and avail values, as well as local bit
+ *   buffer and bit count in inflate()--for speed when inflate_fast() not used
+ *
+ * 1.2.beta4    1 Jan 2003
+ * - Split ptr - 257 statements in inflate_table() to avoid compiler warnings
+ * - Move a comment on output buffer sizes from inffast.c to inflate.c
+ * - Add comments in inffast.c to introduce the inflate_fast() routine
+ * - Rearrange window copies in inflate_fast() for speed and simplification
+ * - Unroll last copy for window match in inflate_fast()
+ * - Use local copies of window variables in inflate_fast() for speed
+ * - Pull out common wnext == 0 case for speed in inflate_fast()
+ * - Make op and len in inflate_fast() unsigned for consistency
+ * - Add FAR to lcode and dcode declarations in inflate_fast()
+ * - Simplified bad distance check in inflate_fast()
+ * - Added inflateBackInit(), inflateBack(), and inflateBackEnd() in new
+ *   source file infback.c to provide a call-back interface to inflate for
+ *   programs like gzip and unzip -- uses window as output buffer to avoid
+ *   window copying
+ *
+ * 1.2.beta5    1 Jan 2003
+ * - Improved inflateBack() interface to allow the caller to provide initial
+ *   input in strm.
+ * - Fixed stored blocks bug in inflateBack()
+ *
+ * 1.2.beta6    4 Jan 2003
+ * - Added comments in inffast.c on effectiveness of POSTINC
+ * - Typecasting all around to reduce compiler warnings
+ * - Changed loops from while (1) or do {} while (1) to for (;;), again to
+ *   make compilers happy
+ * - Changed type of window in inflateBackInit() to unsigned char *
+ *
+ * 1.2.beta7    27 Jan 2003
+ * - Changed many types to unsigned or unsigned short to avoid warnings
+ * - Added inflateCopy() function
+ *
+ * 1.2.0        9 Mar 2003
+ * - Changed inflateBack() interface to provide separate opaque descriptors
+ *   for the in() and out() functions
+ * - Changed inflateBack() argument and in_func typedef to swap the length
+ *   and buffer address return values for the input function
+ * - Check next_in and next_out for Z_NULL on entry to inflate()
+ *
+ * The history for versions after 1.2.0 are in ChangeLog in zlib distribution.
+ */
+
+#include "zutil.h"
+#include "inftrees.h"
+#include "inflate.h"
+#include "inffast.h"
+
+#ifdef MAKEFIXED
+#  ifndef BUILDFIXED
+#    define BUILDFIXED
+#  endif
+#endif
+
+/* function prototypes */
 local int inflateStateCheck OF((z_streamp strm));
-local void fixedtables OF((struct inflate_state FAR *state)); 
-local int updatewindow OF((z_streamp strm, const unsigned char FAR *end, 
-                           unsigned copy)); 
-#ifdef BUILDFIXED 
-   void makefixed OF((void)); 
-#endif 
-local unsigned syncsearch OF((unsigned FAR *have, const unsigned char FAR *buf, 
-                              unsigned len)); 
- 
+local void fixedtables OF((struct inflate_state FAR *state));
+local int updatewindow OF((z_streamp strm, const unsigned char FAR *end,
+                           unsigned copy));
+#ifdef BUILDFIXED
+   void makefixed OF((void));
+#endif
+local unsigned syncsearch OF((unsigned FAR *have, const unsigned char FAR *buf,
+                              unsigned len));
+
 local int inflateStateCheck(strm)
 z_streamp strm;
 {
@@ -116,1413 +116,1413 @@ z_streamp strm;
     return 0;
 }
 
-int ZEXPORT inflateResetKeep(strm) 
-z_streamp strm; 
-{ 
-    struct inflate_state FAR *state; 
- 
+int ZEXPORT inflateResetKeep(strm)
+z_streamp strm;
+{
+    struct inflate_state FAR *state;
+
     if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state; 
-    strm->total_in = strm->total_out = state->total = 0; 
-    strm->msg = Z_NULL; 
-    if (state->wrap)        /* to support ill-conceived Java test suite */ 
-        strm->adler = state->wrap & 1; 
-    state->mode = HEAD; 
-    state->last = 0; 
-    state->havedict = 0; 
-    state->dmax = 32768U; 
-    state->head = Z_NULL; 
-    state->hold = 0; 
-    state->bits = 0; 
-    state->lencode = state->distcode = state->next = state->codes; 
-    state->sane = 1; 
-    state->back = -1; 
-    Tracev((stderr, "inflate: reset\n")); 
-    return Z_OK; 
-} 
- 
-int ZEXPORT inflateReset(strm) 
-z_streamp strm; 
-{ 
-    struct inflate_state FAR *state; 
- 
+    state = (struct inflate_state FAR *)strm->state;
+    strm->total_in = strm->total_out = state->total = 0;
+    strm->msg = Z_NULL;
+    if (state->wrap)        /* to support ill-conceived Java test suite */
+        strm->adler = state->wrap & 1;
+    state->mode = HEAD;
+    state->last = 0;
+    state->havedict = 0;
+    state->dmax = 32768U;
+    state->head = Z_NULL;
+    state->hold = 0;
+    state->bits = 0;
+    state->lencode = state->distcode = state->next = state->codes;
+    state->sane = 1;
+    state->back = -1;
+    Tracev((stderr, "inflate: reset\n"));
+    return Z_OK;
+}
+
+int ZEXPORT inflateReset(strm)
+z_streamp strm;
+{
+    struct inflate_state FAR *state;
+
     if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state; 
-    state->wsize = 0; 
-    state->whave = 0; 
-    state->wnext = 0; 
-    return inflateResetKeep(strm); 
-} 
- 
-int ZEXPORT inflateReset2(strm, windowBits) 
-z_streamp strm; 
-int windowBits; 
-{ 
-    int wrap; 
-    struct inflate_state FAR *state; 
- 
-    /* get the state */ 
+    state = (struct inflate_state FAR *)strm->state;
+    state->wsize = 0;
+    state->whave = 0;
+    state->wnext = 0;
+    return inflateResetKeep(strm);
+}
+
+int ZEXPORT inflateReset2(strm, windowBits)
+z_streamp strm;
+int windowBits;
+{
+    int wrap;
+    struct inflate_state FAR *state;
+
+    /* get the state */
     if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state; 
- 
-    /* extract wrap request from windowBits parameter */ 
-    if (windowBits < 0) { 
-        wrap = 0; 
-        windowBits = -windowBits; 
-    } 
-    else { 
+    state = (struct inflate_state FAR *)strm->state;
+
+    /* extract wrap request from windowBits parameter */
+    if (windowBits < 0) {
+        wrap = 0;
+        windowBits = -windowBits;
+    }
+    else {
         wrap = (windowBits >> 4) + 5;
-#ifdef GUNZIP 
-        if (windowBits < 48) 
-            windowBits &= 15; 
-#endif 
-    } 
- 
-    /* set number of window bits, free window if different */ 
-    if (windowBits && (windowBits < 8 || windowBits > 15)) 
-        return Z_STREAM_ERROR; 
-    if (state->window != Z_NULL && state->wbits != (unsigned)windowBits) { 
-        ZFREE(strm, state->window); 
-        state->window = Z_NULL; 
-    } 
- 
-    /* update state and reset the rest of it */ 
-    state->wrap = wrap; 
-    state->wbits = (unsigned)windowBits; 
-    return inflateReset(strm); 
-} 
- 
-int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size) 
-z_streamp strm; 
-int windowBits; 
-const char *version; 
-int stream_size; 
-{ 
-    int ret; 
-    struct inflate_state FAR *state; 
- 
-    if (version == Z_NULL || version[0] != ZLIB_VERSION[0] || 
-        stream_size != (int)(sizeof(z_stream))) 
-        return Z_VERSION_ERROR; 
-    if (strm == Z_NULL) return Z_STREAM_ERROR; 
-    strm->msg = Z_NULL;                 /* in case we return an error */ 
-    if (strm->zalloc == (alloc_func)0) { 
-#ifdef Z_SOLO 
-        return Z_STREAM_ERROR; 
-#else 
-        strm->zalloc = zcalloc; 
-        strm->opaque = (voidpf)0; 
-#endif 
-    } 
-    if (strm->zfree == (free_func)0) 
-#ifdef Z_SOLO 
-        return Z_STREAM_ERROR; 
-#else 
-        strm->zfree = zcfree; 
-#endif 
-    state = (struct inflate_state FAR *) 
-            ZALLOC(strm, 1, sizeof(struct inflate_state)); 
-    if (state == Z_NULL) return Z_MEM_ERROR; 
-    Tracev((stderr, "inflate: allocated\n")); 
-    strm->state = (struct internal_state FAR *)state; 
+#ifdef GUNZIP
+        if (windowBits < 48)
+            windowBits &= 15;
+#endif
+    }
+
+    /* set number of window bits, free window if different */
+    if (windowBits && (windowBits < 8 || windowBits > 15))
+        return Z_STREAM_ERROR;
+    if (state->window != Z_NULL && state->wbits != (unsigned)windowBits) {
+        ZFREE(strm, state->window);
+        state->window = Z_NULL;
+    }
+
+    /* update state and reset the rest of it */
+    state->wrap = wrap;
+    state->wbits = (unsigned)windowBits;
+    return inflateReset(strm);
+}
+
+int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size)
+z_streamp strm;
+int windowBits;
+const char *version;
+int stream_size;
+{
+    int ret;
+    struct inflate_state FAR *state;
+
+    if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
+        stream_size != (int)(sizeof(z_stream)))
+        return Z_VERSION_ERROR;
+    if (strm == Z_NULL) return Z_STREAM_ERROR;
+    strm->msg = Z_NULL;                 /* in case we return an error */
+    if (strm->zalloc == (alloc_func)0) {
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
+        strm->zalloc = zcalloc;
+        strm->opaque = (voidpf)0;
+#endif
+    }
+    if (strm->zfree == (free_func)0)
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
+        strm->zfree = zcfree;
+#endif
+    state = (struct inflate_state FAR *)
+            ZALLOC(strm, 1, sizeof(struct inflate_state));
+    if (state == Z_NULL) return Z_MEM_ERROR;
+    Tracev((stderr, "inflate: allocated\n"));
+    strm->state = (struct internal_state FAR *)state;
     state->strm = strm;
-    state->window = Z_NULL; 
+    state->window = Z_NULL;
     state->mode = HEAD;     /* to pass state test in inflateReset2() */
-    ret = inflateReset2(strm, windowBits); 
-    if (ret != Z_OK) { 
-        ZFREE(strm, state); 
-        strm->state = Z_NULL; 
-    } 
-    return ret; 
-} 
- 
-int ZEXPORT inflateInit_(strm, version, stream_size) 
-z_streamp strm; 
-const char *version; 
-int stream_size; 
-{ 
-    return inflateInit2_(strm, DEF_WBITS, version, stream_size); 
-} 
- 
-int ZEXPORT inflatePrime(strm, bits, value) 
-z_streamp strm; 
-int bits; 
-int value; 
-{ 
-    struct inflate_state FAR *state; 
- 
+    ret = inflateReset2(strm, windowBits);
+    if (ret != Z_OK) {
+        ZFREE(strm, state);
+        strm->state = Z_NULL;
+    }
+    return ret;
+}
+
+int ZEXPORT inflateInit_(strm, version, stream_size)
+z_streamp strm;
+const char *version;
+int stream_size;
+{
+    return inflateInit2_(strm, DEF_WBITS, version, stream_size);
+}
+
+int ZEXPORT inflatePrime(strm, bits, value)
+z_streamp strm;
+int bits;
+int value;
+{
+    struct inflate_state FAR *state;
+
     if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state; 
-    if (bits < 0) { 
-        state->hold = 0; 
-        state->bits = 0; 
-        return Z_OK; 
-    } 
+    state = (struct inflate_state FAR *)strm->state;
+    if (bits < 0) {
+        state->hold = 0;
+        state->bits = 0;
+        return Z_OK;
+    }
     if (bits > 16 || state->bits + (uInt)bits > 32) return Z_STREAM_ERROR;
-    value &= (1L << bits) - 1; 
+    value &= (1L << bits) - 1;
     state->hold += (unsigned)value << state->bits;
     state->bits += (uInt)bits;
-    return Z_OK; 
-} 
- 
-/* 
-   Return state with length and distance decoding tables and index sizes set to 
-   fixed code decoding.  Normally this returns fixed tables from inffixed.h. 
-   If BUILDFIXED is defined, then instead this routine builds the tables the 
-   first time it's called, and returns those tables the first time and 
-   thereafter.  This reduces the size of the code by about 2K bytes, in 
-   exchange for a little execution time.  However, BUILDFIXED should not be 
-   used for threaded applications, since the rewriting of the tables and virgin 
-   may not be thread-safe. 
- */ 
-local void fixedtables(state) 
-struct inflate_state FAR *state; 
-{ 
-#ifdef BUILDFIXED 
-    static int virgin = 1; 
-    static code *lenfix, *distfix; 
-    static code fixed[544]; 
- 
-    /* build fixed huffman tables if first call (may not be thread safe) */ 
-    if (virgin) { 
-        unsigned sym, bits; 
-        static code *next; 
- 
-        /* literal/length table */ 
-        sym = 0; 
-        while (sym < 144) state->lens[sym++] = 8; 
-        while (sym < 256) state->lens[sym++] = 9; 
-        while (sym < 280) state->lens[sym++] = 7; 
-        while (sym < 288) state->lens[sym++] = 8; 
-        next = fixed; 
-        lenfix = next; 
-        bits = 9; 
-        inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work); 
- 
-        /* distance table */ 
-        sym = 0; 
-        while (sym < 32) state->lens[sym++] = 5; 
-        distfix = next; 
-        bits = 5; 
-        inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work); 
- 
-        /* do this just once */ 
-        virgin = 0; 
-    } 
-#else /* !BUILDFIXED */ 
-#   include "inffixed.h" 
-#endif /* BUILDFIXED */ 
-    state->lencode = lenfix; 
-    state->lenbits = 9; 
-    state->distcode = distfix; 
-    state->distbits = 5; 
-} 
- 
-#ifdef MAKEFIXED 
-#include <stdio.h> 
- 
-/* 
-   Write out the inffixed.h that is #include'd above.  Defining MAKEFIXED also 
-   defines BUILDFIXED, so the tables are built on the fly.  makefixed() writes 
-   those tables to stdout, which would be piped to inffixed.h.  A small program 
-   can simply call makefixed to do this: 
- 
-    void makefixed(void); 
- 
-    int main(void) 
-    { 
-        makefixed(); 
-        return 0; 
-    } 
- 
-   Then that can be linked with zlib built with MAKEFIXED defined and run: 
- 
-    a.out > inffixed.h 
- */ 
-void makefixed() 
-{ 
-    unsigned low, size; 
-    struct inflate_state state; 
- 
-    fixedtables(&state); 
-    puts("    /* inffixed.h -- table for decoding fixed codes"); 
-    puts("     * Generated automatically by makefixed()."); 
-    puts("     */"); 
-    puts(""); 
-    puts("    /* WARNING: this file should *not* be used by applications."); 
-    puts("       It is part of the implementation of this library and is"); 
-    puts("       subject to change. Applications should only use zlib.h."); 
-    puts("     */"); 
-    puts(""); 
-    size = 1U << 9; 
-    printf("    static const code lenfix[%u] = {", size); 
-    low = 0; 
-    for (;;) { 
-        if ((low % 7) == 0) printf("\n        "); 
-        printf("{%u,%u,%d}", (low & 127) == 99 ? 64 : state.lencode[low].op, 
-               state.lencode[low].bits, state.lencode[low].val); 
-        if (++low == size) break; 
-        putchar(','); 
-    } 
-    puts("\n    };"); 
-    size = 1U << 5; 
-    printf("\n    static const code distfix[%u] = {", size); 
-    low = 0; 
-    for (;;) { 
-        if ((low % 6) == 0) printf("\n        "); 
-        printf("{%u,%u,%d}", state.distcode[low].op, state.distcode[low].bits, 
-               state.distcode[low].val); 
-        if (++low == size) break; 
-        putchar(','); 
-    } 
-    puts("\n    };"); 
-} 
-#endif /* MAKEFIXED */ 
- 
-/* 
-   Update the window with the last wsize (normally 32K) bytes written before 
-   returning.  If window does not exist yet, create it.  This is only called 
-   when a window is already in use, or when output has been written during this 
-   inflate call, but the end of the deflate stream has not been reached yet. 
-   It is also called to create a window for dictionary data when a dictionary 
-   is loaded. 
- 
-   Providing output buffers larger than 32K to inflate() should provide a speed 
-   advantage, since only the last 32K of output is copied to the sliding window 
-   upon return from inflate(), and since all distances after the first 32K of 
-   output will fall in the output data, making match copies simpler and faster. 
-   The advantage may be dependent on the size of the processor's data caches. 
- */ 
-local int updatewindow(strm, end, copy) 
-z_streamp strm; 
-const Bytef *end; 
-unsigned copy; 
-{ 
-    struct inflate_state FAR *state; 
-    unsigned dist; 
- 
-    state = (struct inflate_state FAR *)strm->state; 
- 
-    /* if it hasn't been done already, allocate space for the window */ 
-    if (state->window == Z_NULL) { 
-        state->window = (unsigned char FAR *) 
-                        ZALLOC(strm, 1U << state->wbits, 
-                               sizeof(unsigned char)); 
-        if (state->window == Z_NULL) return 1; 
-    } 
- 
-    /* if window not in use yet, initialize */ 
-    if (state->wsize == 0) { 
-        state->wsize = 1U << state->wbits; 
-        state->wnext = 0; 
-        state->whave = 0; 
-    } 
- 
-    /* copy state->wsize or less output bytes into the circular window */ 
-    if (copy >= state->wsize) { 
-        zmemcpy(state->window, end - state->wsize, state->wsize); 
-        state->wnext = 0; 
-        state->whave = state->wsize; 
-    } 
-    else { 
-        dist = state->wsize - state->wnext; 
-        if (dist > copy) dist = copy; 
-        zmemcpy(state->window + state->wnext, end - copy, dist); 
-        copy -= dist; 
-        if (copy) { 
-            zmemcpy(state->window, end - copy, copy); 
-            state->wnext = copy; 
-            state->whave = state->wsize; 
-        } 
-        else { 
-            state->wnext += dist; 
-            if (state->wnext == state->wsize) state->wnext = 0; 
-            if (state->whave < state->wsize) state->whave += dist; 
-        } 
-    } 
-    return 0; 
-} 
- 
-/* Macros for inflate(): */ 
- 
-/* check function to use adler32() for zlib or crc32() for gzip */ 
-#ifdef GUNZIP 
-#  define UPDATE(check, buf, len) \ 
-    (state->flags ? crc32(check, buf, len) : adler32(check, buf, len)) 
-#else 
-#  define UPDATE(check, buf, len) adler32(check, buf, len) 
-#endif 
- 
-/* check macros for header crc */ 
-#ifdef GUNZIP 
-#  define CRC2(check, word) \ 
-    do { \ 
-        hbuf[0] = (unsigned char)(word); \ 
-        hbuf[1] = (unsigned char)((word) >> 8); \ 
-        check = crc32(check, hbuf, 2); \ 
-    } while (0) 
- 
-#  define CRC4(check, word) \ 
-    do { \ 
-        hbuf[0] = (unsigned char)(word); \ 
-        hbuf[1] = (unsigned char)((word) >> 8); \ 
-        hbuf[2] = (unsigned char)((word) >> 16); \ 
-        hbuf[3] = (unsigned char)((word) >> 24); \ 
-        check = crc32(check, hbuf, 4); \ 
-    } while (0) 
-#endif 
- 
-/* Load registers with state in inflate() for speed */ 
-#define LOAD() \ 
-    do { \ 
-        put = strm->next_out; \ 
-        left = strm->avail_out; \ 
-        next = strm->next_in; \ 
-        have = strm->avail_in; \ 
-        hold = state->hold; \ 
-        bits = state->bits; \ 
-    } while (0) 
- 
-/* Restore state from registers in inflate() */ 
-#define RESTORE() \ 
-    do { \ 
-        strm->next_out = put; \ 
-        strm->avail_out = left; \ 
-        strm->next_in = next; \ 
-        strm->avail_in = have; \ 
-        state->hold = hold; \ 
-        state->bits = bits; \ 
-    } while (0) 
- 
-/* Clear the input bit accumulator */ 
-#define INITBITS() \ 
-    do { \ 
-        hold = 0; \ 
-        bits = 0; \ 
-    } while (0) 
- 
-/* Get a byte of input into the bit accumulator, or return from inflate() 
-   if there is no input available. */ 
-#define PULLBYTE() \ 
-    do { \ 
-        if (have == 0) goto inf_leave; \ 
-        have--; \ 
-        hold += (unsigned long)(*next++) << bits; \ 
-        bits += 8; \ 
-    } while (0) 
- 
-/* Assure that there are at least n bits in the bit accumulator.  If there is 
-   not enough available input to do that, then return from inflate(). */ 
-#define NEEDBITS(n) \ 
-    do { \ 
-        while (bits < (unsigned)(n)) \ 
-            PULLBYTE(); \ 
-    } while (0) 
- 
-/* Return the low n bits of the bit accumulator (n < 16) */ 
-#define BITS(n) \ 
-    ((unsigned)hold & ((1U << (n)) - 1)) 
- 
-/* Remove n bits from the bit accumulator */ 
-#define DROPBITS(n) \ 
-    do { \ 
-        hold >>= (n); \ 
-        bits -= (unsigned)(n); \ 
-    } while (0) 
- 
-/* Remove zero to seven bits as needed to go to a byte boundary */ 
-#define BYTEBITS() \ 
-    do { \ 
-        hold >>= bits & 7; \ 
-        bits -= bits & 7; \ 
-    } while (0) 
- 
-/* 
-   inflate() uses a state machine to process as much input data and generate as 
-   much output data as possible before returning.  The state machine is 
-   structured roughly as follows: 
- 
-    for (;;) switch (state) { 
-    ... 
-    case STATEn: 
-        if (not enough input data or output space to make progress) 
-            return; 
-        ... make progress ... 
-        state = STATEm; 
-        break; 
-    ... 
-    } 
- 
-   so when inflate() is called again, the same case is attempted again, and 
-   if the appropriate resources are provided, the machine proceeds to the 
-   next state.  The NEEDBITS() macro is usually the way the state evaluates 
-   whether it can proceed or should return.  NEEDBITS() does the return if 
-   the requested bits are not available.  The typical use of the BITS macros 
-   is: 
- 
-        NEEDBITS(n); 
-        ... do something with BITS(n) ... 
-        DROPBITS(n); 
- 
-   where NEEDBITS(n) either returns from inflate() if there isn't enough 
-   input left to load n bits into the accumulator, or it continues.  BITS(n) 
-   gives the low n bits in the accumulator.  When done, DROPBITS(n) drops 
-   the low n bits off the accumulator.  INITBITS() clears the accumulator 
-   and sets the number of available bits to zero.  BYTEBITS() discards just 
-   enough bits to put the accumulator on a byte boundary.  After BYTEBITS() 
-   and a NEEDBITS(8), then BITS(8) would return the next byte in the stream. 
- 
-   NEEDBITS(n) uses PULLBYTE() to get an available byte of input, or to return 
-   if there is no input available.  The decoding of variable length codes uses 
-   PULLBYTE() directly in order to pull just enough bytes to decode the next 
-   code, and no more. 
- 
-   Some states loop until they get enough input, making sure that enough 
-   state information is maintained to continue the loop where it left off 
-   if NEEDBITS() returns in the loop.  For example, want, need, and keep 
-   would all have to actually be part of the saved state in case NEEDBITS() 
-   returns: 
- 
-    case STATEw: 
-        while (want < need) { 
-            NEEDBITS(n); 
-            keep[want++] = BITS(n); 
-            DROPBITS(n); 
-        } 
-        state = STATEx; 
-    case STATEx: 
- 
-   As shown above, if the next state is also the next case, then the break 
-   is omitted. 
- 
-   A state may also return if there is not enough output space available to 
-   complete that state.  Those states are copying stored data, writing a 
-   literal byte, and copying a matching string. 
- 
-   When returning, a "goto inf_leave" is used to update the total counters, 
-   update the check value, and determine whether any progress has been made 
-   during that inflate() call in order to return the proper return code. 
-   Progress is defined as a change in either strm->avail_in or strm->avail_out. 
-   When there is a window, goto inf_leave will update the window with the last 
-   output written.  If a goto inf_leave occurs in the middle of decompression 
-   and there is no window currently, goto inf_leave will create one and copy 
-   output to the window for the next call of inflate(). 
- 
-   In this implementation, the flush parameter of inflate() only affects the 
-   return code (per zlib.h).  inflate() always writes as much as possible to 
-   strm->next_out, given the space available and the provided input--the effect 
-   documented in zlib.h of Z_SYNC_FLUSH.  Furthermore, inflate() always defers 
-   the allocation of and copying into a sliding window until necessary, which 
-   provides the effect documented in zlib.h for Z_FINISH when the entire input 
-   stream available.  So the only thing the flush parameter actually does is: 
-   when flush is set to Z_FINISH, inflate() cannot return Z_OK.  Instead it 
-   will return Z_BUF_ERROR if it has not reached the end of the stream. 
- */ 
- 
-int ZEXPORT inflate(strm, flush) 
-z_streamp strm; 
-int flush; 
-{ 
-    struct inflate_state FAR *state; 
-    z_const unsigned char FAR *next;    /* next input */ 
-    unsigned char FAR *put;     /* next output */ 
-    unsigned have, left;        /* available input and output */ 
-    unsigned long hold;         /* bit buffer */ 
-    unsigned bits;              /* bits in bit buffer */ 
-    unsigned in, out;           /* save starting available input and output */ 
-    unsigned copy;              /* number of stored or match bytes to copy */ 
-    unsigned char FAR *from;    /* where to copy match bytes from */ 
-    code here;                  /* current decoding table entry */ 
-    code last;                  /* parent table entry */ 
-    unsigned len;               /* length to copy for repeats, bits to drop */ 
-    int ret;                    /* return code */ 
-#ifdef GUNZIP 
-    unsigned char hbuf[4];      /* buffer for gzip header crc calculation */ 
-#endif 
-    static const unsigned short order[19] = /* permutation of code lengths */ 
-        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; 
- 
+    return Z_OK;
+}
+
+/*
+   Return state with length and distance decoding tables and index sizes set to
+   fixed code decoding.  Normally this returns fixed tables from inffixed.h.
+   If BUILDFIXED is defined, then instead this routine builds the tables the
+   first time it's called, and returns those tables the first time and
+   thereafter.  This reduces the size of the code by about 2K bytes, in
+   exchange for a little execution time.  However, BUILDFIXED should not be
+   used for threaded applications, since the rewriting of the tables and virgin
+   may not be thread-safe.
+ */
+local void fixedtables(state)
+struct inflate_state FAR *state;
+{
+#ifdef BUILDFIXED
+    static int virgin = 1;
+    static code *lenfix, *distfix;
+    static code fixed[544];
+
+    /* build fixed huffman tables if first call (may not be thread safe) */
+    if (virgin) {
+        unsigned sym, bits;
+        static code *next;
+
+        /* literal/length table */
+        sym = 0;
+        while (sym < 144) state->lens[sym++] = 8;
+        while (sym < 256) state->lens[sym++] = 9;
+        while (sym < 280) state->lens[sym++] = 7;
+        while (sym < 288) state->lens[sym++] = 8;
+        next = fixed;
+        lenfix = next;
+        bits = 9;
+        inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work);
+
+        /* distance table */
+        sym = 0;
+        while (sym < 32) state->lens[sym++] = 5;
+        distfix = next;
+        bits = 5;
+        inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work);
+
+        /* do this just once */
+        virgin = 0;
+    }
+#else /* !BUILDFIXED */
+#   include "inffixed.h"
+#endif /* BUILDFIXED */
+    state->lencode = lenfix;
+    state->lenbits = 9;
+    state->distcode = distfix;
+    state->distbits = 5;
+}
+
+#ifdef MAKEFIXED
+#include <stdio.h>
+
+/*
+   Write out the inffixed.h that is #include'd above.  Defining MAKEFIXED also
+   defines BUILDFIXED, so the tables are built on the fly.  makefixed() writes
+   those tables to stdout, which would be piped to inffixed.h.  A small program
+   can simply call makefixed to do this:
+
+    void makefixed(void);
+
+    int main(void)
+    {
+        makefixed();
+        return 0;
+    }
+
+   Then that can be linked with zlib built with MAKEFIXED defined and run:
+
+    a.out > inffixed.h
+ */
+void makefixed()
+{
+    unsigned low, size;
+    struct inflate_state state;
+
+    fixedtables(&state);
+    puts("    /* inffixed.h -- table for decoding fixed codes");
+    puts("     * Generated automatically by makefixed().");
+    puts("     */");
+    puts("");
+    puts("    /* WARNING: this file should *not* be used by applications.");
+    puts("       It is part of the implementation of this library and is");
+    puts("       subject to change. Applications should only use zlib.h.");
+    puts("     */");
+    puts("");
+    size = 1U << 9;
+    printf("    static const code lenfix[%u] = {", size);
+    low = 0;
+    for (;;) {
+        if ((low % 7) == 0) printf("\n        ");
+        printf("{%u,%u,%d}", (low & 127) == 99 ? 64 : state.lencode[low].op,
+               state.lencode[low].bits, state.lencode[low].val);
+        if (++low == size) break;
+        putchar(',');
+    }
+    puts("\n    };");
+    size = 1U << 5;
+    printf("\n    static const code distfix[%u] = {", size);
+    low = 0;
+    for (;;) {
+        if ((low % 6) == 0) printf("\n        ");
+        printf("{%u,%u,%d}", state.distcode[low].op, state.distcode[low].bits,
+               state.distcode[low].val);
+        if (++low == size) break;
+        putchar(',');
+    }
+    puts("\n    };");
+}
+#endif /* MAKEFIXED */
+
+/*
+   Update the window with the last wsize (normally 32K) bytes written before
+   returning.  If window does not exist yet, create it.  This is only called
+   when a window is already in use, or when output has been written during this
+   inflate call, but the end of the deflate stream has not been reached yet.
+   It is also called to create a window for dictionary data when a dictionary
+   is loaded.
+
+   Providing output buffers larger than 32K to inflate() should provide a speed
+   advantage, since only the last 32K of output is copied to the sliding window
+   upon return from inflate(), and since all distances after the first 32K of
+   output will fall in the output data, making match copies simpler and faster.
+   The advantage may be dependent on the size of the processor's data caches.
+ */
+local int updatewindow(strm, end, copy)
+z_streamp strm;
+const Bytef *end;
+unsigned copy;
+{
+    struct inflate_state FAR *state;
+    unsigned dist;
+
+    state = (struct inflate_state FAR *)strm->state;
+
+    /* if it hasn't been done already, allocate space for the window */
+    if (state->window == Z_NULL) {
+        state->window = (unsigned char FAR *)
+                        ZALLOC(strm, 1U << state->wbits,
+                               sizeof(unsigned char));
+        if (state->window == Z_NULL) return 1;
+    }
+
+    /* if window not in use yet, initialize */
+    if (state->wsize == 0) {
+        state->wsize = 1U << state->wbits;
+        state->wnext = 0;
+        state->whave = 0;
+    }
+
+    /* copy state->wsize or less output bytes into the circular window */
+    if (copy >= state->wsize) {
+        zmemcpy(state->window, end - state->wsize, state->wsize);
+        state->wnext = 0;
+        state->whave = state->wsize;
+    }
+    else {
+        dist = state->wsize - state->wnext;
+        if (dist > copy) dist = copy;
+        zmemcpy(state->window + state->wnext, end - copy, dist);
+        copy -= dist;
+        if (copy) {
+            zmemcpy(state->window, end - copy, copy);
+            state->wnext = copy;
+            state->whave = state->wsize;
+        }
+        else {
+            state->wnext += dist;
+            if (state->wnext == state->wsize) state->wnext = 0;
+            if (state->whave < state->wsize) state->whave += dist;
+        }
+    }
+    return 0;
+}
+
+/* Macros for inflate(): */
+
+/* check function to use adler32() for zlib or crc32() for gzip */
+#ifdef GUNZIP
+#  define UPDATE(check, buf, len) \
+    (state->flags ? crc32(check, buf, len) : adler32(check, buf, len))
+#else
+#  define UPDATE(check, buf, len) adler32(check, buf, len)
+#endif
+
+/* check macros for header crc */
+#ifdef GUNZIP
+#  define CRC2(check, word) \
+    do { \
+        hbuf[0] = (unsigned char)(word); \
+        hbuf[1] = (unsigned char)((word) >> 8); \
+        check = crc32(check, hbuf, 2); \
+    } while (0)
+
+#  define CRC4(check, word) \
+    do { \
+        hbuf[0] = (unsigned char)(word); \
+        hbuf[1] = (unsigned char)((word) >> 8); \
+        hbuf[2] = (unsigned char)((word) >> 16); \
+        hbuf[3] = (unsigned char)((word) >> 24); \
+        check = crc32(check, hbuf, 4); \
+    } while (0)
+#endif
+
+/* Load registers with state in inflate() for speed */
+#define LOAD() \
+    do { \
+        put = strm->next_out; \
+        left = strm->avail_out; \
+        next = strm->next_in; \
+        have = strm->avail_in; \
+        hold = state->hold; \
+        bits = state->bits; \
+    } while (0)
+
+/* Restore state from registers in inflate() */
+#define RESTORE() \
+    do { \
+        strm->next_out = put; \
+        strm->avail_out = left; \
+        strm->next_in = next; \
+        strm->avail_in = have; \
+        state->hold = hold; \
+        state->bits = bits; \
+    } while (0)
+
+/* Clear the input bit accumulator */
+#define INITBITS() \
+    do { \
+        hold = 0; \
+        bits = 0; \
+    } while (0)
+
+/* Get a byte of input into the bit accumulator, or return from inflate()
+   if there is no input available. */
+#define PULLBYTE() \
+    do { \
+        if (have == 0) goto inf_leave; \
+        have--; \
+        hold += (unsigned long)(*next++) << bits; \
+        bits += 8; \
+    } while (0)
+
+/* Assure that there are at least n bits in the bit accumulator.  If there is
+   not enough available input to do that, then return from inflate(). */
+#define NEEDBITS(n) \
+    do { \
+        while (bits < (unsigned)(n)) \
+            PULLBYTE(); \
+    } while (0)
+
+/* Return the low n bits of the bit accumulator (n < 16) */
+#define BITS(n) \
+    ((unsigned)hold & ((1U << (n)) - 1))
+
+/* Remove n bits from the bit accumulator */
+#define DROPBITS(n) \
+    do { \
+        hold >>= (n); \
+        bits -= (unsigned)(n); \
+    } while (0)
+
+/* Remove zero to seven bits as needed to go to a byte boundary */
+#define BYTEBITS() \
+    do { \
+        hold >>= bits & 7; \
+        bits -= bits & 7; \
+    } while (0)
+
+/*
+   inflate() uses a state machine to process as much input data and generate as
+   much output data as possible before returning.  The state machine is
+   structured roughly as follows:
+
+    for (;;) switch (state) {
+    ...
+    case STATEn:
+        if (not enough input data or output space to make progress)
+            return;
+        ... make progress ...
+        state = STATEm;
+        break;
+    ...
+    }
+
+   so when inflate() is called again, the same case is attempted again, and
+   if the appropriate resources are provided, the machine proceeds to the
+   next state.  The NEEDBITS() macro is usually the way the state evaluates
+   whether it can proceed or should return.  NEEDBITS() does the return if
+   the requested bits are not available.  The typical use of the BITS macros
+   is:
+
+        NEEDBITS(n);
+        ... do something with BITS(n) ...
+        DROPBITS(n);
+
+   where NEEDBITS(n) either returns from inflate() if there isn't enough
+   input left to load n bits into the accumulator, or it continues.  BITS(n)
+   gives the low n bits in the accumulator.  When done, DROPBITS(n) drops
+   the low n bits off the accumulator.  INITBITS() clears the accumulator
+   and sets the number of available bits to zero.  BYTEBITS() discards just
+   enough bits to put the accumulator on a byte boundary.  After BYTEBITS()
+   and a NEEDBITS(8), then BITS(8) would return the next byte in the stream.
+
+   NEEDBITS(n) uses PULLBYTE() to get an available byte of input, or to return
+   if there is no input available.  The decoding of variable length codes uses
+   PULLBYTE() directly in order to pull just enough bytes to decode the next
+   code, and no more.
+
+   Some states loop until they get enough input, making sure that enough
+   state information is maintained to continue the loop where it left off
+   if NEEDBITS() returns in the loop.  For example, want, need, and keep
+   would all have to actually be part of the saved state in case NEEDBITS()
+   returns:
+
+    case STATEw:
+        while (want < need) {
+            NEEDBITS(n);
+            keep[want++] = BITS(n);
+            DROPBITS(n);
+        }
+        state = STATEx;
+    case STATEx:
+
+   As shown above, if the next state is also the next case, then the break
+   is omitted.
+
+   A state may also return if there is not enough output space available to
+   complete that state.  Those states are copying stored data, writing a
+   literal byte, and copying a matching string.
+
+   When returning, a "goto inf_leave" is used to update the total counters,
+   update the check value, and determine whether any progress has been made
+   during that inflate() call in order to return the proper return code.
+   Progress is defined as a change in either strm->avail_in or strm->avail_out.
+   When there is a window, goto inf_leave will update the window with the last
+   output written.  If a goto inf_leave occurs in the middle of decompression
+   and there is no window currently, goto inf_leave will create one and copy
+   output to the window for the next call of inflate().
+
+   In this implementation, the flush parameter of inflate() only affects the
+   return code (per zlib.h).  inflate() always writes as much as possible to
+   strm->next_out, given the space available and the provided input--the effect
+   documented in zlib.h of Z_SYNC_FLUSH.  Furthermore, inflate() always defers
+   the allocation of and copying into a sliding window until necessary, which
+   provides the effect documented in zlib.h for Z_FINISH when the entire input
+   stream available.  So the only thing the flush parameter actually does is:
+   when flush is set to Z_FINISH, inflate() cannot return Z_OK.  Instead it
+   will return Z_BUF_ERROR if it has not reached the end of the stream.
+ */
+
+int ZEXPORT inflate(strm, flush)
+z_streamp strm;
+int flush;
+{
+    struct inflate_state FAR *state;
+    z_const unsigned char FAR *next;    /* next input */
+    unsigned char FAR *put;     /* next output */
+    unsigned have, left;        /* available input and output */
+    unsigned long hold;         /* bit buffer */
+    unsigned bits;              /* bits in bit buffer */
+    unsigned in, out;           /* save starting available input and output */
+    unsigned copy;              /* number of stored or match bytes to copy */
+    unsigned char FAR *from;    /* where to copy match bytes from */
+    code here;                  /* current decoding table entry */
+    code last;                  /* parent table entry */
+    unsigned len;               /* length to copy for repeats, bits to drop */
+    int ret;                    /* return code */
+#ifdef GUNZIP
+    unsigned char hbuf[4];      /* buffer for gzip header crc calculation */
+#endif
+    static const unsigned short order[19] = /* permutation of code lengths */
+        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
+
     if (inflateStateCheck(strm) || strm->next_out == Z_NULL ||
-        (strm->next_in == Z_NULL && strm->avail_in != 0)) 
-        return Z_STREAM_ERROR; 
- 
-    state = (struct inflate_state FAR *)strm->state; 
-    if (state->mode == TYPE) state->mode = TYPEDO;      /* skip check */ 
-    LOAD(); 
-    in = have; 
-    out = left; 
-    ret = Z_OK; 
-    for (;;) 
-        switch (state->mode) { 
-        case HEAD: 
-            if (state->wrap == 0) { 
-                state->mode = TYPEDO; 
-                break; 
-            } 
-            NEEDBITS(16); 
-#ifdef GUNZIP 
-            if ((state->wrap & 2) && hold == 0x8b1f) {  /* gzip header */ 
+        (strm->next_in == Z_NULL && strm->avail_in != 0))
+        return Z_STREAM_ERROR;
+
+    state = (struct inflate_state FAR *)strm->state;
+    if (state->mode == TYPE) state->mode = TYPEDO;      /* skip check */
+    LOAD();
+    in = have;
+    out = left;
+    ret = Z_OK;
+    for (;;)
+        switch (state->mode) {
+        case HEAD:
+            if (state->wrap == 0) {
+                state->mode = TYPEDO;
+                break;
+            }
+            NEEDBITS(16);
+#ifdef GUNZIP
+            if ((state->wrap & 2) && hold == 0x8b1f) {  /* gzip header */
                 if (state->wbits == 0)
                     state->wbits = 15;
-                state->check = crc32(0L, Z_NULL, 0); 
-                CRC2(state->check, hold); 
-                INITBITS(); 
-                state->mode = FLAGS; 
-                break; 
-            } 
-            state->flags = 0;           /* expect zlib header */ 
-            if (state->head != Z_NULL) 
-                state->head->done = -1; 
-            if (!(state->wrap & 1) ||   /* check if zlib header allowed */ 
-#else 
-            if ( 
-#endif 
-                ((BITS(8) << 8) + (hold >> 8)) % 31) { 
-                strm->msg = (char *)"incorrect header check"; 
-                state->mode = BAD; 
-                break; 
-            } 
-            if (BITS(4) != Z_DEFLATED) { 
-                strm->msg = (char *)"unknown compression method"; 
-                state->mode = BAD; 
-                break; 
-            } 
-            DROPBITS(4); 
-            len = BITS(4) + 8; 
-            if (state->wbits == 0) 
-                state->wbits = len; 
+                state->check = crc32(0L, Z_NULL, 0);
+                CRC2(state->check, hold);
+                INITBITS();
+                state->mode = FLAGS;
+                break;
+            }
+            state->flags = 0;           /* expect zlib header */
+            if (state->head != Z_NULL)
+                state->head->done = -1;
+            if (!(state->wrap & 1) ||   /* check if zlib header allowed */
+#else
+            if (
+#endif
+                ((BITS(8) << 8) + (hold >> 8)) % 31) {
+                strm->msg = (char *)"incorrect header check";
+                state->mode = BAD;
+                break;
+            }
+            if (BITS(4) != Z_DEFLATED) {
+                strm->msg = (char *)"unknown compression method";
+                state->mode = BAD;
+                break;
+            }
+            DROPBITS(4);
+            len = BITS(4) + 8;
+            if (state->wbits == 0)
+                state->wbits = len;
             if (len > 15 || len > state->wbits) {
-                strm->msg = (char *)"invalid window size"; 
-                state->mode = BAD; 
-                break; 
-            } 
-            state->dmax = 1U << len; 
-            Tracev((stderr, "inflate:   zlib header ok\n")); 
-            strm->adler = state->check = adler32(0L, Z_NULL, 0); 
-            state->mode = hold & 0x200 ? DICTID : TYPE; 
-            INITBITS(); 
-            break; 
-#ifdef GUNZIP 
-        case FLAGS: 
-            NEEDBITS(16); 
-            state->flags = (int)(hold); 
-            if ((state->flags & 0xff) != Z_DEFLATED) { 
-                strm->msg = (char *)"unknown compression method"; 
-                state->mode = BAD; 
-                break; 
-            } 
-            if (state->flags & 0xe000) { 
-                strm->msg = (char *)"unknown header flags set"; 
-                state->mode = BAD; 
-                break; 
-            } 
-            if (state->head != Z_NULL) 
-                state->head->text = (int)((hold >> 8) & 1); 
+                strm->msg = (char *)"invalid window size";
+                state->mode = BAD;
+                break;
+            }
+            state->dmax = 1U << len;
+            Tracev((stderr, "inflate:   zlib header ok\n"));
+            strm->adler = state->check = adler32(0L, Z_NULL, 0);
+            state->mode = hold & 0x200 ? DICTID : TYPE;
+            INITBITS();
+            break;
+#ifdef GUNZIP
+        case FLAGS:
+            NEEDBITS(16);
+            state->flags = (int)(hold);
+            if ((state->flags & 0xff) != Z_DEFLATED) {
+                strm->msg = (char *)"unknown compression method";
+                state->mode = BAD;
+                break;
+            }
+            if (state->flags & 0xe000) {
+                strm->msg = (char *)"unknown header flags set";
+                state->mode = BAD;
+                break;
+            }
+            if (state->head != Z_NULL)
+                state->head->text = (int)((hold >> 8) & 1);
             if ((state->flags & 0x0200) && (state->wrap & 4))
                 CRC2(state->check, hold);
-            INITBITS(); 
-            state->mode = TIME; 
-        case TIME: 
-            NEEDBITS(32); 
-            if (state->head != Z_NULL) 
-                state->head->time = hold; 
+            INITBITS();
+            state->mode = TIME;
+        case TIME:
+            NEEDBITS(32);
+            if (state->head != Z_NULL)
+                state->head->time = hold;
             if ((state->flags & 0x0200) && (state->wrap & 4))
                 CRC4(state->check, hold);
-            INITBITS(); 
-            state->mode = OS; 
-        case OS: 
-            NEEDBITS(16); 
-            if (state->head != Z_NULL) { 
-                state->head->xflags = (int)(hold & 0xff); 
-                state->head->os = (int)(hold >> 8); 
-            } 
+            INITBITS();
+            state->mode = OS;
+        case OS:
+            NEEDBITS(16);
+            if (state->head != Z_NULL) {
+                state->head->xflags = (int)(hold & 0xff);
+                state->head->os = (int)(hold >> 8);
+            }
             if ((state->flags & 0x0200) && (state->wrap & 4))
                 CRC2(state->check, hold);
-            INITBITS(); 
-            state->mode = EXLEN; 
-        case EXLEN: 
-            if (state->flags & 0x0400) { 
-                NEEDBITS(16); 
-                state->length = (unsigned)(hold); 
-                if (state->head != Z_NULL) 
-                    state->head->extra_len = (unsigned)hold; 
+            INITBITS();
+            state->mode = EXLEN;
+        case EXLEN:
+            if (state->flags & 0x0400) {
+                NEEDBITS(16);
+                state->length = (unsigned)(hold);
+                if (state->head != Z_NULL)
+                    state->head->extra_len = (unsigned)hold;
                 if ((state->flags & 0x0200) && (state->wrap & 4))
                     CRC2(state->check, hold);
-                INITBITS(); 
-            } 
-            else if (state->head != Z_NULL) 
-                state->head->extra = Z_NULL; 
-            state->mode = EXTRA; 
-        case EXTRA: 
-            if (state->flags & 0x0400) { 
-                copy = state->length; 
-                if (copy > have) copy = have; 
-                if (copy) { 
-                    if (state->head != Z_NULL && 
-                        state->head->extra != Z_NULL) { 
-                        len = state->head->extra_len - state->length; 
-                        zmemcpy(state->head->extra + len, next, 
-                                len + copy > state->head->extra_max ? 
-                                state->head->extra_max - len : copy); 
-                    } 
+                INITBITS();
+            }
+            else if (state->head != Z_NULL)
+                state->head->extra = Z_NULL;
+            state->mode = EXTRA;
+        case EXTRA:
+            if (state->flags & 0x0400) {
+                copy = state->length;
+                if (copy > have) copy = have;
+                if (copy) {
+                    if (state->head != Z_NULL &&
+                        state->head->extra != Z_NULL) {
+                        len = state->head->extra_len - state->length;
+                        zmemcpy(state->head->extra + len, next,
+                                len + copy > state->head->extra_max ?
+                                state->head->extra_max - len : copy);
+                    }
                     if ((state->flags & 0x0200) && (state->wrap & 4))
-                        state->check = crc32(state->check, next, copy); 
-                    have -= copy; 
-                    next += copy; 
-                    state->length -= copy; 
-                } 
-                if (state->length) goto inf_leave; 
-            } 
-            state->length = 0; 
-            state->mode = NAME; 
-        case NAME: 
-            if (state->flags & 0x0800) { 
-                if (have == 0) goto inf_leave; 
-                copy = 0; 
-                do { 
-                    len = (unsigned)(next[copy++]); 
-                    if (state->head != Z_NULL && 
-                            state->head->name != Z_NULL && 
-                            state->length < state->head->name_max) 
+                        state->check = crc32(state->check, next, copy);
+                    have -= copy;
+                    next += copy;
+                    state->length -= copy;
+                }
+                if (state->length) goto inf_leave;
+            }
+            state->length = 0;
+            state->mode = NAME;
+        case NAME:
+            if (state->flags & 0x0800) {
+                if (have == 0) goto inf_leave;
+                copy = 0;
+                do {
+                    len = (unsigned)(next[copy++]);
+                    if (state->head != Z_NULL &&
+                            state->head->name != Z_NULL &&
+                            state->length < state->head->name_max)
                         state->head->name[state->length++] = (Bytef)len;
-                } while (len && copy < have); 
+                } while (len && copy < have);
                 if ((state->flags & 0x0200) && (state->wrap & 4))
-                    state->check = crc32(state->check, next, copy); 
-                have -= copy; 
-                next += copy; 
-                if (len) goto inf_leave; 
-            } 
-            else if (state->head != Z_NULL) 
-                state->head->name = Z_NULL; 
-            state->length = 0; 
-            state->mode = COMMENT; 
-        case COMMENT: 
-            if (state->flags & 0x1000) { 
-                if (have == 0) goto inf_leave; 
-                copy = 0; 
-                do { 
-                    len = (unsigned)(next[copy++]); 
-                    if (state->head != Z_NULL && 
-                            state->head->comment != Z_NULL && 
-                            state->length < state->head->comm_max) 
+                    state->check = crc32(state->check, next, copy);
+                have -= copy;
+                next += copy;
+                if (len) goto inf_leave;
+            }
+            else if (state->head != Z_NULL)
+                state->head->name = Z_NULL;
+            state->length = 0;
+            state->mode = COMMENT;
+        case COMMENT:
+            if (state->flags & 0x1000) {
+                if (have == 0) goto inf_leave;
+                copy = 0;
+                do {
+                    len = (unsigned)(next[copy++]);
+                    if (state->head != Z_NULL &&
+                            state->head->comment != Z_NULL &&
+                            state->length < state->head->comm_max)
                         state->head->comment[state->length++] = (Bytef)len;
-                } while (len && copy < have); 
+                } while (len && copy < have);
                 if ((state->flags & 0x0200) && (state->wrap & 4))
-                    state->check = crc32(state->check, next, copy); 
-                have -= copy; 
-                next += copy; 
-                if (len) goto inf_leave; 
-            } 
-            else if (state->head != Z_NULL) 
-                state->head->comment = Z_NULL; 
-            state->mode = HCRC; 
-        case HCRC: 
-            if (state->flags & 0x0200) { 
-                NEEDBITS(16); 
+                    state->check = crc32(state->check, next, copy);
+                have -= copy;
+                next += copy;
+                if (len) goto inf_leave;
+            }
+            else if (state->head != Z_NULL)
+                state->head->comment = Z_NULL;
+            state->mode = HCRC;
+        case HCRC:
+            if (state->flags & 0x0200) {
+                NEEDBITS(16);
                 if ((state->wrap & 4) && hold != (state->check & 0xffff)) {
-                    strm->msg = (char *)"header crc mismatch"; 
-                    state->mode = BAD; 
-                    break; 
-                } 
-                INITBITS(); 
-            } 
-            if (state->head != Z_NULL) { 
-                state->head->hcrc = (int)((state->flags >> 9) & 1); 
-                state->head->done = 1; 
-            } 
-            strm->adler = state->check = crc32(0L, Z_NULL, 0); 
-            state->mode = TYPE; 
-            break; 
-#endif 
-        case DICTID: 
-            NEEDBITS(32); 
-            strm->adler = state->check = ZSWAP32(hold); 
-            INITBITS(); 
-            state->mode = DICT; 
-        case DICT: 
-            if (state->havedict == 0) { 
-                RESTORE(); 
-                return Z_NEED_DICT; 
-            } 
-            strm->adler = state->check = adler32(0L, Z_NULL, 0); 
-            state->mode = TYPE; 
-        case TYPE: 
-            if (flush == Z_BLOCK || flush == Z_TREES) goto inf_leave; 
-        case TYPEDO: 
-            if (state->last) { 
-                BYTEBITS(); 
-                state->mode = CHECK; 
-                break; 
-            } 
-            NEEDBITS(3); 
-            state->last = BITS(1); 
-            DROPBITS(1); 
-            switch (BITS(2)) { 
-            case 0:                             /* stored block */ 
-                Tracev((stderr, "inflate:     stored block%s\n", 
-                        state->last ? " (last)" : "")); 
-                state->mode = STORED; 
-                break; 
-            case 1:                             /* fixed block */ 
-                fixedtables(state); 
-                Tracev((stderr, "inflate:     fixed codes block%s\n", 
-                        state->last ? " (last)" : "")); 
-                state->mode = LEN_;             /* decode codes */ 
-                if (flush == Z_TREES) { 
-                    DROPBITS(2); 
-                    goto inf_leave; 
-                } 
-                break; 
-            case 2:                             /* dynamic block */ 
-                Tracev((stderr, "inflate:     dynamic codes block%s\n", 
-                        state->last ? " (last)" : "")); 
-                state->mode = TABLE; 
-                break; 
-            case 3: 
-                strm->msg = (char *)"invalid block type"; 
-                state->mode = BAD; 
-            } 
-            DROPBITS(2); 
-            break; 
-        case STORED: 
-            BYTEBITS();                         /* go to byte boundary */ 
-            NEEDBITS(32); 
-            if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) { 
-                strm->msg = (char *)"invalid stored block lengths"; 
-                state->mode = BAD; 
-                break; 
-            } 
-            state->length = (unsigned)hold & 0xffff; 
-            Tracev((stderr, "inflate:       stored length %u\n", 
-                    state->length)); 
-            INITBITS(); 
-            state->mode = COPY_; 
-            if (flush == Z_TREES) goto inf_leave; 
-        case COPY_: 
-            state->mode = COPY; 
-        case COPY: 
-            copy = state->length; 
-            if (copy) { 
-                if (copy > have) copy = have; 
-                if (copy > left) copy = left; 
-                if (copy == 0) goto inf_leave; 
-                zmemcpy(put, next, copy); 
-                have -= copy; 
-                next += copy; 
-                left -= copy; 
-                put += copy; 
-                state->length -= copy; 
-                break; 
-            } 
-            Tracev((stderr, "inflate:       stored end\n")); 
-            state->mode = TYPE; 
-            break; 
-        case TABLE: 
-            NEEDBITS(14); 
-            state->nlen = BITS(5) + 257; 
-            DROPBITS(5); 
-            state->ndist = BITS(5) + 1; 
-            DROPBITS(5); 
-            state->ncode = BITS(4) + 4; 
-            DROPBITS(4); 
-#ifndef PKZIP_BUG_WORKAROUND 
-            if (state->nlen > 286 || state->ndist > 30) { 
-                strm->msg = (char *)"too many length or distance symbols"; 
-                state->mode = BAD; 
-                break; 
-            } 
-#endif 
-            Tracev((stderr, "inflate:       table sizes ok\n")); 
-            state->have = 0; 
-            state->mode = LENLENS; 
-        case LENLENS: 
-            while (state->have < state->ncode) { 
-                NEEDBITS(3); 
-                state->lens[order[state->have++]] = (unsigned short)BITS(3); 
-                DROPBITS(3); 
-            } 
-            while (state->have < 19) 
-                state->lens[order[state->have++]] = 0; 
-            state->next = state->codes; 
-            state->lencode = (const code FAR *)(state->next); 
-            state->lenbits = 7; 
-            ret = inflate_table(CODES, state->lens, 19, &(state->next), 
-                                &(state->lenbits), state->work); 
-            if (ret) { 
-                strm->msg = (char *)"invalid code lengths set"; 
-                state->mode = BAD; 
-                break; 
-            } 
-            Tracev((stderr, "inflate:       code lengths ok\n")); 
-            state->have = 0; 
-            state->mode = CODELENS; 
-        case CODELENS: 
-            while (state->have < state->nlen + state->ndist) { 
-                for (;;) { 
-                    here = state->lencode[BITS(state->lenbits)]; 
-                    if ((unsigned)(here.bits) <= bits) break; 
-                    PULLBYTE(); 
-                } 
-                if (here.val < 16) { 
-                    DROPBITS(here.bits); 
-                    state->lens[state->have++] = here.val; 
-                } 
-                else { 
-                    if (here.val == 16) { 
-                        NEEDBITS(here.bits + 2); 
-                        DROPBITS(here.bits); 
-                        if (state->have == 0) { 
-                            strm->msg = (char *)"invalid bit length repeat"; 
-                            state->mode = BAD; 
-                            break; 
-                        } 
-                        len = state->lens[state->have - 1]; 
-                        copy = 3 + BITS(2); 
-                        DROPBITS(2); 
-                    } 
-                    else if (here.val == 17) { 
-                        NEEDBITS(here.bits + 3); 
-                        DROPBITS(here.bits); 
-                        len = 0; 
-                        copy = 3 + BITS(3); 
-                        DROPBITS(3); 
-                    } 
-                    else { 
-                        NEEDBITS(here.bits + 7); 
-                        DROPBITS(here.bits); 
-                        len = 0; 
-                        copy = 11 + BITS(7); 
-                        DROPBITS(7); 
-                    } 
-                    if (state->have + copy > state->nlen + state->ndist) { 
-                        strm->msg = (char *)"invalid bit length repeat"; 
-                        state->mode = BAD; 
-                        break; 
-                    } 
-                    while (copy--) 
-                        state->lens[state->have++] = (unsigned short)len; 
-                } 
-            } 
- 
-            /* handle error breaks in while */ 
-            if (state->mode == BAD) break; 
- 
-            /* check for end-of-block code (better have one) */ 
-            if (state->lens[256] == 0) { 
-                strm->msg = (char *)"invalid code -- missing end-of-block"; 
-                state->mode = BAD; 
-                break; 
-            } 
- 
-            /* build code tables -- note: do not change the lenbits or distbits 
-               values here (9 and 6) without reading the comments in inftrees.h 
-               concerning the ENOUGH constants, which depend on those values */ 
-            state->next = state->codes; 
-            state->lencode = (const code FAR *)(state->next); 
-            state->lenbits = 9; 
-            ret = inflate_table(LENS, state->lens, state->nlen, &(state->next), 
-                                &(state->lenbits), state->work); 
-            if (ret) { 
-                strm->msg = (char *)"invalid literal/lengths set"; 
-                state->mode = BAD; 
-                break; 
-            } 
-            state->distcode = (const code FAR *)(state->next); 
-            state->distbits = 6; 
-            ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist, 
-                            &(state->next), &(state->distbits), state->work); 
-            if (ret) { 
-                strm->msg = (char *)"invalid distances set"; 
-                state->mode = BAD; 
-                break; 
-            } 
-            Tracev((stderr, "inflate:       codes ok\n")); 
-            state->mode = LEN_; 
-            if (flush == Z_TREES) goto inf_leave; 
-        case LEN_: 
-            state->mode = LEN; 
-        case LEN: 
-            if (have >= 6 && left >= 258) { 
-                RESTORE(); 
-                inflate_fast(strm, out); 
-                LOAD(); 
-                if (state->mode == TYPE) 
-                    state->back = -1; 
-                break; 
-            } 
-            state->back = 0; 
-            for (;;) { 
-                here = state->lencode[BITS(state->lenbits)]; 
-                if ((unsigned)(here.bits) <= bits) break; 
-                PULLBYTE(); 
-            } 
-            if (here.op && (here.op & 0xf0) == 0) { 
-                last = here; 
-                for (;;) { 
-                    here = state->lencode[last.val + 
-                            (BITS(last.bits + last.op) >> last.bits)]; 
-                    if ((unsigned)(last.bits + here.bits) <= bits) break; 
-                    PULLBYTE(); 
-                } 
-                DROPBITS(last.bits); 
-                state->back += last.bits; 
-            } 
-            DROPBITS(here.bits); 
-            state->back += here.bits; 
-            state->length = (unsigned)here.val; 
-            if ((int)(here.op) == 0) { 
-                Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ? 
-                        "inflate:         literal '%c'\n" : 
-                        "inflate:         literal 0x%02x\n", here.val)); 
-                state->mode = LIT; 
-                break; 
-            } 
-            if (here.op & 32) { 
-                Tracevv((stderr, "inflate:         end of block\n")); 
-                state->back = -1; 
-                state->mode = TYPE; 
-                break; 
-            } 
-            if (here.op & 64) { 
-                strm->msg = (char *)"invalid literal/length code"; 
-                state->mode = BAD; 
-                break; 
-            } 
-            state->extra = (unsigned)(here.op) & 15; 
-            state->mode = LENEXT; 
-        case LENEXT: 
-            if (state->extra) { 
-                NEEDBITS(state->extra); 
-                state->length += BITS(state->extra); 
-                DROPBITS(state->extra); 
-                state->back += state->extra; 
-            } 
-            Tracevv((stderr, "inflate:         length %u\n", state->length)); 
-            state->was = state->length; 
-            state->mode = DIST; 
-        case DIST: 
-            for (;;) { 
-                here = state->distcode[BITS(state->distbits)]; 
-                if ((unsigned)(here.bits) <= bits) break; 
-                PULLBYTE(); 
-            } 
-            if ((here.op & 0xf0) == 0) { 
-                last = here; 
-                for (;;) { 
-                    here = state->distcode[last.val + 
-                            (BITS(last.bits + last.op) >> last.bits)]; 
-                    if ((unsigned)(last.bits + here.bits) <= bits) break; 
-                    PULLBYTE(); 
-                } 
-                DROPBITS(last.bits); 
-                state->back += last.bits; 
-            } 
-            DROPBITS(here.bits); 
-            state->back += here.bits; 
-            if (here.op & 64) { 
-                strm->msg = (char *)"invalid distance code"; 
-                state->mode = BAD; 
-                break; 
-            } 
-            state->offset = (unsigned)here.val; 
-            state->extra = (unsigned)(here.op) & 15; 
-            state->mode = DISTEXT; 
-        case DISTEXT: 
-            if (state->extra) { 
-                NEEDBITS(state->extra); 
-                state->offset += BITS(state->extra); 
-                DROPBITS(state->extra); 
-                state->back += state->extra; 
-            } 
-#ifdef INFLATE_STRICT 
-            if (state->offset > state->dmax) { 
-                strm->msg = (char *)"invalid distance too far back"; 
-                state->mode = BAD; 
-                break; 
-            } 
-#endif 
-            Tracevv((stderr, "inflate:         distance %u\n", state->offset)); 
-            state->mode = MATCH; 
-        case MATCH: 
-            if (left == 0) goto inf_leave; 
-            copy = out - left; 
-            if (state->offset > copy) {         /* copy from window */ 
-                copy = state->offset - copy; 
-                if (copy > state->whave) { 
-                    if (state->sane) { 
-                        strm->msg = (char *)"invalid distance too far back"; 
-                        state->mode = BAD; 
-                        break; 
-                    } 
-#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR 
-                    Trace((stderr, "inflate.c too far\n")); 
-                    copy -= state->whave; 
-                    if (copy > state->length) copy = state->length; 
-                    if (copy > left) copy = left; 
-                    left -= copy; 
-                    state->length -= copy; 
-                    do { 
-                        *put++ = 0; 
-                    } while (--copy); 
-                    if (state->length == 0) state->mode = LEN; 
-                    break; 
-#endif 
-                } 
-                if (copy > state->wnext) { 
-                    copy -= state->wnext; 
-                    from = state->window + (state->wsize - copy); 
-                } 
-                else 
-                    from = state->window + (state->wnext - copy); 
-                if (copy > state->length) copy = state->length; 
-            } 
-            else {                              /* copy from output */ 
-                from = put - state->offset; 
-                copy = state->length; 
-            } 
-            if (copy > left) copy = left; 
-            left -= copy; 
-            state->length -= copy; 
-            do { 
-                *put++ = *from++; 
-            } while (--copy); 
-            if (state->length == 0) state->mode = LEN; 
-            break; 
-        case LIT: 
-            if (left == 0) goto inf_leave; 
-            *put++ = (unsigned char)(state->length); 
-            left--; 
-            state->mode = LEN; 
-            break; 
-        case CHECK: 
-            if (state->wrap) { 
-                NEEDBITS(32); 
-                out -= left; 
-                strm->total_out += out; 
-                state->total += out; 
+                    strm->msg = (char *)"header crc mismatch";
+                    state->mode = BAD;
+                    break;
+                }
+                INITBITS();
+            }
+            if (state->head != Z_NULL) {
+                state->head->hcrc = (int)((state->flags >> 9) & 1);
+                state->head->done = 1;
+            }
+            strm->adler = state->check = crc32(0L, Z_NULL, 0);
+            state->mode = TYPE;
+            break;
+#endif
+        case DICTID:
+            NEEDBITS(32);
+            strm->adler = state->check = ZSWAP32(hold);
+            INITBITS();
+            state->mode = DICT;
+        case DICT:
+            if (state->havedict == 0) {
+                RESTORE();
+                return Z_NEED_DICT;
+            }
+            strm->adler = state->check = adler32(0L, Z_NULL, 0);
+            state->mode = TYPE;
+        case TYPE:
+            if (flush == Z_BLOCK || flush == Z_TREES) goto inf_leave;
+        case TYPEDO:
+            if (state->last) {
+                BYTEBITS();
+                state->mode = CHECK;
+                break;
+            }
+            NEEDBITS(3);
+            state->last = BITS(1);
+            DROPBITS(1);
+            switch (BITS(2)) {
+            case 0:                             /* stored block */
+                Tracev((stderr, "inflate:     stored block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = STORED;
+                break;
+            case 1:                             /* fixed block */
+                fixedtables(state);
+                Tracev((stderr, "inflate:     fixed codes block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = LEN_;             /* decode codes */
+                if (flush == Z_TREES) {
+                    DROPBITS(2);
+                    goto inf_leave;
+                }
+                break;
+            case 2:                             /* dynamic block */
+                Tracev((stderr, "inflate:     dynamic codes block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = TABLE;
+                break;
+            case 3:
+                strm->msg = (char *)"invalid block type";
+                state->mode = BAD;
+            }
+            DROPBITS(2);
+            break;
+        case STORED:
+            BYTEBITS();                         /* go to byte boundary */
+            NEEDBITS(32);
+            if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
+                strm->msg = (char *)"invalid stored block lengths";
+                state->mode = BAD;
+                break;
+            }
+            state->length = (unsigned)hold & 0xffff;
+            Tracev((stderr, "inflate:       stored length %u\n",
+                    state->length));
+            INITBITS();
+            state->mode = COPY_;
+            if (flush == Z_TREES) goto inf_leave;
+        case COPY_:
+            state->mode = COPY;
+        case COPY:
+            copy = state->length;
+            if (copy) {
+                if (copy > have) copy = have;
+                if (copy > left) copy = left;
+                if (copy == 0) goto inf_leave;
+                zmemcpy(put, next, copy);
+                have -= copy;
+                next += copy;
+                left -= copy;
+                put += copy;
+                state->length -= copy;
+                break;
+            }
+            Tracev((stderr, "inflate:       stored end\n"));
+            state->mode = TYPE;
+            break;
+        case TABLE:
+            NEEDBITS(14);
+            state->nlen = BITS(5) + 257;
+            DROPBITS(5);
+            state->ndist = BITS(5) + 1;
+            DROPBITS(5);
+            state->ncode = BITS(4) + 4;
+            DROPBITS(4);
+#ifndef PKZIP_BUG_WORKAROUND
+            if (state->nlen > 286 || state->ndist > 30) {
+                strm->msg = (char *)"too many length or distance symbols";
+                state->mode = BAD;
+                break;
+            }
+#endif
+            Tracev((stderr, "inflate:       table sizes ok\n"));
+            state->have = 0;
+            state->mode = LENLENS;
+        case LENLENS:
+            while (state->have < state->ncode) {
+                NEEDBITS(3);
+                state->lens[order[state->have++]] = (unsigned short)BITS(3);
+                DROPBITS(3);
+            }
+            while (state->have < 19)
+                state->lens[order[state->have++]] = 0;
+            state->next = state->codes;
+            state->lencode = (const code FAR *)(state->next);
+            state->lenbits = 7;
+            ret = inflate_table(CODES, state->lens, 19, &(state->next),
+                                &(state->lenbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid code lengths set";
+                state->mode = BAD;
+                break;
+            }
+            Tracev((stderr, "inflate:       code lengths ok\n"));
+            state->have = 0;
+            state->mode = CODELENS;
+        case CODELENS:
+            while (state->have < state->nlen + state->ndist) {
+                for (;;) {
+                    here = state->lencode[BITS(state->lenbits)];
+                    if ((unsigned)(here.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                if (here.val < 16) {
+                    DROPBITS(here.bits);
+                    state->lens[state->have++] = here.val;
+                }
+                else {
+                    if (here.val == 16) {
+                        NEEDBITS(here.bits + 2);
+                        DROPBITS(here.bits);
+                        if (state->have == 0) {
+                            strm->msg = (char *)"invalid bit length repeat";
+                            state->mode = BAD;
+                            break;
+                        }
+                        len = state->lens[state->have - 1];
+                        copy = 3 + BITS(2);
+                        DROPBITS(2);
+                    }
+                    else if (here.val == 17) {
+                        NEEDBITS(here.bits + 3);
+                        DROPBITS(here.bits);
+                        len = 0;
+                        copy = 3 + BITS(3);
+                        DROPBITS(3);
+                    }
+                    else {
+                        NEEDBITS(here.bits + 7);
+                        DROPBITS(here.bits);
+                        len = 0;
+                        copy = 11 + BITS(7);
+                        DROPBITS(7);
+                    }
+                    if (state->have + copy > state->nlen + state->ndist) {
+                        strm->msg = (char *)"invalid bit length repeat";
+                        state->mode = BAD;
+                        break;
+                    }
+                    while (copy--)
+                        state->lens[state->have++] = (unsigned short)len;
+                }
+            }
+
+            /* handle error breaks in while */
+            if (state->mode == BAD) break;
+
+            /* check for end-of-block code (better have one) */
+            if (state->lens[256] == 0) {
+                strm->msg = (char *)"invalid code -- missing end-of-block";
+                state->mode = BAD;
+                break;
+            }
+
+            /* build code tables -- note: do not change the lenbits or distbits
+               values here (9 and 6) without reading the comments in inftrees.h
+               concerning the ENOUGH constants, which depend on those values */
+            state->next = state->codes;
+            state->lencode = (const code FAR *)(state->next);
+            state->lenbits = 9;
+            ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
+                                &(state->lenbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid literal/lengths set";
+                state->mode = BAD;
+                break;
+            }
+            state->distcode = (const code FAR *)(state->next);
+            state->distbits = 6;
+            ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
+                            &(state->next), &(state->distbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid distances set";
+                state->mode = BAD;
+                break;
+            }
+            Tracev((stderr, "inflate:       codes ok\n"));
+            state->mode = LEN_;
+            if (flush == Z_TREES) goto inf_leave;
+        case LEN_:
+            state->mode = LEN;
+        case LEN:
+            if (have >= 6 && left >= 258) {
+                RESTORE();
+                inflate_fast(strm, out);
+                LOAD();
+                if (state->mode == TYPE)
+                    state->back = -1;
+                break;
+            }
+            state->back = 0;
+            for (;;) {
+                here = state->lencode[BITS(state->lenbits)];
+                if ((unsigned)(here.bits) <= bits) break;
+                PULLBYTE();
+            }
+            if (here.op && (here.op & 0xf0) == 0) {
+                last = here;
+                for (;;) {
+                    here = state->lencode[last.val +
+                            (BITS(last.bits + last.op) >> last.bits)];
+                    if ((unsigned)(last.bits + here.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                DROPBITS(last.bits);
+                state->back += last.bits;
+            }
+            DROPBITS(here.bits);
+            state->back += here.bits;
+            state->length = (unsigned)here.val;
+            if ((int)(here.op) == 0) {
+                Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
+                        "inflate:         literal '%c'\n" :
+                        "inflate:         literal 0x%02x\n", here.val));
+                state->mode = LIT;
+                break;
+            }
+            if (here.op & 32) {
+                Tracevv((stderr, "inflate:         end of block\n"));
+                state->back = -1;
+                state->mode = TYPE;
+                break;
+            }
+            if (here.op & 64) {
+                strm->msg = (char *)"invalid literal/length code";
+                state->mode = BAD;
+                break;
+            }
+            state->extra = (unsigned)(here.op) & 15;
+            state->mode = LENEXT;
+        case LENEXT:
+            if (state->extra) {
+                NEEDBITS(state->extra);
+                state->length += BITS(state->extra);
+                DROPBITS(state->extra);
+                state->back += state->extra;
+            }
+            Tracevv((stderr, "inflate:         length %u\n", state->length));
+            state->was = state->length;
+            state->mode = DIST;
+        case DIST:
+            for (;;) {
+                here = state->distcode[BITS(state->distbits)];
+                if ((unsigned)(here.bits) <= bits) break;
+                PULLBYTE();
+            }
+            if ((here.op & 0xf0) == 0) {
+                last = here;
+                for (;;) {
+                    here = state->distcode[last.val +
+                            (BITS(last.bits + last.op) >> last.bits)];
+                    if ((unsigned)(last.bits + here.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                DROPBITS(last.bits);
+                state->back += last.bits;
+            }
+            DROPBITS(here.bits);
+            state->back += here.bits;
+            if (here.op & 64) {
+                strm->msg = (char *)"invalid distance code";
+                state->mode = BAD;
+                break;
+            }
+            state->offset = (unsigned)here.val;
+            state->extra = (unsigned)(here.op) & 15;
+            state->mode = DISTEXT;
+        case DISTEXT:
+            if (state->extra) {
+                NEEDBITS(state->extra);
+                state->offset += BITS(state->extra);
+                DROPBITS(state->extra);
+                state->back += state->extra;
+            }
+#ifdef INFLATE_STRICT
+            if (state->offset > state->dmax) {
+                strm->msg = (char *)"invalid distance too far back";
+                state->mode = BAD;
+                break;
+            }
+#endif
+            Tracevv((stderr, "inflate:         distance %u\n", state->offset));
+            state->mode = MATCH;
+        case MATCH:
+            if (left == 0) goto inf_leave;
+            copy = out - left;
+            if (state->offset > copy) {         /* copy from window */
+                copy = state->offset - copy;
+                if (copy > state->whave) {
+                    if (state->sane) {
+                        strm->msg = (char *)"invalid distance too far back";
+                        state->mode = BAD;
+                        break;
+                    }
+#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
+                    Trace((stderr, "inflate.c too far\n"));
+                    copy -= state->whave;
+                    if (copy > state->length) copy = state->length;
+                    if (copy > left) copy = left;
+                    left -= copy;
+                    state->length -= copy;
+                    do {
+                        *put++ = 0;
+                    } while (--copy);
+                    if (state->length == 0) state->mode = LEN;
+                    break;
+#endif
+                }
+                if (copy > state->wnext) {
+                    copy -= state->wnext;
+                    from = state->window + (state->wsize - copy);
+                }
+                else
+                    from = state->window + (state->wnext - copy);
+                if (copy > state->length) copy = state->length;
+            }
+            else {                              /* copy from output */
+                from = put - state->offset;
+                copy = state->length;
+            }
+            if (copy > left) copy = left;
+            left -= copy;
+            state->length -= copy;
+            do {
+                *put++ = *from++;
+            } while (--copy);
+            if (state->length == 0) state->mode = LEN;
+            break;
+        case LIT:
+            if (left == 0) goto inf_leave;
+            *put++ = (unsigned char)(state->length);
+            left--;
+            state->mode = LEN;
+            break;
+        case CHECK:
+            if (state->wrap) {
+                NEEDBITS(32);
+                out -= left;
+                strm->total_out += out;
+                state->total += out;
                 if ((state->wrap & 4) && out)
-                    strm->adler = state->check = 
-                        UPDATE(state->check, put - out, out); 
-                out = left; 
+                    strm->adler = state->check =
+                        UPDATE(state->check, put - out, out);
+                out = left;
                 if ((state->wrap & 4) && (
-#ifdef GUNZIP 
-                     state->flags ? hold : 
-#endif 
-                     ZSWAP32(hold)) != state->check) { 
-                    strm->msg = (char *)"incorrect data check"; 
-                    state->mode = BAD; 
-                    break; 
-                } 
-                INITBITS(); 
-                Tracev((stderr, "inflate:   check matches trailer\n")); 
-            } 
-#ifdef GUNZIP 
-            state->mode = LENGTH; 
-        case LENGTH: 
-            if (state->wrap && state->flags) { 
-                NEEDBITS(32); 
-                if (hold != (state->total & 0xffffffffUL)) { 
-                    strm->msg = (char *)"incorrect length check"; 
-                    state->mode = BAD; 
-                    break; 
-                } 
-                INITBITS(); 
-                Tracev((stderr, "inflate:   length matches trailer\n")); 
-            } 
-#endif 
-            state->mode = DONE; 
-        case DONE: 
-            ret = Z_STREAM_END; 
-            goto inf_leave; 
-        case BAD: 
-            ret = Z_DATA_ERROR; 
-            goto inf_leave; 
-        case MEM: 
-            return Z_MEM_ERROR; 
-        case SYNC: 
-        default: 
-            return Z_STREAM_ERROR; 
-        } 
- 
-    /* 
-       Return from inflate(), updating the total counts and the check value. 
-       If there was no progress during the inflate() call, return a buffer 
-       error.  Call updatewindow() to create and/or update the window state. 
-       Note: a memory error from inflate() is non-recoverable. 
-     */ 
-  inf_leave: 
-    RESTORE(); 
-    if (state->wsize || (out != strm->avail_out && state->mode < BAD && 
-            (state->mode < CHECK || flush != Z_FINISH))) 
-        if (updatewindow(strm, strm->next_out, out - strm->avail_out)) { 
-            state->mode = MEM; 
-            return Z_MEM_ERROR; 
-        } 
-    in -= strm->avail_in; 
-    out -= strm->avail_out; 
-    strm->total_in += in; 
-    strm->total_out += out; 
-    state->total += out; 
+#ifdef GUNZIP
+                     state->flags ? hold :
+#endif
+                     ZSWAP32(hold)) != state->check) {
+                    strm->msg = (char *)"incorrect data check";
+                    state->mode = BAD;
+                    break;
+                }
+                INITBITS();
+                Tracev((stderr, "inflate:   check matches trailer\n"));
+            }
+#ifdef GUNZIP
+            state->mode = LENGTH;
+        case LENGTH:
+            if (state->wrap && state->flags) {
+                NEEDBITS(32);
+                if (hold != (state->total & 0xffffffffUL)) {
+                    strm->msg = (char *)"incorrect length check";
+                    state->mode = BAD;
+                    break;
+                }
+                INITBITS();
+                Tracev((stderr, "inflate:   length matches trailer\n"));
+            }
+#endif
+            state->mode = DONE;
+        case DONE:
+            ret = Z_STREAM_END;
+            goto inf_leave;
+        case BAD:
+            ret = Z_DATA_ERROR;
+            goto inf_leave;
+        case MEM:
+            return Z_MEM_ERROR;
+        case SYNC:
+        default:
+            return Z_STREAM_ERROR;
+        }
+
+    /*
+       Return from inflate(), updating the total counts and the check value.
+       If there was no progress during the inflate() call, return a buffer
+       error.  Call updatewindow() to create and/or update the window state.
+       Note: a memory error from inflate() is non-recoverable.
+     */
+  inf_leave:
+    RESTORE();
+    if (state->wsize || (out != strm->avail_out && state->mode < BAD &&
+            (state->mode < CHECK || flush != Z_FINISH)))
+        if (updatewindow(strm, strm->next_out, out - strm->avail_out)) {
+            state->mode = MEM;
+            return Z_MEM_ERROR;
+        }
+    in -= strm->avail_in;
+    out -= strm->avail_out;
+    strm->total_in += in;
+    strm->total_out += out;
+    state->total += out;
     if ((state->wrap & 4) && out)
-        strm->adler = state->check = 
-            UPDATE(state->check, strm->next_out - out, out); 
+        strm->adler = state->check =
+            UPDATE(state->check, strm->next_out - out, out);
     strm->data_type = (int)state->bits + (state->last ? 64 : 0) +
-                      (state->mode == TYPE ? 128 : 0) + 
-                      (state->mode == LEN_ || state->mode == COPY_ ? 256 : 0); 
-    if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK) 
-        ret = Z_BUF_ERROR; 
-    return ret; 
-} 
- 
-int ZEXPORT inflateEnd(strm) 
-z_streamp strm; 
-{ 
-    struct inflate_state FAR *state; 
+                      (state->mode == TYPE ? 128 : 0) +
+                      (state->mode == LEN_ || state->mode == COPY_ ? 256 : 0);
+    if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK)
+        ret = Z_BUF_ERROR;
+    return ret;
+}
+
+int ZEXPORT inflateEnd(strm)
+z_streamp strm;
+{
+    struct inflate_state FAR *state;
     if (inflateStateCheck(strm))
-        return Z_STREAM_ERROR; 
-    state = (struct inflate_state FAR *)strm->state; 
-    if (state->window != Z_NULL) ZFREE(strm, state->window); 
-    ZFREE(strm, strm->state); 
-    strm->state = Z_NULL; 
-    Tracev((stderr, "inflate: end\n")); 
-    return Z_OK; 
-} 
- 
-int ZEXPORT inflateGetDictionary(strm, dictionary, dictLength) 
-z_streamp strm; 
-Bytef *dictionary; 
-uInt *dictLength; 
-{ 
-    struct inflate_state FAR *state; 
- 
-    /* check state */ 
+        return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if (state->window != Z_NULL) ZFREE(strm, state->window);
+    ZFREE(strm, strm->state);
+    strm->state = Z_NULL;
+    Tracev((stderr, "inflate: end\n"));
+    return Z_OK;
+}
+
+int ZEXPORT inflateGetDictionary(strm, dictionary, dictLength)
+z_streamp strm;
+Bytef *dictionary;
+uInt *dictLength;
+{
+    struct inflate_state FAR *state;
+
+    /* check state */
     if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state; 
- 
-    /* copy dictionary */ 
-    if (state->whave && dictionary != Z_NULL) { 
-        zmemcpy(dictionary, state->window + state->wnext, 
-                state->whave - state->wnext); 
-        zmemcpy(dictionary + state->whave - state->wnext, 
-                state->window, state->wnext); 
-    } 
-    if (dictLength != Z_NULL) 
-        *dictLength = state->whave; 
-    return Z_OK; 
-} 
- 
-int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength) 
-z_streamp strm; 
-const Bytef *dictionary; 
-uInt dictLength; 
-{ 
-    struct inflate_state FAR *state; 
-    unsigned long dictid; 
-    int ret; 
- 
-    /* check state */ 
+    state = (struct inflate_state FAR *)strm->state;
+
+    /* copy dictionary */
+    if (state->whave && dictionary != Z_NULL) {
+        zmemcpy(dictionary, state->window + state->wnext,
+                state->whave - state->wnext);
+        zmemcpy(dictionary + state->whave - state->wnext,
+                state->window, state->wnext);
+    }
+    if (dictLength != Z_NULL)
+        *dictLength = state->whave;
+    return Z_OK;
+}
+
+int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength)
+z_streamp strm;
+const Bytef *dictionary;
+uInt dictLength;
+{
+    struct inflate_state FAR *state;
+    unsigned long dictid;
+    int ret;
+
+    /* check state */
     if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state; 
-    if (state->wrap != 0 && state->mode != DICT) 
-        return Z_STREAM_ERROR; 
- 
-    /* check for correct dictionary identifier */ 
-    if (state->mode == DICT) { 
-        dictid = adler32(0L, Z_NULL, 0); 
-        dictid = adler32(dictid, dictionary, dictLength); 
-        if (dictid != state->check) 
-            return Z_DATA_ERROR; 
-    } 
- 
-    /* copy dictionary to window using updatewindow(), which will amend the 
-       existing dictionary if appropriate */ 
-    ret = updatewindow(strm, dictionary + dictLength, dictLength); 
-    if (ret) { 
-        state->mode = MEM; 
-        return Z_MEM_ERROR; 
-    } 
-    state->havedict = 1; 
-    Tracev((stderr, "inflate:   dictionary set\n")); 
-    return Z_OK; 
-} 
- 
-int ZEXPORT inflateGetHeader(strm, head) 
-z_streamp strm; 
-gz_headerp head; 
-{ 
-    struct inflate_state FAR *state; 
- 
-    /* check state */ 
+    state = (struct inflate_state FAR *)strm->state;
+    if (state->wrap != 0 && state->mode != DICT)
+        return Z_STREAM_ERROR;
+
+    /* check for correct dictionary identifier */
+    if (state->mode == DICT) {
+        dictid = adler32(0L, Z_NULL, 0);
+        dictid = adler32(dictid, dictionary, dictLength);
+        if (dictid != state->check)
+            return Z_DATA_ERROR;
+    }
+
+    /* copy dictionary to window using updatewindow(), which will amend the
+       existing dictionary if appropriate */
+    ret = updatewindow(strm, dictionary + dictLength, dictLength);
+    if (ret) {
+        state->mode = MEM;
+        return Z_MEM_ERROR;
+    }
+    state->havedict = 1;
+    Tracev((stderr, "inflate:   dictionary set\n"));
+    return Z_OK;
+}
+
+int ZEXPORT inflateGetHeader(strm, head)
+z_streamp strm;
+gz_headerp head;
+{
+    struct inflate_state FAR *state;
+
+    /* check state */
     if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state; 
-    if ((state->wrap & 2) == 0) return Z_STREAM_ERROR; 
- 
-    /* save header structure */ 
-    state->head = head; 
-    head->done = 0; 
-    return Z_OK; 
-} 
- 
-/* 
-   Search buf[0..len-1] for the pattern: 0, 0, 0xff, 0xff.  Return when found 
-   or when out of input.  When called, *have is the number of pattern bytes 
-   found in order so far, in 0..3.  On return *have is updated to the new 
-   state.  If on return *have equals four, then the pattern was found and the 
-   return value is how many bytes were read including the last byte of the 
-   pattern.  If *have is less than four, then the pattern has not been found 
-   yet and the return value is len.  In the latter case, syncsearch() can be 
-   called again with more data and the *have state.  *have is initialized to 
-   zero for the first call. 
- */ 
-local unsigned syncsearch(have, buf, len) 
-unsigned FAR *have; 
-const unsigned char FAR *buf; 
-unsigned len; 
-{ 
-    unsigned got; 
-    unsigned next; 
- 
-    got = *have; 
-    next = 0; 
-    while (next < len && got < 4) { 
-        if ((int)(buf[next]) == (got < 2 ? 0 : 0xff)) 
-            got++; 
-        else if (buf[next]) 
-            got = 0; 
-        else 
-            got = 4 - got; 
-        next++; 
-    } 
-    *have = got; 
-    return next; 
-} 
- 
-int ZEXPORT inflateSync(strm) 
-z_streamp strm; 
-{ 
-    unsigned len;               /* number of bytes to look at or looked at */ 
-    unsigned long in, out;      /* temporary to save total_in and total_out */ 
-    unsigned char buf[4];       /* to restore bit buffer to byte string */ 
-    struct inflate_state FAR *state; 
- 
-    /* check parameters */ 
+    state = (struct inflate_state FAR *)strm->state;
+    if ((state->wrap & 2) == 0) return Z_STREAM_ERROR;
+
+    /* save header structure */
+    state->head = head;
+    head->done = 0;
+    return Z_OK;
+}
+
+/*
+   Search buf[0..len-1] for the pattern: 0, 0, 0xff, 0xff.  Return when found
+   or when out of input.  When called, *have is the number of pattern bytes
+   found in order so far, in 0..3.  On return *have is updated to the new
+   state.  If on return *have equals four, then the pattern was found and the
+   return value is how many bytes were read including the last byte of the
+   pattern.  If *have is less than four, then the pattern has not been found
+   yet and the return value is len.  In the latter case, syncsearch() can be
+   called again with more data and the *have state.  *have is initialized to
+   zero for the first call.
+ */
+local unsigned syncsearch(have, buf, len)
+unsigned FAR *have;
+const unsigned char FAR *buf;
+unsigned len;
+{
+    unsigned got;
+    unsigned next;
+
+    got = *have;
+    next = 0;
+    while (next < len && got < 4) {
+        if ((int)(buf[next]) == (got < 2 ? 0 : 0xff))
+            got++;
+        else if (buf[next])
+            got = 0;
+        else
+            got = 4 - got;
+        next++;
+    }
+    *have = got;
+    return next;
+}
+
+int ZEXPORT inflateSync(strm)
+z_streamp strm;
+{
+    unsigned len;               /* number of bytes to look at or looked at */
+    unsigned long in, out;      /* temporary to save total_in and total_out */
+    unsigned char buf[4];       /* to restore bit buffer to byte string */
+    struct inflate_state FAR *state;
+
+    /* check parameters */
     if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state; 
-    if (strm->avail_in == 0 && state->bits < 8) return Z_BUF_ERROR; 
- 
-    /* if first time, start search in bit buffer */ 
-    if (state->mode != SYNC) { 
-        state->mode = SYNC; 
-        state->hold <<= state->bits & 7; 
-        state->bits -= state->bits & 7; 
-        len = 0; 
-        while (state->bits >= 8) { 
-            buf[len++] = (unsigned char)(state->hold); 
-            state->hold >>= 8; 
-            state->bits -= 8; 
-        } 
-        state->have = 0; 
-        syncsearch(&(state->have), buf, len); 
-    } 
- 
-    /* search available input */ 
-    len = syncsearch(&(state->have), strm->next_in, strm->avail_in); 
-    strm->avail_in -= len; 
-    strm->next_in += len; 
-    strm->total_in += len; 
- 
-    /* return no joy or set up to restart inflate() on a new block */ 
-    if (state->have != 4) return Z_DATA_ERROR; 
-    in = strm->total_in;  out = strm->total_out; 
-    inflateReset(strm); 
-    strm->total_in = in;  strm->total_out = out; 
-    state->mode = TYPE; 
-    return Z_OK; 
-} 
- 
-/* 
-   Returns true if inflate is currently at the end of a block generated by 
-   Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP 
-   implementation to provide an additional safety check. PPP uses 
-   Z_SYNC_FLUSH but removes the length bytes of the resulting empty stored 
-   block. When decompressing, PPP checks that at the end of input packet, 
-   inflate is waiting for these length bytes. 
- */ 
-int ZEXPORT inflateSyncPoint(strm) 
-z_streamp strm; 
-{ 
-    struct inflate_state FAR *state; 
- 
+    state = (struct inflate_state FAR *)strm->state;
+    if (strm->avail_in == 0 && state->bits < 8) return Z_BUF_ERROR;
+
+    /* if first time, start search in bit buffer */
+    if (state->mode != SYNC) {
+        state->mode = SYNC;
+        state->hold <<= state->bits & 7;
+        state->bits -= state->bits & 7;
+        len = 0;
+        while (state->bits >= 8) {
+            buf[len++] = (unsigned char)(state->hold);
+            state->hold >>= 8;
+            state->bits -= 8;
+        }
+        state->have = 0;
+        syncsearch(&(state->have), buf, len);
+    }
+
+    /* search available input */
+    len = syncsearch(&(state->have), strm->next_in, strm->avail_in);
+    strm->avail_in -= len;
+    strm->next_in += len;
+    strm->total_in += len;
+
+    /* return no joy or set up to restart inflate() on a new block */
+    if (state->have != 4) return Z_DATA_ERROR;
+    in = strm->total_in;  out = strm->total_out;
+    inflateReset(strm);
+    strm->total_in = in;  strm->total_out = out;
+    state->mode = TYPE;
+    return Z_OK;
+}
+
+/*
+   Returns true if inflate is currently at the end of a block generated by
+   Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP
+   implementation to provide an additional safety check. PPP uses
+   Z_SYNC_FLUSH but removes the length bytes of the resulting empty stored
+   block. When decompressing, PPP checks that at the end of input packet,
+   inflate is waiting for these length bytes.
+ */
+int ZEXPORT inflateSyncPoint(strm)
+z_streamp strm;
+{
+    struct inflate_state FAR *state;
+
     if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state; 
-    return state->mode == STORED && state->bits == 0; 
-} 
- 
-int ZEXPORT inflateCopy(dest, source) 
-z_streamp dest; 
-z_streamp source; 
-{ 
-    struct inflate_state FAR *state; 
-    struct inflate_state FAR *copy; 
-    unsigned char FAR *window; 
-    unsigned wsize; 
- 
-    /* check input */ 
+    state = (struct inflate_state FAR *)strm->state;
+    return state->mode == STORED && state->bits == 0;
+}
+
+int ZEXPORT inflateCopy(dest, source)
+z_streamp dest;
+z_streamp source;
+{
+    struct inflate_state FAR *state;
+    struct inflate_state FAR *copy;
+    unsigned char FAR *window;
+    unsigned wsize;
+
+    /* check input */
     if (inflateStateCheck(source) || dest == Z_NULL)
-        return Z_STREAM_ERROR; 
-    state = (struct inflate_state FAR *)source->state; 
- 
-    /* allocate space */ 
-    copy = (struct inflate_state FAR *) 
-           ZALLOC(source, 1, sizeof(struct inflate_state)); 
-    if (copy == Z_NULL) return Z_MEM_ERROR; 
-    window = Z_NULL; 
-    if (state->window != Z_NULL) { 
-        window = (unsigned char FAR *) 
-                 ZALLOC(source, 1U << state->wbits, sizeof(unsigned char)); 
-        if (window == Z_NULL) { 
-            ZFREE(source, copy); 
-            return Z_MEM_ERROR; 
-        } 
-    } 
- 
-    /* copy state */ 
-    zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream)); 
-    zmemcpy((voidpf)copy, (voidpf)state, sizeof(struct inflate_state)); 
+        return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)source->state;
+
+    /* allocate space */
+    copy = (struct inflate_state FAR *)
+           ZALLOC(source, 1, sizeof(struct inflate_state));
+    if (copy == Z_NULL) return Z_MEM_ERROR;
+    window = Z_NULL;
+    if (state->window != Z_NULL) {
+        window = (unsigned char FAR *)
+                 ZALLOC(source, 1U << state->wbits, sizeof(unsigned char));
+        if (window == Z_NULL) {
+            ZFREE(source, copy);
+            return Z_MEM_ERROR;
+        }
+    }
+
+    /* copy state */
+    zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream));
+    zmemcpy((voidpf)copy, (voidpf)state, sizeof(struct inflate_state));
     copy->strm = dest;
-    if (state->lencode >= state->codes && 
-        state->lencode <= state->codes + ENOUGH - 1) { 
-        copy->lencode = copy->codes + (state->lencode - state->codes); 
-        copy->distcode = copy->codes + (state->distcode - state->codes); 
-    } 
-    copy->next = copy->codes + (state->next - state->codes); 
-    if (window != Z_NULL) { 
-        wsize = 1U << state->wbits; 
-        zmemcpy(window, state->window, wsize); 
-    } 
-    copy->window = window; 
-    dest->state = (struct internal_state FAR *)copy; 
-    return Z_OK; 
-} 
- 
-int ZEXPORT inflateUndermine(strm, subvert) 
-z_streamp strm; 
-int subvert; 
-{ 
-    struct inflate_state FAR *state; 
- 
+    if (state->lencode >= state->codes &&
+        state->lencode <= state->codes + ENOUGH - 1) {
+        copy->lencode = copy->codes + (state->lencode - state->codes);
+        copy->distcode = copy->codes + (state->distcode - state->codes);
+    }
+    copy->next = copy->codes + (state->next - state->codes);
+    if (window != Z_NULL) {
+        wsize = 1U << state->wbits;
+        zmemcpy(window, state->window, wsize);
+    }
+    copy->window = window;
+    dest->state = (struct internal_state FAR *)copy;
+    return Z_OK;
+}
+
+int ZEXPORT inflateUndermine(strm, subvert)
+z_streamp strm;
+int subvert;
+{
+    struct inflate_state FAR *state;
+
     if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state; 
+    state = (struct inflate_state FAR *)strm->state;
 #ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
-    state->sane = !subvert; 
-    return Z_OK; 
-#else 
+    state->sane = !subvert;
+    return Z_OK;
+#else
     (void)subvert;
-    state->sane = 1; 
-    return Z_DATA_ERROR; 
-#endif 
-} 
- 
+    state->sane = 1;
+    return Z_DATA_ERROR;
+#endif
+}
+
 int ZEXPORT inflateValidate(strm, check)
 z_streamp strm;
 int check;
@@ -1538,18 +1538,18 @@ int check;
     return Z_OK;
 }
 
-long ZEXPORT inflateMark(strm) 
-z_streamp strm; 
-{ 
-    struct inflate_state FAR *state; 
- 
+long ZEXPORT inflateMark(strm)
+z_streamp strm;
+{
+    struct inflate_state FAR *state;
+
     if (inflateStateCheck(strm))
         return -(1L << 16);
-    state = (struct inflate_state FAR *)strm->state; 
+    state = (struct inflate_state FAR *)strm->state;
     return (long)(((unsigned long)((long)state->back)) << 16) +
-        (state->mode == COPY ? state->length : 
-            (state->mode == MATCH ? state->was - state->length : 0)); 
-} 
+        (state->mode == COPY ? state->length :
+            (state->mode == MATCH ? state->was - state->length : 0));
+}
 
 unsigned long ZEXPORT inflateCodesUsed(strm)
 z_streamp strm;
diff --git a/contrib/libs/zlib/inflate.h b/contrib/libs/zlib/inflate.h
index d075f6da19..a46cce6b6d 100644
--- a/contrib/libs/zlib/inflate.h
+++ b/contrib/libs/zlib/inflate.h
@@ -1,125 +1,125 @@
-/* inflate.h -- internal inflate state definition 
+/* inflate.h -- internal inflate state definition
  * Copyright (C) 1995-2016 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */ 
- 
-/* WARNING: this file should *not* be used by applications. It is 
-   part of the implementation of the compression library and is 
-   subject to change. Applications should only use zlib.h. 
- */ 
- 
-/* define NO_GZIP when compiling if you want to disable gzip header and 
-   trailer decoding by inflate().  NO_GZIP would be used to avoid linking in 
-   the crc code when it is not needed.  For shared libraries, gzip decoding 
-   should be left enabled. */ 
-#ifndef NO_GZIP 
-#  define GUNZIP 
-#endif 
- 
-/* Possible inflate modes between inflate() calls */ 
-typedef enum { 
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+/* define NO_GZIP when compiling if you want to disable gzip header and
+   trailer decoding by inflate().  NO_GZIP would be used to avoid linking in
+   the crc code when it is not needed.  For shared libraries, gzip decoding
+   should be left enabled. */
+#ifndef NO_GZIP
+#  define GUNZIP
+#endif
+
+/* Possible inflate modes between inflate() calls */
+typedef enum {
     HEAD = 16180,   /* i: waiting for magic header */
-    FLAGS,      /* i: waiting for method and flags (gzip) */ 
-    TIME,       /* i: waiting for modification time (gzip) */ 
-    OS,         /* i: waiting for extra flags and operating system (gzip) */ 
-    EXLEN,      /* i: waiting for extra length (gzip) */ 
-    EXTRA,      /* i: waiting for extra bytes (gzip) */ 
-    NAME,       /* i: waiting for end of file name (gzip) */ 
-    COMMENT,    /* i: waiting for end of comment (gzip) */ 
-    HCRC,       /* i: waiting for header crc (gzip) */ 
-    DICTID,     /* i: waiting for dictionary check value */ 
-    DICT,       /* waiting for inflateSetDictionary() call */ 
-        TYPE,       /* i: waiting for type bits, including last-flag bit */ 
-        TYPEDO,     /* i: same, but skip check to exit inflate on new block */ 
-        STORED,     /* i: waiting for stored size (length and complement) */ 
-        COPY_,      /* i/o: same as COPY below, but only first time in */ 
-        COPY,       /* i/o: waiting for input or output to copy stored block */ 
-        TABLE,      /* i: waiting for dynamic block table lengths */ 
-        LENLENS,    /* i: waiting for code length code lengths */ 
-        CODELENS,   /* i: waiting for length/lit and distance code lengths */ 
-            LEN_,       /* i: same as LEN below, but only first time in */ 
-            LEN,        /* i: waiting for length/lit/eob code */ 
-            LENEXT,     /* i: waiting for length extra bits */ 
-            DIST,       /* i: waiting for distance code */ 
-            DISTEXT,    /* i: waiting for distance extra bits */ 
-            MATCH,      /* o: waiting for output space to copy string */ 
-            LIT,        /* o: waiting for output space to write literal */ 
-    CHECK,      /* i: waiting for 32-bit check value */ 
-    LENGTH,     /* i: waiting for 32-bit length (gzip) */ 
-    DONE,       /* finished check, done -- remain here until reset */ 
-    BAD,        /* got a data error -- remain here until reset */ 
-    MEM,        /* got an inflate() memory error -- remain here until reset */ 
-    SYNC        /* looking for synchronization bytes to restart inflate() */ 
-} inflate_mode; 
- 
-/* 
-    State transitions between above modes - 
- 
-    (most modes can go to BAD or MEM on error -- not shown for clarity) 
- 
-    Process header: 
-        HEAD -> (gzip) or (zlib) or (raw) 
-        (gzip) -> FLAGS -> TIME -> OS -> EXLEN -> EXTRA -> NAME -> COMMENT -> 
-                  HCRC -> TYPE 
-        (zlib) -> DICTID or TYPE 
-        DICTID -> DICT -> TYPE 
-        (raw) -> TYPEDO 
-    Read deflate blocks: 
-            TYPE -> TYPEDO -> STORED or TABLE or LEN_ or CHECK 
-            STORED -> COPY_ -> COPY -> TYPE 
-            TABLE -> LENLENS -> CODELENS -> LEN_ 
-            LEN_ -> LEN 
-    Read deflate codes in fixed or dynamic block: 
-                LEN -> LENEXT or LIT or TYPE 
-                LENEXT -> DIST -> DISTEXT -> MATCH -> LEN 
-                LIT -> LEN 
-    Process trailer: 
-        CHECK -> LENGTH -> DONE 
- */ 
- 
+    FLAGS,      /* i: waiting for method and flags (gzip) */
+    TIME,       /* i: waiting for modification time (gzip) */
+    OS,         /* i: waiting for extra flags and operating system (gzip) */
+    EXLEN,      /* i: waiting for extra length (gzip) */
+    EXTRA,      /* i: waiting for extra bytes (gzip) */
+    NAME,       /* i: waiting for end of file name (gzip) */
+    COMMENT,    /* i: waiting for end of comment (gzip) */
+    HCRC,       /* i: waiting for header crc (gzip) */
+    DICTID,     /* i: waiting for dictionary check value */
+    DICT,       /* waiting for inflateSetDictionary() call */
+        TYPE,       /* i: waiting for type bits, including last-flag bit */
+        TYPEDO,     /* i: same, but skip check to exit inflate on new block */
+        STORED,     /* i: waiting for stored size (length and complement) */
+        COPY_,      /* i/o: same as COPY below, but only first time in */
+        COPY,       /* i/o: waiting for input or output to copy stored block */
+        TABLE,      /* i: waiting for dynamic block table lengths */
+        LENLENS,    /* i: waiting for code length code lengths */
+        CODELENS,   /* i: waiting for length/lit and distance code lengths */
+            LEN_,       /* i: same as LEN below, but only first time in */
+            LEN,        /* i: waiting for length/lit/eob code */
+            LENEXT,     /* i: waiting for length extra bits */
+            DIST,       /* i: waiting for distance code */
+            DISTEXT,    /* i: waiting for distance extra bits */
+            MATCH,      /* o: waiting for output space to copy string */
+            LIT,        /* o: waiting for output space to write literal */
+    CHECK,      /* i: waiting for 32-bit check value */
+    LENGTH,     /* i: waiting for 32-bit length (gzip) */
+    DONE,       /* finished check, done -- remain here until reset */
+    BAD,        /* got a data error -- remain here until reset */
+    MEM,        /* got an inflate() memory error -- remain here until reset */
+    SYNC        /* looking for synchronization bytes to restart inflate() */
+} inflate_mode;
+
+/*
+    State transitions between above modes -
+
+    (most modes can go to BAD or MEM on error -- not shown for clarity)
+
+    Process header:
+        HEAD -> (gzip) or (zlib) or (raw)
+        (gzip) -> FLAGS -> TIME -> OS -> EXLEN -> EXTRA -> NAME -> COMMENT ->
+                  HCRC -> TYPE
+        (zlib) -> DICTID or TYPE
+        DICTID -> DICT -> TYPE
+        (raw) -> TYPEDO
+    Read deflate blocks:
+            TYPE -> TYPEDO -> STORED or TABLE or LEN_ or CHECK
+            STORED -> COPY_ -> COPY -> TYPE
+            TABLE -> LENLENS -> CODELENS -> LEN_
+            LEN_ -> LEN
+    Read deflate codes in fixed or dynamic block:
+                LEN -> LENEXT or LIT or TYPE
+                LENEXT -> DIST -> DISTEXT -> MATCH -> LEN
+                LIT -> LEN
+    Process trailer:
+        CHECK -> LENGTH -> DONE
+ */
+
 /* State maintained between inflate() calls -- approximately 7K bytes, not
    including the allocated sliding window, which is up to 32K bytes. */
-struct inflate_state { 
+struct inflate_state {
     z_streamp strm;             /* pointer back to this zlib stream */
-    inflate_mode mode;          /* current inflate mode */ 
-    int last;                   /* true if processing last block */ 
+    inflate_mode mode;          /* current inflate mode */
+    int last;                   /* true if processing last block */
     int wrap;                   /* bit 0 true for zlib, bit 1 true for gzip,
                                    bit 2 true to validate check value */
-    int havedict;               /* true if dictionary provided */ 
-    int flags;                  /* gzip header method and flags (0 if zlib) */ 
-    unsigned dmax;              /* zlib header max distance (INFLATE_STRICT) */ 
-    unsigned long check;        /* protected copy of check value */ 
-    unsigned long total;        /* protected copy of output count */ 
-    gz_headerp head;            /* where to save gzip header information */ 
-        /* sliding window */ 
-    unsigned wbits;             /* log base 2 of requested window size */ 
-    unsigned wsize;             /* window size or zero if not using window */ 
-    unsigned whave;             /* valid bytes in the window */ 
-    unsigned wnext;             /* window write index */ 
-    unsigned char FAR *window;  /* allocated sliding window, if needed */ 
-        /* bit accumulator */ 
-    unsigned long hold;         /* input bit accumulator */ 
-    unsigned bits;              /* number of bits in "in" */ 
-        /* for string and stored block copying */ 
-    unsigned length;            /* literal or length of data to copy */ 
-    unsigned offset;            /* distance back to copy string from */ 
-        /* for table and code decoding */ 
-    unsigned extra;             /* extra bits needed */ 
-        /* fixed and dynamic code tables */ 
-    code const FAR *lencode;    /* starting table for length/literal codes */ 
-    code const FAR *distcode;   /* starting table for distance codes */ 
-    unsigned lenbits;           /* index bits for lencode */ 
-    unsigned distbits;          /* index bits for distcode */ 
-        /* dynamic table building */ 
-    unsigned ncode;             /* number of code length code lengths */ 
-    unsigned nlen;              /* number of length code lengths */ 
-    unsigned ndist;             /* number of distance code lengths */ 
-    unsigned have;              /* number of code lengths in lens[] */ 
-    code FAR *next;             /* next available space in codes[] */ 
-    unsigned short lens[320];   /* temporary storage for code lengths */ 
-    unsigned short work[288];   /* work area for code table building */ 
-    code codes[ENOUGH];         /* space for code tables */ 
-    int sane;                   /* if false, allow invalid distance too far */ 
-    int back;                   /* bits back of last unprocessed length/lit */ 
-    unsigned was;               /* initial length of match */ 
-}; 
+    int havedict;               /* true if dictionary provided */
+    int flags;                  /* gzip header method and flags (0 if zlib) */
+    unsigned dmax;              /* zlib header max distance (INFLATE_STRICT) */
+    unsigned long check;        /* protected copy of check value */
+    unsigned long total;        /* protected copy of output count */
+    gz_headerp head;            /* where to save gzip header information */
+        /* sliding window */
+    unsigned wbits;             /* log base 2 of requested window size */
+    unsigned wsize;             /* window size or zero if not using window */
+    unsigned whave;             /* valid bytes in the window */
+    unsigned wnext;             /* window write index */
+    unsigned char FAR *window;  /* allocated sliding window, if needed */
+        /* bit accumulator */
+    unsigned long hold;         /* input bit accumulator */
+    unsigned bits;              /* number of bits in "in" */
+        /* for string and stored block copying */
+    unsigned length;            /* literal or length of data to copy */
+    unsigned offset;            /* distance back to copy string from */
+        /* for table and code decoding */
+    unsigned extra;             /* extra bits needed */
+        /* fixed and dynamic code tables */
+    code const FAR *lencode;    /* starting table for length/literal codes */
+    code const FAR *distcode;   /* starting table for distance codes */
+    unsigned lenbits;           /* index bits for lencode */
+    unsigned distbits;          /* index bits for distcode */
+        /* dynamic table building */
+    unsigned ncode;             /* number of code length code lengths */
+    unsigned nlen;              /* number of length code lengths */
+    unsigned ndist;             /* number of distance code lengths */
+    unsigned have;              /* number of code lengths in lens[] */
+    code FAR *next;             /* next available space in codes[] */
+    unsigned short lens[320];   /* temporary storage for code lengths */
+    unsigned short work[288];   /* work area for code table building */
+    code codes[ENOUGH];         /* space for code tables */
+    int sane;                   /* if false, allow invalid distance too far */
+    int back;                   /* bits back of last unprocessed length/lit */
+    unsigned was;               /* initial length of match */
+};
diff --git a/contrib/libs/zlib/inftrees.c b/contrib/libs/zlib/inftrees.c
index f05af7208b..2ea08fc13e 100644
--- a/contrib/libs/zlib/inftrees.c
+++ b/contrib/libs/zlib/inftrees.c
@@ -1,304 +1,304 @@
-/* inftrees.c -- generate Huffman trees for efficient decoding 
+/* inftrees.c -- generate Huffman trees for efficient decoding
  * Copyright (C) 1995-2017 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */ 
- 
-#include "zutil.h" 
-#include "inftrees.h" 
- 
-#define MAXBITS 15 
- 
-const char inflate_copyright[] = 
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "zutil.h"
+#include "inftrees.h"
+
+#define MAXBITS 15
+
+const char inflate_copyright[] =
    " inflate 1.2.11 Copyright 1995-2017 Mark Adler ";
-/* 
-  If you use the zlib library in a product, an acknowledgment is welcome 
-  in the documentation of your product. If for some reason you cannot 
-  include such an acknowledgment, I would appreciate that you keep this 
-  copyright string in the executable of your product. 
- */ 
- 
-/* 
-   Build a set of tables to decode the provided canonical Huffman code. 
-   The code lengths are lens[0..codes-1].  The result starts at *table, 
-   whose indices are 0..2^bits-1.  work is a writable array of at least 
-   lens shorts, which is used as a work area.  type is the type of code 
-   to be generated, CODES, LENS, or DISTS.  On return, zero is success, 
-   -1 is an invalid code, and +1 means that ENOUGH isn't enough.  table 
-   on return points to the next available entry's address.  bits is the 
-   requested root table index bits, and on return it is the actual root 
-   table index bits.  It will differ if the request is greater than the 
-   longest code or if it is less than the shortest code. 
- */ 
-int ZLIB_INTERNAL inflate_table(type, lens, codes, table, bits, work) 
-codetype type; 
-unsigned short FAR *lens; 
-unsigned codes; 
-code FAR * FAR *table; 
-unsigned FAR *bits; 
-unsigned short FAR *work; 
-{ 
-    unsigned len;               /* a code's length in bits */ 
-    unsigned sym;               /* index of code symbols */ 
-    unsigned min, max;          /* minimum and maximum code lengths */ 
-    unsigned root;              /* number of index bits for root table */ 
-    unsigned curr;              /* number of index bits for current table */ 
-    unsigned drop;              /* code bits to drop for sub-table */ 
-    int left;                   /* number of prefix codes available */ 
-    unsigned used;              /* code entries in table used */ 
-    unsigned huff;              /* Huffman code */ 
-    unsigned incr;              /* for incrementing code, index */ 
-    unsigned fill;              /* index for replicating entries */ 
-    unsigned low;               /* low bits for current root entry */ 
-    unsigned mask;              /* mask for low root bits */ 
-    code here;                  /* table entry for duplication */ 
-    code FAR *next;             /* next available space in table */ 
-    const unsigned short FAR *base;     /* base value table to use */ 
-    const unsigned short FAR *extra;    /* extra bits table to use */ 
+/*
+  If you use the zlib library in a product, an acknowledgment is welcome
+  in the documentation of your product. If for some reason you cannot
+  include such an acknowledgment, I would appreciate that you keep this
+  copyright string in the executable of your product.
+ */
+
+/*
+   Build a set of tables to decode the provided canonical Huffman code.
+   The code lengths are lens[0..codes-1].  The result starts at *table,
+   whose indices are 0..2^bits-1.  work is a writable array of at least
+   lens shorts, which is used as a work area.  type is the type of code
+   to be generated, CODES, LENS, or DISTS.  On return, zero is success,
+   -1 is an invalid code, and +1 means that ENOUGH isn't enough.  table
+   on return points to the next available entry's address.  bits is the
+   requested root table index bits, and on return it is the actual root
+   table index bits.  It will differ if the request is greater than the
+   longest code or if it is less than the shortest code.
+ */
+int ZLIB_INTERNAL inflate_table(type, lens, codes, table, bits, work)
+codetype type;
+unsigned short FAR *lens;
+unsigned codes;
+code FAR * FAR *table;
+unsigned FAR *bits;
+unsigned short FAR *work;
+{
+    unsigned len;               /* a code's length in bits */
+    unsigned sym;               /* index of code symbols */
+    unsigned min, max;          /* minimum and maximum code lengths */
+    unsigned root;              /* number of index bits for root table */
+    unsigned curr;              /* number of index bits for current table */
+    unsigned drop;              /* code bits to drop for sub-table */
+    int left;                   /* number of prefix codes available */
+    unsigned used;              /* code entries in table used */
+    unsigned huff;              /* Huffman code */
+    unsigned incr;              /* for incrementing code, index */
+    unsigned fill;              /* index for replicating entries */
+    unsigned low;               /* low bits for current root entry */
+    unsigned mask;              /* mask for low root bits */
+    code here;                  /* table entry for duplication */
+    code FAR *next;             /* next available space in table */
+    const unsigned short FAR *base;     /* base value table to use */
+    const unsigned short FAR *extra;    /* extra bits table to use */
     unsigned match;             /* use base and extra for symbol >= match */
-    unsigned short count[MAXBITS+1];    /* number of codes of each length */ 
-    unsigned short offs[MAXBITS+1];     /* offsets in table for each length */ 
-    static const unsigned short lbase[31] = { /* Length codes 257..285 base */ 
-        3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, 
-        35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0}; 
-    static const unsigned short lext[31] = { /* Length codes 257..285 extra */ 
-        16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18, 
+    unsigned short count[MAXBITS+1];    /* number of codes of each length */
+    unsigned short offs[MAXBITS+1];     /* offsets in table for each length */
+    static const unsigned short lbase[31] = { /* Length codes 257..285 base */
+        3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
+        35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
+    static const unsigned short lext[31] = { /* Length codes 257..285 extra */
+        16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
         19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 77, 202};
-    static const unsigned short dbase[32] = { /* Distance codes 0..29 base */ 
-        1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 
-        257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, 
-        8193, 12289, 16385, 24577, 0, 0}; 
-    static const unsigned short dext[32] = { /* Distance codes 0..29 extra */ 
-        16, 16, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22, 
-        23, 23, 24, 24, 25, 25, 26, 26, 27, 27, 
-        28, 28, 29, 29, 64, 64}; 
- 
-    /* 
-       Process a set of code lengths to create a canonical Huffman code.  The 
-       code lengths are lens[0..codes-1].  Each length corresponds to the 
-       symbols 0..codes-1.  The Huffman code is generated by first sorting the 
-       symbols by length from short to long, and retaining the symbol order 
-       for codes with equal lengths.  Then the code starts with all zero bits 
-       for the first code of the shortest length, and the codes are integer 
-       increments for the same length, and zeros are appended as the length 
-       increases.  For the deflate format, these bits are stored backwards 
-       from their more natural integer increment ordering, and so when the 
-       decoding tables are built in the large loop below, the integer codes 
-       are incremented backwards. 
- 
-       This routine assumes, but does not check, that all of the entries in 
-       lens[] are in the range 0..MAXBITS.  The caller must assure this. 
-       1..MAXBITS is interpreted as that code length.  zero means that that 
-       symbol does not occur in this code. 
- 
-       The codes are sorted by computing a count of codes for each length, 
-       creating from that a table of starting indices for each length in the 
-       sorted table, and then entering the symbols in order in the sorted 
-       table.  The sorted table is work[], with that space being provided by 
-       the caller. 
- 
-       The length counts are used for other purposes as well, i.e. finding 
-       the minimum and maximum length codes, determining if there are any 
-       codes at all, checking for a valid set of lengths, and looking ahead 
-       at length counts to determine sub-table sizes when building the 
-       decoding tables. 
-     */ 
- 
-    /* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */ 
-    for (len = 0; len <= MAXBITS; len++) 
-        count[len] = 0; 
-    for (sym = 0; sym < codes; sym++) 
-        count[lens[sym]]++; 
- 
-    /* bound code lengths, force root to be within code lengths */ 
-    root = *bits; 
-    for (max = MAXBITS; max >= 1; max--) 
-        if (count[max] != 0) break; 
-    if (root > max) root = max; 
-    if (max == 0) {                     /* no symbols to code at all */ 
-        here.op = (unsigned char)64;    /* invalid code marker */ 
-        here.bits = (unsigned char)1; 
-        here.val = (unsigned short)0; 
-        *(*table)++ = here;             /* make a table to force an error */ 
-        *(*table)++ = here; 
-        *bits = 1; 
-        return 0;     /* no symbols, but wait for decoding to report error */ 
-    } 
-    for (min = 1; min < max; min++) 
-        if (count[min] != 0) break; 
-    if (root < min) root = min; 
- 
-    /* check for an over-subscribed or incomplete set of lengths */ 
-    left = 1; 
-    for (len = 1; len <= MAXBITS; len++) { 
-        left <<= 1; 
-        left -= count[len]; 
-        if (left < 0) return -1;        /* over-subscribed */ 
-    } 
-    if (left > 0 && (type == CODES || max != 1)) 
-        return -1;                      /* incomplete set */ 
- 
-    /* generate offsets into symbol table for each length for sorting */ 
-    offs[1] = 0; 
-    for (len = 1; len < MAXBITS; len++) 
-        offs[len + 1] = offs[len] + count[len]; 
- 
-    /* sort symbols by length, by symbol order within each length */ 
-    for (sym = 0; sym < codes; sym++) 
-        if (lens[sym] != 0) work[offs[lens[sym]]++] = (unsigned short)sym; 
- 
-    /* 
-       Create and fill in decoding tables.  In this loop, the table being 
-       filled is at next and has curr index bits.  The code being used is huff 
-       with length len.  That code is converted to an index by dropping drop 
-       bits off of the bottom.  For codes where len is less than drop + curr, 
-       those top drop + curr - len bits are incremented through all values to 
-       fill the table with replicated entries. 
- 
-       root is the number of index bits for the root table.  When len exceeds 
-       root, sub-tables are created pointed to by the root entry with an index 
-       of the low root bits of huff.  This is saved in low to check for when a 
-       new sub-table should be started.  drop is zero when the root table is 
-       being filled, and drop is root when sub-tables are being filled. 
- 
-       When a new sub-table is needed, it is necessary to look ahead in the 
-       code lengths to determine what size sub-table is needed.  The length 
-       counts are used for this, and so count[] is decremented as codes are 
-       entered in the tables. 
- 
-       used keeps track of how many table entries have been allocated from the 
-       provided *table space.  It is checked for LENS and DIST tables against 
-       the constants ENOUGH_LENS and ENOUGH_DISTS to guard against changes in 
-       the initial root table size constants.  See the comments in inftrees.h 
-       for more information. 
- 
-       sym increments through all symbols, and the loop terminates when 
-       all codes of length max, i.e. all codes, have been processed.  This 
-       routine permits incomplete codes, so another loop after this one fills 
-       in the rest of the decoding tables with invalid code markers. 
-     */ 
- 
-    /* set up for code type */ 
-    switch (type) { 
-    case CODES: 
-        base = extra = work;    /* dummy value--not used */ 
+    static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
+        1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
+        257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
+        8193, 12289, 16385, 24577, 0, 0};
+    static const unsigned short dext[32] = { /* Distance codes 0..29 extra */
+        16, 16, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22,
+        23, 23, 24, 24, 25, 25, 26, 26, 27, 27,
+        28, 28, 29, 29, 64, 64};
+
+    /*
+       Process a set of code lengths to create a canonical Huffman code.  The
+       code lengths are lens[0..codes-1].  Each length corresponds to the
+       symbols 0..codes-1.  The Huffman code is generated by first sorting the
+       symbols by length from short to long, and retaining the symbol order
+       for codes with equal lengths.  Then the code starts with all zero bits
+       for the first code of the shortest length, and the codes are integer
+       increments for the same length, and zeros are appended as the length
+       increases.  For the deflate format, these bits are stored backwards
+       from their more natural integer increment ordering, and so when the
+       decoding tables are built in the large loop below, the integer codes
+       are incremented backwards.
+
+       This routine assumes, but does not check, that all of the entries in
+       lens[] are in the range 0..MAXBITS.  The caller must assure this.
+       1..MAXBITS is interpreted as that code length.  zero means that that
+       symbol does not occur in this code.
+
+       The codes are sorted by computing a count of codes for each length,
+       creating from that a table of starting indices for each length in the
+       sorted table, and then entering the symbols in order in the sorted
+       table.  The sorted table is work[], with that space being provided by
+       the caller.
+
+       The length counts are used for other purposes as well, i.e. finding
+       the minimum and maximum length codes, determining if there are any
+       codes at all, checking for a valid set of lengths, and looking ahead
+       at length counts to determine sub-table sizes when building the
+       decoding tables.
+     */
+
+    /* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */
+    for (len = 0; len <= MAXBITS; len++)
+        count[len] = 0;
+    for (sym = 0; sym < codes; sym++)
+        count[lens[sym]]++;
+
+    /* bound code lengths, force root to be within code lengths */
+    root = *bits;
+    for (max = MAXBITS; max >= 1; max--)
+        if (count[max] != 0) break;
+    if (root > max) root = max;
+    if (max == 0) {                     /* no symbols to code at all */
+        here.op = (unsigned char)64;    /* invalid code marker */
+        here.bits = (unsigned char)1;
+        here.val = (unsigned short)0;
+        *(*table)++ = here;             /* make a table to force an error */
+        *(*table)++ = here;
+        *bits = 1;
+        return 0;     /* no symbols, but wait for decoding to report error */
+    }
+    for (min = 1; min < max; min++)
+        if (count[min] != 0) break;
+    if (root < min) root = min;
+
+    /* check for an over-subscribed or incomplete set of lengths */
+    left = 1;
+    for (len = 1; len <= MAXBITS; len++) {
+        left <<= 1;
+        left -= count[len];
+        if (left < 0) return -1;        /* over-subscribed */
+    }
+    if (left > 0 && (type == CODES || max != 1))
+        return -1;                      /* incomplete set */
+
+    /* generate offsets into symbol table for each length for sorting */
+    offs[1] = 0;
+    for (len = 1; len < MAXBITS; len++)
+        offs[len + 1] = offs[len] + count[len];
+
+    /* sort symbols by length, by symbol order within each length */
+    for (sym = 0; sym < codes; sym++)
+        if (lens[sym] != 0) work[offs[lens[sym]]++] = (unsigned short)sym;
+
+    /*
+       Create and fill in decoding tables.  In this loop, the table being
+       filled is at next and has curr index bits.  The code being used is huff
+       with length len.  That code is converted to an index by dropping drop
+       bits off of the bottom.  For codes where len is less than drop + curr,
+       those top drop + curr - len bits are incremented through all values to
+       fill the table with replicated entries.
+
+       root is the number of index bits for the root table.  When len exceeds
+       root, sub-tables are created pointed to by the root entry with an index
+       of the low root bits of huff.  This is saved in low to check for when a
+       new sub-table should be started.  drop is zero when the root table is
+       being filled, and drop is root when sub-tables are being filled.
+
+       When a new sub-table is needed, it is necessary to look ahead in the
+       code lengths to determine what size sub-table is needed.  The length
+       counts are used for this, and so count[] is decremented as codes are
+       entered in the tables.
+
+       used keeps track of how many table entries have been allocated from the
+       provided *table space.  It is checked for LENS and DIST tables against
+       the constants ENOUGH_LENS and ENOUGH_DISTS to guard against changes in
+       the initial root table size constants.  See the comments in inftrees.h
+       for more information.
+
+       sym increments through all symbols, and the loop terminates when
+       all codes of length max, i.e. all codes, have been processed.  This
+       routine permits incomplete codes, so another loop after this one fills
+       in the rest of the decoding tables with invalid code markers.
+     */
+
+    /* set up for code type */
+    switch (type) {
+    case CODES:
+        base = extra = work;    /* dummy value--not used */
         match = 20;
-        break; 
-    case LENS: 
-        base = lbase; 
-        extra = lext; 
+        break;
+    case LENS:
+        base = lbase;
+        extra = lext;
         match = 257;
-        break; 
+        break;
     default:    /* DISTS */
-        base = dbase; 
-        extra = dext; 
+        base = dbase;
+        extra = dext;
         match = 0;
-    } 
- 
-    /* initialize state for loop */ 
-    huff = 0;                   /* starting code */ 
-    sym = 0;                    /* starting code symbol */ 
-    len = min;                  /* starting code length */ 
-    next = *table;              /* current table to fill in */ 
-    curr = root;                /* current table index bits */ 
-    drop = 0;                   /* current bits to drop from code for index */ 
-    low = (unsigned)(-1);       /* trigger new sub-table when len > root */ 
-    used = 1U << root;          /* use root table entries */ 
-    mask = used - 1;            /* mask for comparing low */ 
- 
-    /* check available table space */ 
-    if ((type == LENS && used > ENOUGH_LENS) || 
-        (type == DISTS && used > ENOUGH_DISTS)) 
-        return 1; 
- 
-    /* process all codes and make table entries */ 
-    for (;;) { 
-        /* create table entry */ 
-        here.bits = (unsigned char)(len - drop); 
+    }
+
+    /* initialize state for loop */
+    huff = 0;                   /* starting code */
+    sym = 0;                    /* starting code symbol */
+    len = min;                  /* starting code length */
+    next = *table;              /* current table to fill in */
+    curr = root;                /* current table index bits */
+    drop = 0;                   /* current bits to drop from code for index */
+    low = (unsigned)(-1);       /* trigger new sub-table when len > root */
+    used = 1U << root;          /* use root table entries */
+    mask = used - 1;            /* mask for comparing low */
+
+    /* check available table space */
+    if ((type == LENS && used > ENOUGH_LENS) ||
+        (type == DISTS && used > ENOUGH_DISTS))
+        return 1;
+
+    /* process all codes and make table entries */
+    for (;;) {
+        /* create table entry */
+        here.bits = (unsigned char)(len - drop);
         if (work[sym] + 1U < match) {
-            here.op = (unsigned char)0; 
-            here.val = work[sym]; 
-        } 
+            here.op = (unsigned char)0;
+            here.val = work[sym];
+        }
         else if (work[sym] >= match) {
             here.op = (unsigned char)(extra[work[sym] - match]);
             here.val = base[work[sym] - match];
-        } 
-        else { 
-            here.op = (unsigned char)(32 + 64);         /* end of block */ 
-            here.val = 0; 
-        } 
- 
-        /* replicate for those indices with low len bits equal to huff */ 
-        incr = 1U << (len - drop); 
-        fill = 1U << curr; 
-        min = fill;                 /* save offset to next table */ 
-        do { 
-            fill -= incr; 
-            next[(huff >> drop) + fill] = here; 
-        } while (fill != 0); 
- 
-        /* backwards increment the len-bit code huff */ 
-        incr = 1U << (len - 1); 
-        while (huff & incr) 
-            incr >>= 1; 
-        if (incr != 0) { 
-            huff &= incr - 1; 
-            huff += incr; 
-        } 
-        else 
-            huff = 0; 
- 
-        /* go to next symbol, update count, len */ 
-        sym++; 
-        if (--(count[len]) == 0) { 
-            if (len == max) break; 
-            len = lens[work[sym]]; 
-        } 
- 
-        /* create new sub-table if needed */ 
-        if (len > root && (huff & mask) != low) { 
-            /* if first time, transition to sub-tables */ 
-            if (drop == 0) 
-                drop = root; 
- 
-            /* increment past last table */ 
-            next += min;            /* here min is 1 << curr */ 
- 
-            /* determine length of next table */ 
-            curr = len - drop; 
-            left = (int)(1 << curr); 
-            while (curr + drop < max) { 
-                left -= count[curr + drop]; 
-                if (left <= 0) break; 
-                curr++; 
-                left <<= 1; 
-            } 
- 
-            /* check for enough space */ 
-            used += 1U << curr; 
-            if ((type == LENS && used > ENOUGH_LENS) || 
-                (type == DISTS && used > ENOUGH_DISTS)) 
-                return 1; 
- 
-            /* point entry in root table to sub-table */ 
-            low = huff & mask; 
-            (*table)[low].op = (unsigned char)curr; 
-            (*table)[low].bits = (unsigned char)root; 
-            (*table)[low].val = (unsigned short)(next - *table); 
-        } 
-    } 
- 
-    /* fill in remaining table entry if code is incomplete (guaranteed to have 
-       at most one remaining entry, since if the code is incomplete, the 
-       maximum code length that was allowed to get this far is one bit) */ 
-    if (huff != 0) { 
-        here.op = (unsigned char)64;            /* invalid code marker */ 
-        here.bits = (unsigned char)(len - drop); 
-        here.val = (unsigned short)0; 
-        next[huff] = here; 
-    } 
- 
-    /* set return parameters */ 
-    *table += used; 
-    *bits = root; 
-    return 0; 
-} 
+        }
+        else {
+            here.op = (unsigned char)(32 + 64);         /* end of block */
+            here.val = 0;
+        }
+
+        /* replicate for those indices with low len bits equal to huff */
+        incr = 1U << (len - drop);
+        fill = 1U << curr;
+        min = fill;                 /* save offset to next table */
+        do {
+            fill -= incr;
+            next[(huff >> drop) + fill] = here;
+        } while (fill != 0);
+
+        /* backwards increment the len-bit code huff */
+        incr = 1U << (len - 1);
+        while (huff & incr)
+            incr >>= 1;
+        if (incr != 0) {
+            huff &= incr - 1;
+            huff += incr;
+        }
+        else
+            huff = 0;
+
+        /* go to next symbol, update count, len */
+        sym++;
+        if (--(count[len]) == 0) {
+            if (len == max) break;
+            len = lens[work[sym]];
+        }
+
+        /* create new sub-table if needed */
+        if (len > root && (huff & mask) != low) {
+            /* if first time, transition to sub-tables */
+            if (drop == 0)
+                drop = root;
+
+            /* increment past last table */
+            next += min;            /* here min is 1 << curr */
+
+            /* determine length of next table */
+            curr = len - drop;
+            left = (int)(1 << curr);
+            while (curr + drop < max) {
+                left -= count[curr + drop];
+                if (left <= 0) break;
+                curr++;
+                left <<= 1;
+            }
+
+            /* check for enough space */
+            used += 1U << curr;
+            if ((type == LENS && used > ENOUGH_LENS) ||
+                (type == DISTS && used > ENOUGH_DISTS))
+                return 1;
+
+            /* point entry in root table to sub-table */
+            low = huff & mask;
+            (*table)[low].op = (unsigned char)curr;
+            (*table)[low].bits = (unsigned char)root;
+            (*table)[low].val = (unsigned short)(next - *table);
+        }
+    }
+
+    /* fill in remaining table entry if code is incomplete (guaranteed to have
+       at most one remaining entry, since if the code is incomplete, the
+       maximum code length that was allowed to get this far is one bit) */
+    if (huff != 0) {
+        here.op = (unsigned char)64;            /* invalid code marker */
+        here.bits = (unsigned char)(len - drop);
+        here.val = (unsigned short)0;
+        next[huff] = here;
+    }
+
+    /* set return parameters */
+    *table += used;
+    *bits = root;
+    return 0;
+}
diff --git a/contrib/libs/zlib/inftrees.h b/contrib/libs/zlib/inftrees.h
index 633144d9da..baa53a0b1a 100644
--- a/contrib/libs/zlib/inftrees.h
+++ b/contrib/libs/zlib/inftrees.h
@@ -1,62 +1,62 @@
-/* inftrees.h -- header to use inftrees.c 
- * Copyright (C) 1995-2005, 2010 Mark Adler 
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */ 
- 
-/* WARNING: this file should *not* be used by applications. It is 
-   part of the implementation of the compression library and is 
-   subject to change. Applications should only use zlib.h. 
- */ 
- 
-/* Structure for decoding tables.  Each entry provides either the 
-   information needed to do the operation requested by the code that 
-   indexed that table entry, or it provides a pointer to another 
-   table that indexes more bits of the code.  op indicates whether 
-   the entry is a pointer to another table, a literal, a length or 
-   distance, an end-of-block, or an invalid code.  For a table 
-   pointer, the low four bits of op is the number of index bits of 
-   that table.  For a length or distance, the low four bits of op 
-   is the number of extra bits to get after the code.  bits is 
-   the number of bits in this code or part of the code to drop off 
-   of the bit buffer.  val is the actual byte to output in the case 
-   of a literal, the base length or distance, or the offset from 
-   the current table to the next table.  Each entry is four bytes. */ 
-typedef struct { 
-    unsigned char op;           /* operation, extra bits, table bits */ 
-    unsigned char bits;         /* bits in this part of the code */ 
-    unsigned short val;         /* offset in table or code value */ 
-} code; 
- 
-/* op values as set by inflate_table(): 
-    00000000 - literal 
-    0000tttt - table link, tttt != 0 is the number of table index bits 
-    0001eeee - length or distance, eeee is the number of extra bits 
-    01100000 - end of block 
-    01000000 - invalid code 
- */ 
- 
-/* Maximum size of the dynamic table.  The maximum number of code structures is 
-   1444, which is the sum of 852 for literal/length codes and 592 for distance 
-   codes.  These values were found by exhaustive searches using the program 
-   examples/enough.c found in the zlib distribtution.  The arguments to that 
-   program are the number of symbols, the initial root table size, and the 
-   maximum bit length of a code.  "enough 286 9 15" for literal/length codes 
-   returns returns 852, and "enough 30 6 15" for distance codes returns 592. 
-   The initial root table size (9 or 6) is found in the fifth argument of the 
-   inflate_table() calls in inflate.c and infback.c.  If the root table size is 
-   changed, then these maximum sizes would be need to be recalculated and 
-   updated. */ 
-#define ENOUGH_LENS 852 
-#define ENOUGH_DISTS 592 
-#define ENOUGH (ENOUGH_LENS+ENOUGH_DISTS) 
- 
-/* Type of code to build for inflate_table() */ 
-typedef enum { 
-    CODES, 
-    LENS, 
-    DISTS 
-} codetype; 
- 
-int ZLIB_INTERNAL inflate_table OF((codetype type, unsigned short FAR *lens, 
-                             unsigned codes, code FAR * FAR *table, 
-                             unsigned FAR *bits, unsigned short FAR *work)); 
+/* inftrees.h -- header to use inftrees.c
+ * Copyright (C) 1995-2005, 2010 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+/* Structure for decoding tables.  Each entry provides either the
+   information needed to do the operation requested by the code that
+   indexed that table entry, or it provides a pointer to another
+   table that indexes more bits of the code.  op indicates whether
+   the entry is a pointer to another table, a literal, a length or
+   distance, an end-of-block, or an invalid code.  For a table
+   pointer, the low four bits of op is the number of index bits of
+   that table.  For a length or distance, the low four bits of op
+   is the number of extra bits to get after the code.  bits is
+   the number of bits in this code or part of the code to drop off
+   of the bit buffer.  val is the actual byte to output in the case
+   of a literal, the base length or distance, or the offset from
+   the current table to the next table.  Each entry is four bytes. */
+typedef struct {
+    unsigned char op;           /* operation, extra bits, table bits */
+    unsigned char bits;         /* bits in this part of the code */
+    unsigned short val;         /* offset in table or code value */
+} code;
+
+/* op values as set by inflate_table():
+    00000000 - literal
+    0000tttt - table link, tttt != 0 is the number of table index bits
+    0001eeee - length or distance, eeee is the number of extra bits
+    01100000 - end of block
+    01000000 - invalid code
+ */
+
+/* Maximum size of the dynamic table.  The maximum number of code structures is
+   1444, which is the sum of 852 for literal/length codes and 592 for distance
+   codes.  These values were found by exhaustive searches using the program
+   examples/enough.c found in the zlib distribtution.  The arguments to that
+   program are the number of symbols, the initial root table size, and the
+   maximum bit length of a code.  "enough 286 9 15" for literal/length codes
+   returns returns 852, and "enough 30 6 15" for distance codes returns 592.
+   The initial root table size (9 or 6) is found in the fifth argument of the
+   inflate_table() calls in inflate.c and infback.c.  If the root table size is
+   changed, then these maximum sizes would be need to be recalculated and
+   updated. */
+#define ENOUGH_LENS 852
+#define ENOUGH_DISTS 592
+#define ENOUGH (ENOUGH_LENS+ENOUGH_DISTS)
+
+/* Type of code to build for inflate_table() */
+typedef enum {
+    CODES,
+    LENS,
+    DISTS
+} codetype;
+
+int ZLIB_INTERNAL inflate_table OF((codetype type, unsigned short FAR *lens,
+                             unsigned codes, code FAR * FAR *table,
+                             unsigned FAR *bits, unsigned short FAR *work));
diff --git a/contrib/libs/zlib/trees.c b/contrib/libs/zlib/trees.c
index 5a28296f30..912f59dc55 100644
--- a/contrib/libs/zlib/trees.c
+++ b/contrib/libs/zlib/trees.c
@@ -1,872 +1,872 @@
-/* trees.c -- output deflated data using Huffman coding 
+/* trees.c -- output deflated data using Huffman coding
  * Copyright (C) 1995-2017 Jean-loup Gailly
- * detect_data_type() function provided freely by Cosmin Truta, 2006 
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */ 
- 
-/* 
- *  ALGORITHM 
- * 
- *      The "deflation" process uses several Huffman trees. The more 
- *      common source values are represented by shorter bit sequences. 
- * 
- *      Each code tree is stored in a compressed form which is itself 
- * a Huffman encoding of the lengths of all the code strings (in 
- * ascending order by source values).  The actual code strings are 
- * reconstructed from the lengths in the inflate process, as described 
- * in the deflate specification. 
- * 
- *  REFERENCES 
- * 
- *      Deutsch, L.P.,"'Deflate' Compressed Data Format Specification". 
- *      Available in ftp.uu.net:/pub/archiving/zip/doc/deflate-1.1.doc 
- * 
- *      Storer, James A. 
- *          Data Compression:  Methods and Theory, pp. 49-50. 
- *          Computer Science Press, 1988.  ISBN 0-7167-8156-5. 
- * 
- *      Sedgewick, R. 
- *          Algorithms, p290. 
- *          Addison-Wesley, 1983. ISBN 0-201-06672-6. 
- */ 
- 
-/* @(#) $Id$ */ 
- 
-/* #define GEN_TREES_H */ 
- 
-#include "deflate.h" 
- 
+ * detect_data_type() function provided freely by Cosmin Truta, 2006
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/*
+ *  ALGORITHM
+ *
+ *      The "deflation" process uses several Huffman trees. The more
+ *      common source values are represented by shorter bit sequences.
+ *
+ *      Each code tree is stored in a compressed form which is itself
+ * a Huffman encoding of the lengths of all the code strings (in
+ * ascending order by source values).  The actual code strings are
+ * reconstructed from the lengths in the inflate process, as described
+ * in the deflate specification.
+ *
+ *  REFERENCES
+ *
+ *      Deutsch, L.P.,"'Deflate' Compressed Data Format Specification".
+ *      Available in ftp.uu.net:/pub/archiving/zip/doc/deflate-1.1.doc
+ *
+ *      Storer, James A.
+ *          Data Compression:  Methods and Theory, pp. 49-50.
+ *          Computer Science Press, 1988.  ISBN 0-7167-8156-5.
+ *
+ *      Sedgewick, R.
+ *          Algorithms, p290.
+ *          Addison-Wesley, 1983. ISBN 0-201-06672-6.
+ */
+
+/* @(#) $Id$ */
+
+/* #define GEN_TREES_H */
+
+#include "deflate.h"
+
 #ifdef ZLIB_DEBUG
-#  include <ctype.h> 
-#endif 
- 
-/* =========================================================================== 
- * Constants 
- */ 
- 
-#define MAX_BL_BITS 7 
-/* Bit length codes must not exceed MAX_BL_BITS bits */ 
- 
-#define END_BLOCK 256 
-/* end of block literal code */ 
- 
-#define REP_3_6      16 
-/* repeat previous bit length 3-6 times (2 bits of repeat count) */ 
- 
-#define REPZ_3_10    17 
-/* repeat a zero length 3-10 times  (3 bits of repeat count) */ 
- 
-#define REPZ_11_138  18 
-/* repeat a zero length 11-138 times  (7 bits of repeat count) */ 
- 
-local const int extra_lbits[LENGTH_CODES] /* extra bits for each length code */ 
-   = {0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0}; 
- 
-local const int extra_dbits[D_CODES] /* extra bits for each distance code */ 
-   = {0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13}; 
- 
-local const int extra_blbits[BL_CODES]/* extra bits for each bit length code */ 
-   = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7}; 
- 
-local const uch bl_order[BL_CODES] 
-   = {16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15}; 
-/* The lengths of the bit length codes are sent in order of decreasing 
- * probability, to avoid transmitting the lengths for unused bit length codes. 
- */ 
- 
-/* =========================================================================== 
- * Local data. These are initialized only once. 
- */ 
- 
-#define DIST_CODE_LEN  512 /* see definition of array dist_code below */ 
- 
-#if defined(GEN_TREES_H) || !defined(STDC) 
-/* non ANSI compilers may not accept trees.h */ 
- 
-local ct_data static_ltree[L_CODES+2]; 
-/* The static literal tree. Since the bit lengths are imposed, there is no 
- * need for the L_CODES extra codes used during heap construction. However 
- * The codes 286 and 287 are needed to build a canonical tree (see _tr_init 
- * below). 
- */ 
- 
-local ct_data static_dtree[D_CODES]; 
-/* The static distance tree. (Actually a trivial tree since all codes use 
- * 5 bits.) 
- */ 
- 
-uch _dist_code[DIST_CODE_LEN]; 
-/* Distance codes. The first 256 values correspond to the distances 
- * 3 .. 258, the last 256 values correspond to the top 8 bits of 
- * the 15 bit distances. 
- */ 
- 
-uch _length_code[MAX_MATCH-MIN_MATCH+1]; 
-/* length code for each normalized match length (0 == MIN_MATCH) */ 
- 
-local int base_length[LENGTH_CODES]; 
-/* First normalized length for each code (0 = MIN_MATCH) */ 
- 
-local int base_dist[D_CODES]; 
-/* First normalized distance for each code (0 = distance of 1) */ 
- 
-#else 
-#  include "trees.h" 
-#endif /* GEN_TREES_H */ 
- 
-struct static_tree_desc_s { 
-    const ct_data *static_tree;  /* static tree or NULL */ 
-    const intf *extra_bits;      /* extra bits for each code or NULL */ 
-    int     extra_base;          /* base index for extra_bits */ 
-    int     elems;               /* max number of elements in the tree */ 
-    int     max_length;          /* max bit length for the codes */ 
-}; 
- 
+#  include <ctype.h>
+#endif
+
+/* ===========================================================================
+ * Constants
+ */
+
+#define MAX_BL_BITS 7
+/* Bit length codes must not exceed MAX_BL_BITS bits */
+
+#define END_BLOCK 256
+/* end of block literal code */
+
+#define REP_3_6      16
+/* repeat previous bit length 3-6 times (2 bits of repeat count) */
+
+#define REPZ_3_10    17
+/* repeat a zero length 3-10 times  (3 bits of repeat count) */
+
+#define REPZ_11_138  18
+/* repeat a zero length 11-138 times  (7 bits of repeat count) */
+
+local const int extra_lbits[LENGTH_CODES] /* extra bits for each length code */
+   = {0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0};
+
+local const int extra_dbits[D_CODES] /* extra bits for each distance code */
+   = {0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13};
+
+local const int extra_blbits[BL_CODES]/* extra bits for each bit length code */
+   = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7};
+
+local const uch bl_order[BL_CODES]
+   = {16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15};
+/* The lengths of the bit length codes are sent in order of decreasing
+ * probability, to avoid transmitting the lengths for unused bit length codes.
+ */
+
+/* ===========================================================================
+ * Local data. These are initialized only once.
+ */
+
+#define DIST_CODE_LEN  512 /* see definition of array dist_code below */
+
+#if defined(GEN_TREES_H) || !defined(STDC)
+/* non ANSI compilers may not accept trees.h */
+
+local ct_data static_ltree[L_CODES+2];
+/* The static literal tree. Since the bit lengths are imposed, there is no
+ * need for the L_CODES extra codes used during heap construction. However
+ * The codes 286 and 287 are needed to build a canonical tree (see _tr_init
+ * below).
+ */
+
+local ct_data static_dtree[D_CODES];
+/* The static distance tree. (Actually a trivial tree since all codes use
+ * 5 bits.)
+ */
+
+uch _dist_code[DIST_CODE_LEN];
+/* Distance codes. The first 256 values correspond to the distances
+ * 3 .. 258, the last 256 values correspond to the top 8 bits of
+ * the 15 bit distances.
+ */
+
+uch _length_code[MAX_MATCH-MIN_MATCH+1];
+/* length code for each normalized match length (0 == MIN_MATCH) */
+
+local int base_length[LENGTH_CODES];
+/* First normalized length for each code (0 = MIN_MATCH) */
+
+local int base_dist[D_CODES];
+/* First normalized distance for each code (0 = distance of 1) */
+
+#else
+#  include "trees.h"
+#endif /* GEN_TREES_H */
+
+struct static_tree_desc_s {
+    const ct_data *static_tree;  /* static tree or NULL */
+    const intf *extra_bits;      /* extra bits for each code or NULL */
+    int     extra_base;          /* base index for extra_bits */
+    int     elems;               /* max number of elements in the tree */
+    int     max_length;          /* max bit length for the codes */
+};
+
 local const static_tree_desc  static_l_desc =
-{static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS}; 
- 
+{static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS};
+
 local const static_tree_desc  static_d_desc =
-{static_dtree, extra_dbits, 0,          D_CODES, MAX_BITS}; 
- 
+{static_dtree, extra_dbits, 0,          D_CODES, MAX_BITS};
+
 local const static_tree_desc  static_bl_desc =
-{(const ct_data *)0, extra_blbits, 0,   BL_CODES, MAX_BL_BITS}; 
- 
-/* =========================================================================== 
- * Local (static) routines in this file. 
- */ 
- 
-local void tr_static_init OF((void)); 
-local void init_block     OF((deflate_state *s)); 
-local void pqdownheap     OF((deflate_state *s, ct_data *tree, int k)); 
-local void gen_bitlen     OF((deflate_state *s, tree_desc *desc)); 
-local void gen_codes      OF((ct_data *tree, int max_code, ushf *bl_count)); 
-local void build_tree     OF((deflate_state *s, tree_desc *desc)); 
-local void scan_tree      OF((deflate_state *s, ct_data *tree, int max_code)); 
-local void send_tree      OF((deflate_state *s, ct_data *tree, int max_code)); 
-local int  build_bl_tree  OF((deflate_state *s)); 
-local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes, 
-                              int blcodes)); 
-local void compress_block OF((deflate_state *s, const ct_data *ltree, 
-                              const ct_data *dtree)); 
-local int  detect_data_type OF((deflate_state *s)); 
-local unsigned bi_reverse OF((unsigned value, int length)); 
-local void bi_windup      OF((deflate_state *s)); 
-local void bi_flush       OF((deflate_state *s)); 
- 
-#ifdef GEN_TREES_H 
-local void gen_trees_header OF((void)); 
-#endif 
- 
+{(const ct_data *)0, extra_blbits, 0,   BL_CODES, MAX_BL_BITS};
+
+/* ===========================================================================
+ * Local (static) routines in this file.
+ */
+
+local void tr_static_init OF((void));
+local void init_block     OF((deflate_state *s));
+local void pqdownheap     OF((deflate_state *s, ct_data *tree, int k));
+local void gen_bitlen     OF((deflate_state *s, tree_desc *desc));
+local void gen_codes      OF((ct_data *tree, int max_code, ushf *bl_count));
+local void build_tree     OF((deflate_state *s, tree_desc *desc));
+local void scan_tree      OF((deflate_state *s, ct_data *tree, int max_code));
+local void send_tree      OF((deflate_state *s, ct_data *tree, int max_code));
+local int  build_bl_tree  OF((deflate_state *s));
+local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes,
+                              int blcodes));
+local void compress_block OF((deflate_state *s, const ct_data *ltree,
+                              const ct_data *dtree));
+local int  detect_data_type OF((deflate_state *s));
+local unsigned bi_reverse OF((unsigned value, int length));
+local void bi_windup      OF((deflate_state *s));
+local void bi_flush       OF((deflate_state *s));
+
+#ifdef GEN_TREES_H
+local void gen_trees_header OF((void));
+#endif
+
 #ifndef ZLIB_DEBUG
-#  define send_code(s, c, tree) send_bits(s, tree[c].Code, tree[c].Len) 
-   /* Send a code of the given tree. c and tree must not have side effects */ 
- 
+#  define send_code(s, c, tree) send_bits(s, tree[c].Code, tree[c].Len)
+   /* Send a code of the given tree. c and tree must not have side effects */
+
 #else /* !ZLIB_DEBUG */
-#  define send_code(s, c, tree) \ 
-     { if (z_verbose>2) fprintf(stderr,"\ncd %3d ",(c)); \ 
-       send_bits(s, tree[c].Code, tree[c].Len); } 
-#endif 
- 
-/* =========================================================================== 
- * Output a short LSB first on the stream. 
- * IN assertion: there is enough room in pendingBuf. 
- */ 
-#define put_short(s, w) { \ 
-    put_byte(s, (uch)((w) & 0xff)); \ 
-    put_byte(s, (uch)((ush)(w) >> 8)); \ 
-} 
- 
-/* =========================================================================== 
- * Send a value on a given number of bits. 
- * IN assertion: length <= 16 and value fits in length bits. 
- */ 
+#  define send_code(s, c, tree) \
+     { if (z_verbose>2) fprintf(stderr,"\ncd %3d ",(c)); \
+       send_bits(s, tree[c].Code, tree[c].Len); }
+#endif
+
+/* ===========================================================================
+ * Output a short LSB first on the stream.
+ * IN assertion: there is enough room in pendingBuf.
+ */
+#define put_short(s, w) { \
+    put_byte(s, (uch)((w) & 0xff)); \
+    put_byte(s, (uch)((ush)(w) >> 8)); \
+}
+
+/* ===========================================================================
+ * Send a value on a given number of bits.
+ * IN assertion: length <= 16 and value fits in length bits.
+ */
 #ifdef ZLIB_DEBUG
-local void send_bits      OF((deflate_state *s, int value, int length)); 
- 
-local void send_bits(s, value, length) 
-    deflate_state *s; 
-    int value;  /* value to send */ 
-    int length; /* number of bits */ 
-{ 
-    Tracevv((stderr," l %2d v %4x ", length, value)); 
-    Assert(length > 0 && length <= 15, "invalid length"); 
-    s->bits_sent += (ulg)length; 
- 
-    /* If not enough room in bi_buf, use (valid) bits from bi_buf and 
-     * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid)) 
-     * unused bits in value. 
-     */ 
-    if (s->bi_valid > (int)Buf_size - length) { 
-        s->bi_buf |= (ush)value << s->bi_valid; 
-        put_short(s, s->bi_buf); 
-        s->bi_buf = (ush)value >> (Buf_size - s->bi_valid); 
-        s->bi_valid += length - Buf_size; 
-    } else { 
-        s->bi_buf |= (ush)value << s->bi_valid; 
-        s->bi_valid += length; 
-    } 
-} 
+local void send_bits      OF((deflate_state *s, int value, int length));
+
+local void send_bits(s, value, length)
+    deflate_state *s;
+    int value;  /* value to send */
+    int length; /* number of bits */
+{
+    Tracevv((stderr," l %2d v %4x ", length, value));
+    Assert(length > 0 && length <= 15, "invalid length");
+    s->bits_sent += (ulg)length;
+
+    /* If not enough room in bi_buf, use (valid) bits from bi_buf and
+     * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid))
+     * unused bits in value.
+     */
+    if (s->bi_valid > (int)Buf_size - length) {
+        s->bi_buf |= (ush)value << s->bi_valid;
+        put_short(s, s->bi_buf);
+        s->bi_buf = (ush)value >> (Buf_size - s->bi_valid);
+        s->bi_valid += length - Buf_size;
+    } else {
+        s->bi_buf |= (ush)value << s->bi_valid;
+        s->bi_valid += length;
+    }
+}
 #else /* !ZLIB_DEBUG */
- 
-#define send_bits(s, value, length) \ 
-{ int len = length;\ 
-  if (s->bi_valid > (int)Buf_size - len) {\ 
+
+#define send_bits(s, value, length) \
+{ int len = length;\
+  if (s->bi_valid > (int)Buf_size - len) {\
     int val = (int)value;\
-    s->bi_buf |= (ush)val << s->bi_valid;\ 
-    put_short(s, s->bi_buf);\ 
-    s->bi_buf = (ush)val >> (Buf_size - s->bi_valid);\ 
-    s->bi_valid += len - Buf_size;\ 
-  } else {\ 
-    s->bi_buf |= (ush)(value) << s->bi_valid;\ 
-    s->bi_valid += len;\ 
-  }\ 
-} 
+    s->bi_buf |= (ush)val << s->bi_valid;\
+    put_short(s, s->bi_buf);\
+    s->bi_buf = (ush)val >> (Buf_size - s->bi_valid);\
+    s->bi_valid += len - Buf_size;\
+  } else {\
+    s->bi_buf |= (ush)(value) << s->bi_valid;\
+    s->bi_valid += len;\
+  }\
+}
 #endif /* ZLIB_DEBUG */
- 
- 
-/* the arguments must not have side effects */ 
- 
-/* =========================================================================== 
- * Initialize the various 'constant' tables. 
- */ 
-local void tr_static_init() 
-{ 
-#if defined(GEN_TREES_H) || !defined(STDC) 
-    static int static_init_done = 0; 
-    int n;        /* iterates over tree elements */ 
-    int bits;     /* bit counter */ 
-    int length;   /* length value */ 
-    int code;     /* code value */ 
-    int dist;     /* distance index */ 
-    ush bl_count[MAX_BITS+1]; 
-    /* number of codes at each bit length for an optimal tree */ 
- 
-    if (static_init_done) return; 
- 
-    /* For some embedded targets, global variables are not initialized: */ 
-#ifdef NO_INIT_GLOBAL_POINTERS 
-    static_l_desc.static_tree = static_ltree; 
-    static_l_desc.extra_bits = extra_lbits; 
-    static_d_desc.static_tree = static_dtree; 
-    static_d_desc.extra_bits = extra_dbits; 
-    static_bl_desc.extra_bits = extra_blbits; 
-#endif 
- 
-    /* Initialize the mapping length (0..255) -> length code (0..28) */ 
-    length = 0; 
-    for (code = 0; code < LENGTH_CODES-1; code++) { 
-        base_length[code] = length; 
-        for (n = 0; n < (1<<extra_lbits[code]); n++) { 
-            _length_code[length++] = (uch)code; 
-        } 
-    } 
-    Assert (length == 256, "tr_static_init: length != 256"); 
-    /* Note that the length 255 (match length 258) can be represented 
-     * in two different ways: code 284 + 5 bits or code 285, so we 
-     * overwrite length_code[255] to use the best encoding: 
-     */ 
-    _length_code[length-1] = (uch)code; 
- 
-    /* Initialize the mapping dist (0..32K) -> dist code (0..29) */ 
-    dist = 0; 
-    for (code = 0 ; code < 16; code++) { 
-        base_dist[code] = dist; 
-        for (n = 0; n < (1<<extra_dbits[code]); n++) { 
-            _dist_code[dist++] = (uch)code; 
-        } 
-    } 
-    Assert (dist == 256, "tr_static_init: dist != 256"); 
-    dist >>= 7; /* from now on, all distances are divided by 128 */ 
-    for ( ; code < D_CODES; code++) { 
-        base_dist[code] = dist << 7; 
-        for (n = 0; n < (1<<(extra_dbits[code]-7)); n++) { 
-            _dist_code[256 + dist++] = (uch)code; 
-        } 
-    } 
-    Assert (dist == 256, "tr_static_init: 256+dist != 512"); 
- 
-    /* Construct the codes of the static literal tree */ 
-    for (bits = 0; bits <= MAX_BITS; bits++) bl_count[bits] = 0; 
-    n = 0; 
-    while (n <= 143) static_ltree[n++].Len = 8, bl_count[8]++; 
-    while (n <= 255) static_ltree[n++].Len = 9, bl_count[9]++; 
-    while (n <= 279) static_ltree[n++].Len = 7, bl_count[7]++; 
-    while (n <= 287) static_ltree[n++].Len = 8, bl_count[8]++; 
-    /* Codes 286 and 287 do not exist, but we must include them in the 
-     * tree construction to get a canonical Huffman tree (longest code 
-     * all ones) 
-     */ 
-    gen_codes((ct_data *)static_ltree, L_CODES+1, bl_count); 
- 
-    /* The static distance tree is trivial: */ 
-    for (n = 0; n < D_CODES; n++) { 
-        static_dtree[n].Len = 5; 
-        static_dtree[n].Code = bi_reverse((unsigned)n, 5); 
-    } 
-    static_init_done = 1; 
- 
-#  ifdef GEN_TREES_H 
-    gen_trees_header(); 
-#  endif 
-#endif /* defined(GEN_TREES_H) || !defined(STDC) */ 
-} 
- 
-/* =========================================================================== 
- * Genererate the file trees.h describing the static trees. 
- */ 
-#ifdef GEN_TREES_H 
+
+
+/* the arguments must not have side effects */
+
+/* ===========================================================================
+ * Initialize the various 'constant' tables.
+ */
+local void tr_static_init()
+{
+#if defined(GEN_TREES_H) || !defined(STDC)
+    static int static_init_done = 0;
+    int n;        /* iterates over tree elements */
+    int bits;     /* bit counter */
+    int length;   /* length value */
+    int code;     /* code value */
+    int dist;     /* distance index */
+    ush bl_count[MAX_BITS+1];
+    /* number of codes at each bit length for an optimal tree */
+
+    if (static_init_done) return;
+
+    /* For some embedded targets, global variables are not initialized: */
+#ifdef NO_INIT_GLOBAL_POINTERS
+    static_l_desc.static_tree = static_ltree;
+    static_l_desc.extra_bits = extra_lbits;
+    static_d_desc.static_tree = static_dtree;
+    static_d_desc.extra_bits = extra_dbits;
+    static_bl_desc.extra_bits = extra_blbits;
+#endif
+
+    /* Initialize the mapping length (0..255) -> length code (0..28) */
+    length = 0;
+    for (code = 0; code < LENGTH_CODES-1; code++) {
+        base_length[code] = length;
+        for (n = 0; n < (1<<extra_lbits[code]); n++) {
+            _length_code[length++] = (uch)code;
+        }
+    }
+    Assert (length == 256, "tr_static_init: length != 256");
+    /* Note that the length 255 (match length 258) can be represented
+     * in two different ways: code 284 + 5 bits or code 285, so we
+     * overwrite length_code[255] to use the best encoding:
+     */
+    _length_code[length-1] = (uch)code;
+
+    /* Initialize the mapping dist (0..32K) -> dist code (0..29) */
+    dist = 0;
+    for (code = 0 ; code < 16; code++) {
+        base_dist[code] = dist;
+        for (n = 0; n < (1<<extra_dbits[code]); n++) {
+            _dist_code[dist++] = (uch)code;
+        }
+    }
+    Assert (dist == 256, "tr_static_init: dist != 256");
+    dist >>= 7; /* from now on, all distances are divided by 128 */
+    for ( ; code < D_CODES; code++) {
+        base_dist[code] = dist << 7;
+        for (n = 0; n < (1<<(extra_dbits[code]-7)); n++) {
+            _dist_code[256 + dist++] = (uch)code;
+        }
+    }
+    Assert (dist == 256, "tr_static_init: 256+dist != 512");
+
+    /* Construct the codes of the static literal tree */
+    for (bits = 0; bits <= MAX_BITS; bits++) bl_count[bits] = 0;
+    n = 0;
+    while (n <= 143) static_ltree[n++].Len = 8, bl_count[8]++;
+    while (n <= 255) static_ltree[n++].Len = 9, bl_count[9]++;
+    while (n <= 279) static_ltree[n++].Len = 7, bl_count[7]++;
+    while (n <= 287) static_ltree[n++].Len = 8, bl_count[8]++;
+    /* Codes 286 and 287 do not exist, but we must include them in the
+     * tree construction to get a canonical Huffman tree (longest code
+     * all ones)
+     */
+    gen_codes((ct_data *)static_ltree, L_CODES+1, bl_count);
+
+    /* The static distance tree is trivial: */
+    for (n = 0; n < D_CODES; n++) {
+        static_dtree[n].Len = 5;
+        static_dtree[n].Code = bi_reverse((unsigned)n, 5);
+    }
+    static_init_done = 1;
+
+#  ifdef GEN_TREES_H
+    gen_trees_header();
+#  endif
+#endif /* defined(GEN_TREES_H) || !defined(STDC) */
+}
+
+/* ===========================================================================
+ * Genererate the file trees.h describing the static trees.
+ */
+#ifdef GEN_TREES_H
 #  ifndef ZLIB_DEBUG
-#    include <stdio.h> 
-#  endif 
- 
-#  define SEPARATOR(i, last, width) \ 
-      ((i) == (last)? "\n};\n\n" :    \ 
-       ((i) % (width) == (width)-1 ? ",\n" : ", ")) 
- 
-void gen_trees_header() 
-{ 
-    FILE *header = fopen("trees.h", "w"); 
-    int i; 
- 
-    Assert (header != NULL, "Can't open trees.h"); 
-    fprintf(header, 
-            "/* header created automatically with -DGEN_TREES_H */\n\n"); 
- 
-    fprintf(header, "local const ct_data static_ltree[L_CODES+2] = {\n"); 
-    for (i = 0; i < L_CODES+2; i++) { 
-        fprintf(header, "{{%3u},{%3u}}%s", static_ltree[i].Code, 
-                static_ltree[i].Len, SEPARATOR(i, L_CODES+1, 5)); 
-    } 
- 
-    fprintf(header, "local const ct_data static_dtree[D_CODES] = {\n"); 
-    for (i = 0; i < D_CODES; i++) { 
-        fprintf(header, "{{%2u},{%2u}}%s", static_dtree[i].Code, 
-                static_dtree[i].Len, SEPARATOR(i, D_CODES-1, 5)); 
-    } 
- 
-    fprintf(header, "const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = {\n"); 
-    for (i = 0; i < DIST_CODE_LEN; i++) { 
-        fprintf(header, "%2u%s", _dist_code[i], 
-                SEPARATOR(i, DIST_CODE_LEN-1, 20)); 
-    } 
- 
-    fprintf(header, 
-        "const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= {\n"); 
-    for (i = 0; i < MAX_MATCH-MIN_MATCH+1; i++) { 
-        fprintf(header, "%2u%s", _length_code[i], 
-                SEPARATOR(i, MAX_MATCH-MIN_MATCH, 20)); 
-    } 
- 
-    fprintf(header, "local const int base_length[LENGTH_CODES] = {\n"); 
-    for (i = 0; i < LENGTH_CODES; i++) { 
-        fprintf(header, "%1u%s", base_length[i], 
-                SEPARATOR(i, LENGTH_CODES-1, 20)); 
-    } 
- 
-    fprintf(header, "local const int base_dist[D_CODES] = {\n"); 
-    for (i = 0; i < D_CODES; i++) { 
-        fprintf(header, "%5u%s", base_dist[i], 
-                SEPARATOR(i, D_CODES-1, 10)); 
-    } 
- 
-    fclose(header); 
-} 
-#endif /* GEN_TREES_H */ 
- 
-/* =========================================================================== 
- * Initialize the tree data structures for a new zlib stream. 
- */ 
-void ZLIB_INTERNAL _tr_init(s) 
-    deflate_state *s; 
-{ 
-    tr_static_init(); 
- 
-    s->l_desc.dyn_tree = s->dyn_ltree; 
-    s->l_desc.stat_desc = &static_l_desc; 
- 
-    s->d_desc.dyn_tree = s->dyn_dtree; 
-    s->d_desc.stat_desc = &static_d_desc; 
- 
-    s->bl_desc.dyn_tree = s->bl_tree; 
-    s->bl_desc.stat_desc = &static_bl_desc; 
- 
-    s->bi_buf = 0; 
-    s->bi_valid = 0; 
+#    include <stdio.h>
+#  endif
+
+#  define SEPARATOR(i, last, width) \
+      ((i) == (last)? "\n};\n\n" :    \
+       ((i) % (width) == (width)-1 ? ",\n" : ", "))
+
+void gen_trees_header()
+{
+    FILE *header = fopen("trees.h", "w");
+    int i;
+
+    Assert (header != NULL, "Can't open trees.h");
+    fprintf(header,
+            "/* header created automatically with -DGEN_TREES_H */\n\n");
+
+    fprintf(header, "local const ct_data static_ltree[L_CODES+2] = {\n");
+    for (i = 0; i < L_CODES+2; i++) {
+        fprintf(header, "{{%3u},{%3u}}%s", static_ltree[i].Code,
+                static_ltree[i].Len, SEPARATOR(i, L_CODES+1, 5));
+    }
+
+    fprintf(header, "local const ct_data static_dtree[D_CODES] = {\n");
+    for (i = 0; i < D_CODES; i++) {
+        fprintf(header, "{{%2u},{%2u}}%s", static_dtree[i].Code,
+                static_dtree[i].Len, SEPARATOR(i, D_CODES-1, 5));
+    }
+
+    fprintf(header, "const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = {\n");
+    for (i = 0; i < DIST_CODE_LEN; i++) {
+        fprintf(header, "%2u%s", _dist_code[i],
+                SEPARATOR(i, DIST_CODE_LEN-1, 20));
+    }
+
+    fprintf(header,
+        "const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= {\n");
+    for (i = 0; i < MAX_MATCH-MIN_MATCH+1; i++) {
+        fprintf(header, "%2u%s", _length_code[i],
+                SEPARATOR(i, MAX_MATCH-MIN_MATCH, 20));
+    }
+
+    fprintf(header, "local const int base_length[LENGTH_CODES] = {\n");
+    for (i = 0; i < LENGTH_CODES; i++) {
+        fprintf(header, "%1u%s", base_length[i],
+                SEPARATOR(i, LENGTH_CODES-1, 20));
+    }
+
+    fprintf(header, "local const int base_dist[D_CODES] = {\n");
+    for (i = 0; i < D_CODES; i++) {
+        fprintf(header, "%5u%s", base_dist[i],
+                SEPARATOR(i, D_CODES-1, 10));
+    }
+
+    fclose(header);
+}
+#endif /* GEN_TREES_H */
+
+/* ===========================================================================
+ * Initialize the tree data structures for a new zlib stream.
+ */
+void ZLIB_INTERNAL _tr_init(s)
+    deflate_state *s;
+{
+    tr_static_init();
+
+    s->l_desc.dyn_tree = s->dyn_ltree;
+    s->l_desc.stat_desc = &static_l_desc;
+
+    s->d_desc.dyn_tree = s->dyn_dtree;
+    s->d_desc.stat_desc = &static_d_desc;
+
+    s->bl_desc.dyn_tree = s->bl_tree;
+    s->bl_desc.stat_desc = &static_bl_desc;
+
+    s->bi_buf = 0;
+    s->bi_valid = 0;
 #ifdef ZLIB_DEBUG
-    s->compressed_len = 0L; 
-    s->bits_sent = 0L; 
-#endif 
- 
-    /* Initialize the first block of the first file: */ 
-    init_block(s); 
-} 
- 
-/* =========================================================================== 
- * Initialize a new block. 
- */ 
-local void init_block(s) 
-    deflate_state *s; 
-{ 
-    int n; /* iterates over tree elements */ 
- 
-    /* Initialize the trees. */ 
-    for (n = 0; n < L_CODES;  n++) s->dyn_ltree[n].Freq = 0; 
-    for (n = 0; n < D_CODES;  n++) s->dyn_dtree[n].Freq = 0; 
-    for (n = 0; n < BL_CODES; n++) s->bl_tree[n].Freq = 0; 
- 
-    s->dyn_ltree[END_BLOCK].Freq = 1; 
-    s->opt_len = s->static_len = 0L; 
-    s->last_lit = s->matches = 0; 
-} 
- 
-#define SMALLEST 1 
-/* Index within the heap array of least frequent node in the Huffman tree */ 
- 
- 
-/* =========================================================================== 
- * Remove the smallest element from the heap and recreate the heap with 
- * one less element. Updates heap and heap_len. 
- */ 
-#define pqremove(s, tree, top) \ 
-{\ 
-    top = s->heap[SMALLEST]; \ 
-    s->heap[SMALLEST] = s->heap[s->heap_len--]; \ 
-    pqdownheap(s, tree, SMALLEST); \ 
-} 
- 
-/* =========================================================================== 
- * Compares to subtrees, using the tree depth as tie breaker when 
- * the subtrees have equal frequency. This minimizes the worst case length. 
- */ 
-#define smaller(tree, n, m, depth) \ 
-   (tree[n].Freq < tree[m].Freq || \ 
-   (tree[n].Freq == tree[m].Freq && depth[n] <= depth[m])) 
- 
-/* =========================================================================== 
- * Restore the heap property by moving down the tree starting at node k, 
- * exchanging a node with the smallest of its two sons if necessary, stopping 
- * when the heap property is re-established (each father smaller than its 
- * two sons). 
- */ 
-local void pqdownheap(s, tree, k) 
-    deflate_state *s; 
-    ct_data *tree;  /* the tree to restore */ 
-    int k;               /* node to move down */ 
-{ 
-    int v = s->heap[k]; 
-    int j = k << 1;  /* left son of k */ 
-    while (j <= s->heap_len) { 
-        /* Set j to the smallest of the two sons: */ 
-        if (j < s->heap_len && 
-            smaller(tree, s->heap[j+1], s->heap[j], s->depth)) { 
-            j++; 
-        } 
-        /* Exit if v is smaller than both sons */ 
-        if (smaller(tree, v, s->heap[j], s->depth)) break; 
- 
-        /* Exchange v with the smallest son */ 
-        s->heap[k] = s->heap[j];  k = j; 
- 
-        /* And continue down the tree, setting j to the left son of k */ 
-        j <<= 1; 
-    } 
-    s->heap[k] = v; 
-} 
- 
-/* =========================================================================== 
- * Compute the optimal bit lengths for a tree and update the total bit length 
- * for the current block. 
- * IN assertion: the fields freq and dad are set, heap[heap_max] and 
- *    above are the tree nodes sorted by increasing frequency. 
- * OUT assertions: the field len is set to the optimal bit length, the 
- *     array bl_count contains the frequencies for each bit length. 
- *     The length opt_len is updated; static_len is also updated if stree is 
- *     not null. 
- */ 
-local void gen_bitlen(s, desc) 
-    deflate_state *s; 
-    tree_desc *desc;    /* the tree descriptor */ 
-{ 
-    ct_data *tree        = desc->dyn_tree; 
-    int max_code         = desc->max_code; 
-    const ct_data *stree = desc->stat_desc->static_tree; 
-    const intf *extra    = desc->stat_desc->extra_bits; 
-    int base             = desc->stat_desc->extra_base; 
-    int max_length       = desc->stat_desc->max_length; 
-    int h;              /* heap index */ 
-    int n, m;           /* iterate over the tree elements */ 
-    int bits;           /* bit length */ 
-    int xbits;          /* extra bits */ 
-    ush f;              /* frequency */ 
-    int overflow = 0;   /* number of elements with bit length too large */ 
- 
-    for (bits = 0; bits <= MAX_BITS; bits++) s->bl_count[bits] = 0; 
- 
-    /* In a first pass, compute the optimal bit lengths (which may 
-     * overflow in the case of the bit length tree). 
-     */ 
-    tree[s->heap[s->heap_max]].Len = 0; /* root of the heap */ 
- 
-    for (h = s->heap_max+1; h < HEAP_SIZE; h++) { 
-        n = s->heap[h]; 
-        bits = tree[tree[n].Dad].Len + 1; 
-        if (bits > max_length) bits = max_length, overflow++; 
-        tree[n].Len = (ush)bits; 
-        /* We overwrite tree[n].Dad which is no longer needed */ 
- 
-        if (n > max_code) continue; /* not a leaf node */ 
- 
-        s->bl_count[bits]++; 
-        xbits = 0; 
-        if (n >= base) xbits = extra[n-base]; 
-        f = tree[n].Freq; 
+    s->compressed_len = 0L;
+    s->bits_sent = 0L;
+#endif
+
+    /* Initialize the first block of the first file: */
+    init_block(s);
+}
+
+/* ===========================================================================
+ * Initialize a new block.
+ */
+local void init_block(s)
+    deflate_state *s;
+{
+    int n; /* iterates over tree elements */
+
+    /* Initialize the trees. */
+    for (n = 0; n < L_CODES;  n++) s->dyn_ltree[n].Freq = 0;
+    for (n = 0; n < D_CODES;  n++) s->dyn_dtree[n].Freq = 0;
+    for (n = 0; n < BL_CODES; n++) s->bl_tree[n].Freq = 0;
+
+    s->dyn_ltree[END_BLOCK].Freq = 1;
+    s->opt_len = s->static_len = 0L;
+    s->last_lit = s->matches = 0;
+}
+
+#define SMALLEST 1
+/* Index within the heap array of least frequent node in the Huffman tree */
+
+
+/* ===========================================================================
+ * Remove the smallest element from the heap and recreate the heap with
+ * one less element. Updates heap and heap_len.
+ */
+#define pqremove(s, tree, top) \
+{\
+    top = s->heap[SMALLEST]; \
+    s->heap[SMALLEST] = s->heap[s->heap_len--]; \
+    pqdownheap(s, tree, SMALLEST); \
+}
+
+/* ===========================================================================
+ * Compares to subtrees, using the tree depth as tie breaker when
+ * the subtrees have equal frequency. This minimizes the worst case length.
+ */
+#define smaller(tree, n, m, depth) \
+   (tree[n].Freq < tree[m].Freq || \
+   (tree[n].Freq == tree[m].Freq && depth[n] <= depth[m]))
+
+/* ===========================================================================
+ * Restore the heap property by moving down the tree starting at node k,
+ * exchanging a node with the smallest of its two sons if necessary, stopping
+ * when the heap property is re-established (each father smaller than its
+ * two sons).
+ */
+local void pqdownheap(s, tree, k)
+    deflate_state *s;
+    ct_data *tree;  /* the tree to restore */
+    int k;               /* node to move down */
+{
+    int v = s->heap[k];
+    int j = k << 1;  /* left son of k */
+    while (j <= s->heap_len) {
+        /* Set j to the smallest of the two sons: */
+        if (j < s->heap_len &&
+            smaller(tree, s->heap[j+1], s->heap[j], s->depth)) {
+            j++;
+        }
+        /* Exit if v is smaller than both sons */
+        if (smaller(tree, v, s->heap[j], s->depth)) break;
+
+        /* Exchange v with the smallest son */
+        s->heap[k] = s->heap[j];  k = j;
+
+        /* And continue down the tree, setting j to the left son of k */
+        j <<= 1;
+    }
+    s->heap[k] = v;
+}
+
+/* ===========================================================================
+ * Compute the optimal bit lengths for a tree and update the total bit length
+ * for the current block.
+ * IN assertion: the fields freq and dad are set, heap[heap_max] and
+ *    above are the tree nodes sorted by increasing frequency.
+ * OUT assertions: the field len is set to the optimal bit length, the
+ *     array bl_count contains the frequencies for each bit length.
+ *     The length opt_len is updated; static_len is also updated if stree is
+ *     not null.
+ */
+local void gen_bitlen(s, desc)
+    deflate_state *s;
+    tree_desc *desc;    /* the tree descriptor */
+{
+    ct_data *tree        = desc->dyn_tree;
+    int max_code         = desc->max_code;
+    const ct_data *stree = desc->stat_desc->static_tree;
+    const intf *extra    = desc->stat_desc->extra_bits;
+    int base             = desc->stat_desc->extra_base;
+    int max_length       = desc->stat_desc->max_length;
+    int h;              /* heap index */
+    int n, m;           /* iterate over the tree elements */
+    int bits;           /* bit length */
+    int xbits;          /* extra bits */
+    ush f;              /* frequency */
+    int overflow = 0;   /* number of elements with bit length too large */
+
+    for (bits = 0; bits <= MAX_BITS; bits++) s->bl_count[bits] = 0;
+
+    /* In a first pass, compute the optimal bit lengths (which may
+     * overflow in the case of the bit length tree).
+     */
+    tree[s->heap[s->heap_max]].Len = 0; /* root of the heap */
+
+    for (h = s->heap_max+1; h < HEAP_SIZE; h++) {
+        n = s->heap[h];
+        bits = tree[tree[n].Dad].Len + 1;
+        if (bits > max_length) bits = max_length, overflow++;
+        tree[n].Len = (ush)bits;
+        /* We overwrite tree[n].Dad which is no longer needed */
+
+        if (n > max_code) continue; /* not a leaf node */
+
+        s->bl_count[bits]++;
+        xbits = 0;
+        if (n >= base) xbits = extra[n-base];
+        f = tree[n].Freq;
         s->opt_len += (ulg)f * (unsigned)(bits + xbits);
         if (stree) s->static_len += (ulg)f * (unsigned)(stree[n].Len + xbits);
-    } 
-    if (overflow == 0) return; 
- 
+    }
+    if (overflow == 0) return;
+
     Tracev((stderr,"\nbit length overflow\n"));
-    /* This happens for example on obj2 and pic of the Calgary corpus */ 
- 
-    /* Find the first bit length which could increase: */ 
-    do { 
-        bits = max_length-1; 
-        while (s->bl_count[bits] == 0) bits--; 
-        s->bl_count[bits]--;      /* move one leaf down the tree */ 
-        s->bl_count[bits+1] += 2; /* move one overflow item as its brother */ 
-        s->bl_count[max_length]--; 
-        /* The brother of the overflow item also moves one step up, 
-         * but this does not affect bl_count[max_length] 
-         */ 
-        overflow -= 2; 
-    } while (overflow > 0); 
- 
-    /* Now recompute all bit lengths, scanning in increasing frequency. 
-     * h is still equal to HEAP_SIZE. (It is simpler to reconstruct all 
-     * lengths instead of fixing only the wrong ones. This idea is taken 
-     * from 'ar' written by Haruhiko Okumura.) 
-     */ 
-    for (bits = max_length; bits != 0; bits--) { 
-        n = s->bl_count[bits]; 
-        while (n != 0) { 
-            m = s->heap[--h]; 
-            if (m > max_code) continue; 
-            if ((unsigned) tree[m].Len != (unsigned) bits) { 
+    /* This happens for example on obj2 and pic of the Calgary corpus */
+
+    /* Find the first bit length which could increase: */
+    do {
+        bits = max_length-1;
+        while (s->bl_count[bits] == 0) bits--;
+        s->bl_count[bits]--;      /* move one leaf down the tree */
+        s->bl_count[bits+1] += 2; /* move one overflow item as its brother */
+        s->bl_count[max_length]--;
+        /* The brother of the overflow item also moves one step up,
+         * but this does not affect bl_count[max_length]
+         */
+        overflow -= 2;
+    } while (overflow > 0);
+
+    /* Now recompute all bit lengths, scanning in increasing frequency.
+     * h is still equal to HEAP_SIZE. (It is simpler to reconstruct all
+     * lengths instead of fixing only the wrong ones. This idea is taken
+     * from 'ar' written by Haruhiko Okumura.)
+     */
+    for (bits = max_length; bits != 0; bits--) {
+        n = s->bl_count[bits];
+        while (n != 0) {
+            m = s->heap[--h];
+            if (m > max_code) continue;
+            if ((unsigned) tree[m].Len != (unsigned) bits) {
                 Tracev((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits));
                 s->opt_len += ((ulg)bits - tree[m].Len) * tree[m].Freq;
-                tree[m].Len = (ush)bits; 
-            } 
-            n--; 
-        } 
-    } 
-} 
- 
-/* =========================================================================== 
- * Generate the codes for a given tree and bit counts (which need not be 
- * optimal). 
- * IN assertion: the array bl_count contains the bit length statistics for 
- * the given tree and the field len is set for all tree elements. 
- * OUT assertion: the field code is set for all tree elements of non 
- *     zero code length. 
- */ 
-local void gen_codes (tree, max_code, bl_count) 
-    ct_data *tree;             /* the tree to decorate */ 
-    int max_code;              /* largest code with non zero frequency */ 
-    ushf *bl_count;            /* number of codes at each bit length */ 
-{ 
-    ush next_code[MAX_BITS+1]; /* next code value for each bit length */ 
+                tree[m].Len = (ush)bits;
+            }
+            n--;
+        }
+    }
+}
+
+/* ===========================================================================
+ * Generate the codes for a given tree and bit counts (which need not be
+ * optimal).
+ * IN assertion: the array bl_count contains the bit length statistics for
+ * the given tree and the field len is set for all tree elements.
+ * OUT assertion: the field code is set for all tree elements of non
+ *     zero code length.
+ */
+local void gen_codes (tree, max_code, bl_count)
+    ct_data *tree;             /* the tree to decorate */
+    int max_code;              /* largest code with non zero frequency */
+    ushf *bl_count;            /* number of codes at each bit length */
+{
+    ush next_code[MAX_BITS+1]; /* next code value for each bit length */
     unsigned code = 0;         /* running code value */
-    int bits;                  /* bit index */ 
-    int n;                     /* code index */ 
- 
-    /* The distribution counts are first used to generate the code values 
-     * without bit reversal. 
-     */ 
-    for (bits = 1; bits <= MAX_BITS; bits++) { 
+    int bits;                  /* bit index */
+    int n;                     /* code index */
+
+    /* The distribution counts are first used to generate the code values
+     * without bit reversal.
+     */
+    for (bits = 1; bits <= MAX_BITS; bits++) {
         code = (code + bl_count[bits-1]) << 1;
         next_code[bits] = (ush)code;
-    } 
-    /* Check that the bit counts in bl_count are consistent. The last code 
-     * must be all ones. 
-     */ 
-    Assert (code + bl_count[MAX_BITS]-1 == (1<<MAX_BITS)-1, 
-            "inconsistent bit counts"); 
-    Tracev((stderr,"\ngen_codes: max_code %d ", max_code)); 
- 
-    for (n = 0;  n <= max_code; n++) { 
-        int len = tree[n].Len; 
-        if (len == 0) continue; 
-        /* Now reverse the bits */ 
+    }
+    /* Check that the bit counts in bl_count are consistent. The last code
+     * must be all ones.
+     */
+    Assert (code + bl_count[MAX_BITS]-1 == (1<<MAX_BITS)-1,
+            "inconsistent bit counts");
+    Tracev((stderr,"\ngen_codes: max_code %d ", max_code));
+
+    for (n = 0;  n <= max_code; n++) {
+        int len = tree[n].Len;
+        if (len == 0) continue;
+        /* Now reverse the bits */
         tree[n].Code = (ush)bi_reverse(next_code[len]++, len);
- 
-        Tracecv(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ", 
-             n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len]-1)); 
-    } 
-} 
- 
-/* =========================================================================== 
- * Construct one Huffman tree and assigns the code bit strings and lengths. 
- * Update the total bit length for the current block. 
- * IN assertion: the field freq is set for all tree elements. 
- * OUT assertions: the fields len and code are set to the optimal bit length 
- *     and corresponding code. The length opt_len is updated; static_len is 
- *     also updated if stree is not null. The field max_code is set. 
- */ 
-local void build_tree(s, desc) 
-    deflate_state *s; 
-    tree_desc *desc; /* the tree descriptor */ 
-{ 
-    ct_data *tree         = desc->dyn_tree; 
-    const ct_data *stree  = desc->stat_desc->static_tree; 
-    int elems             = desc->stat_desc->elems; 
-    int n, m;          /* iterate over heap elements */ 
-    int max_code = -1; /* largest code with non zero frequency */ 
-    int node;          /* new node being created */ 
- 
-    /* Construct the initial heap, with least frequent element in 
-     * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1]. 
-     * heap[0] is not used. 
-     */ 
-    s->heap_len = 0, s->heap_max = HEAP_SIZE; 
- 
-    for (n = 0; n < elems; n++) { 
-        if (tree[n].Freq != 0) { 
-            s->heap[++(s->heap_len)] = max_code = n; 
-            s->depth[n] = 0; 
-        } else { 
-            tree[n].Len = 0; 
-        } 
-    } 
- 
-    /* The pkzip format requires that at least one distance code exists, 
-     * and that at least one bit should be sent even if there is only one 
-     * possible code. So to avoid special checks later on we force at least 
-     * two codes of non zero frequency. 
-     */ 
-    while (s->heap_len < 2) { 
-        node = s->heap[++(s->heap_len)] = (max_code < 2 ? ++max_code : 0); 
-        tree[node].Freq = 1; 
-        s->depth[node] = 0; 
-        s->opt_len--; if (stree) s->static_len -= stree[node].Len; 
-        /* node is 0 or 1 so it does not have extra bits */ 
-    } 
-    desc->max_code = max_code; 
- 
-    /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree, 
-     * establish sub-heaps of increasing lengths: 
-     */ 
-    for (n = s->heap_len/2; n >= 1; n--) pqdownheap(s, tree, n); 
- 
-    /* Construct the Huffman tree by repeatedly combining the least two 
-     * frequent nodes. 
-     */ 
-    node = elems;              /* next internal node of the tree */ 
-    do { 
-        pqremove(s, tree, n);  /* n = node of least frequency */ 
-        m = s->heap[SMALLEST]; /* m = node of next least frequency */ 
- 
-        s->heap[--(s->heap_max)] = n; /* keep the nodes sorted by frequency */ 
-        s->heap[--(s->heap_max)] = m; 
- 
-        /* Create a new node father of n and m */ 
-        tree[node].Freq = tree[n].Freq + tree[m].Freq; 
-        s->depth[node] = (uch)((s->depth[n] >= s->depth[m] ? 
-                                s->depth[n] : s->depth[m]) + 1); 
-        tree[n].Dad = tree[m].Dad = (ush)node; 
-#ifdef DUMP_BL_TREE 
-        if (tree == s->bl_tree) { 
-            fprintf(stderr,"\nnode %d(%d), sons %d(%d) %d(%d)", 
-                    node, tree[node].Freq, n, tree[n].Freq, m, tree[m].Freq); 
-        } 
-#endif 
-        /* and insert the new node in the heap */ 
-        s->heap[SMALLEST] = node++; 
-        pqdownheap(s, tree, SMALLEST); 
- 
-    } while (s->heap_len >= 2); 
- 
-    s->heap[--(s->heap_max)] = s->heap[SMALLEST]; 
- 
-    /* At this point, the fields freq and dad are set. We can now 
-     * generate the bit lengths. 
-     */ 
-    gen_bitlen(s, (tree_desc *)desc); 
- 
-    /* The field len is now set, we can generate the bit codes */ 
-    gen_codes ((ct_data *)tree, max_code, s->bl_count); 
-} 
- 
-/* =========================================================================== 
- * Scan a literal or distance tree to determine the frequencies of the codes 
- * in the bit length tree. 
- */ 
-local void scan_tree (s, tree, max_code) 
-    deflate_state *s; 
-    ct_data *tree;   /* the tree to be scanned */ 
-    int max_code;    /* and its largest code of non zero frequency */ 
-{ 
-    int n;                     /* iterates over all tree elements */ 
-    int prevlen = -1;          /* last emitted length */ 
-    int curlen;                /* length of current code */ 
-    int nextlen = tree[0].Len; /* length of next code */ 
-    int count = 0;             /* repeat count of the current code */ 
-    int max_count = 7;         /* max repeat count */ 
-    int min_count = 4;         /* min repeat count */ 
- 
-    if (nextlen == 0) max_count = 138, min_count = 3; 
-    tree[max_code+1].Len = (ush)0xffff; /* guard */ 
- 
-    for (n = 0; n <= max_code; n++) { 
-        curlen = nextlen; nextlen = tree[n+1].Len; 
-        if (++count < max_count && curlen == nextlen) { 
-            continue; 
-        } else if (count < min_count) { 
-            s->bl_tree[curlen].Freq += count; 
-        } else if (curlen != 0) { 
-            if (curlen != prevlen) s->bl_tree[curlen].Freq++; 
-            s->bl_tree[REP_3_6].Freq++; 
-        } else if (count <= 10) { 
-            s->bl_tree[REPZ_3_10].Freq++; 
-        } else { 
-            s->bl_tree[REPZ_11_138].Freq++; 
-        } 
-        count = 0; prevlen = curlen; 
-        if (nextlen == 0) { 
-            max_count = 138, min_count = 3; 
-        } else if (curlen == nextlen) { 
-            max_count = 6, min_count = 3; 
-        } else { 
-            max_count = 7, min_count = 4; 
-        } 
-    } 
-} 
- 
-/* =========================================================================== 
- * Send a literal or distance tree in compressed form, using the codes in 
- * bl_tree. 
- */ 
-local void send_tree (s, tree, max_code) 
-    deflate_state *s; 
-    ct_data *tree; /* the tree to be scanned */ 
-    int max_code;       /* and its largest code of non zero frequency */ 
-{ 
-    int n;                     /* iterates over all tree elements */ 
-    int prevlen = -1;          /* last emitted length */ 
-    int curlen;                /* length of current code */ 
-    int nextlen = tree[0].Len; /* length of next code */ 
-    int count = 0;             /* repeat count of the current code */ 
-    int max_count = 7;         /* max repeat count */ 
-    int min_count = 4;         /* min repeat count */ 
- 
-    /* tree[max_code+1].Len = -1; */  /* guard already set */ 
-    if (nextlen == 0) max_count = 138, min_count = 3; 
- 
-    for (n = 0; n <= max_code; n++) { 
-        curlen = nextlen; nextlen = tree[n+1].Len; 
-        if (++count < max_count && curlen == nextlen) { 
-            continue; 
-        } else if (count < min_count) { 
-            do { send_code(s, curlen, s->bl_tree); } while (--count != 0); 
- 
-        } else if (curlen != 0) { 
-            if (curlen != prevlen) { 
-                send_code(s, curlen, s->bl_tree); count--; 
-            } 
-            Assert(count >= 3 && count <= 6, " 3_6?"); 
-            send_code(s, REP_3_6, s->bl_tree); send_bits(s, count-3, 2); 
- 
-        } else if (count <= 10) { 
-            send_code(s, REPZ_3_10, s->bl_tree); send_bits(s, count-3, 3); 
- 
-        } else { 
-            send_code(s, REPZ_11_138, s->bl_tree); send_bits(s, count-11, 7); 
-        } 
-        count = 0; prevlen = curlen; 
-        if (nextlen == 0) { 
-            max_count = 138, min_count = 3; 
-        } else if (curlen == nextlen) { 
-            max_count = 6, min_count = 3; 
-        } else { 
-            max_count = 7, min_count = 4; 
-        } 
-    } 
-} 
- 
-/* =========================================================================== 
- * Construct the Huffman tree for the bit lengths and return the index in 
- * bl_order of the last bit length code to send. 
- */ 
-local int build_bl_tree(s) 
-    deflate_state *s; 
-{ 
-    int max_blindex;  /* index of last bit length code of non zero freq */ 
- 
-    /* Determine the bit length frequencies for literal and distance trees */ 
-    scan_tree(s, (ct_data *)s->dyn_ltree, s->l_desc.max_code); 
-    scan_tree(s, (ct_data *)s->dyn_dtree, s->d_desc.max_code); 
- 
-    /* Build the bit length tree: */ 
-    build_tree(s, (tree_desc *)(&(s->bl_desc))); 
-    /* opt_len now includes the length of the tree representations, except 
-     * the lengths of the bit lengths codes and the 5+5+4 bits for the counts. 
-     */ 
- 
-    /* Determine the number of bit length codes to send. The pkzip format 
-     * requires that at least 4 bit length codes be sent. (appnote.txt says 
-     * 3 but the actual value used is 4.) 
-     */ 
-    for (max_blindex = BL_CODES-1; max_blindex >= 3; max_blindex--) { 
-        if (s->bl_tree[bl_order[max_blindex]].Len != 0) break; 
-    } 
-    /* Update opt_len to include the bit length tree and counts */ 
+
+        Tracecv(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",
+             n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len]-1));
+    }
+}
+
+/* ===========================================================================
+ * Construct one Huffman tree and assigns the code bit strings and lengths.
+ * Update the total bit length for the current block.
+ * IN assertion: the field freq is set for all tree elements.
+ * OUT assertions: the fields len and code are set to the optimal bit length
+ *     and corresponding code. The length opt_len is updated; static_len is
+ *     also updated if stree is not null. The field max_code is set.
+ */
+local void build_tree(s, desc)
+    deflate_state *s;
+    tree_desc *desc; /* the tree descriptor */
+{
+    ct_data *tree         = desc->dyn_tree;
+    const ct_data *stree  = desc->stat_desc->static_tree;
+    int elems             = desc->stat_desc->elems;
+    int n, m;          /* iterate over heap elements */
+    int max_code = -1; /* largest code with non zero frequency */
+    int node;          /* new node being created */
+
+    /* Construct the initial heap, with least frequent element in
+     * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1].
+     * heap[0] is not used.
+     */
+    s->heap_len = 0, s->heap_max = HEAP_SIZE;
+
+    for (n = 0; n < elems; n++) {
+        if (tree[n].Freq != 0) {
+            s->heap[++(s->heap_len)] = max_code = n;
+            s->depth[n] = 0;
+        } else {
+            tree[n].Len = 0;
+        }
+    }
+
+    /* The pkzip format requires that at least one distance code exists,
+     * and that at least one bit should be sent even if there is only one
+     * possible code. So to avoid special checks later on we force at least
+     * two codes of non zero frequency.
+     */
+    while (s->heap_len < 2) {
+        node = s->heap[++(s->heap_len)] = (max_code < 2 ? ++max_code : 0);
+        tree[node].Freq = 1;
+        s->depth[node] = 0;
+        s->opt_len--; if (stree) s->static_len -= stree[node].Len;
+        /* node is 0 or 1 so it does not have extra bits */
+    }
+    desc->max_code = max_code;
+
+    /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree,
+     * establish sub-heaps of increasing lengths:
+     */
+    for (n = s->heap_len/2; n >= 1; n--) pqdownheap(s, tree, n);
+
+    /* Construct the Huffman tree by repeatedly combining the least two
+     * frequent nodes.
+     */
+    node = elems;              /* next internal node of the tree */
+    do {
+        pqremove(s, tree, n);  /* n = node of least frequency */
+        m = s->heap[SMALLEST]; /* m = node of next least frequency */
+
+        s->heap[--(s->heap_max)] = n; /* keep the nodes sorted by frequency */
+        s->heap[--(s->heap_max)] = m;
+
+        /* Create a new node father of n and m */
+        tree[node].Freq = tree[n].Freq + tree[m].Freq;
+        s->depth[node] = (uch)((s->depth[n] >= s->depth[m] ?
+                                s->depth[n] : s->depth[m]) + 1);
+        tree[n].Dad = tree[m].Dad = (ush)node;
+#ifdef DUMP_BL_TREE
+        if (tree == s->bl_tree) {
+            fprintf(stderr,"\nnode %d(%d), sons %d(%d) %d(%d)",
+                    node, tree[node].Freq, n, tree[n].Freq, m, tree[m].Freq);
+        }
+#endif
+        /* and insert the new node in the heap */
+        s->heap[SMALLEST] = node++;
+        pqdownheap(s, tree, SMALLEST);
+
+    } while (s->heap_len >= 2);
+
+    s->heap[--(s->heap_max)] = s->heap[SMALLEST];
+
+    /* At this point, the fields freq and dad are set. We can now
+     * generate the bit lengths.
+     */
+    gen_bitlen(s, (tree_desc *)desc);
+
+    /* The field len is now set, we can generate the bit codes */
+    gen_codes ((ct_data *)tree, max_code, s->bl_count);
+}
+
+/* ===========================================================================
+ * Scan a literal or distance tree to determine the frequencies of the codes
+ * in the bit length tree.
+ */
+local void scan_tree (s, tree, max_code)
+    deflate_state *s;
+    ct_data *tree;   /* the tree to be scanned */
+    int max_code;    /* and its largest code of non zero frequency */
+{
+    int n;                     /* iterates over all tree elements */
+    int prevlen = -1;          /* last emitted length */
+    int curlen;                /* length of current code */
+    int nextlen = tree[0].Len; /* length of next code */
+    int count = 0;             /* repeat count of the current code */
+    int max_count = 7;         /* max repeat count */
+    int min_count = 4;         /* min repeat count */
+
+    if (nextlen == 0) max_count = 138, min_count = 3;
+    tree[max_code+1].Len = (ush)0xffff; /* guard */
+
+    for (n = 0; n <= max_code; n++) {
+        curlen = nextlen; nextlen = tree[n+1].Len;
+        if (++count < max_count && curlen == nextlen) {
+            continue;
+        } else if (count < min_count) {
+            s->bl_tree[curlen].Freq += count;
+        } else if (curlen != 0) {
+            if (curlen != prevlen) s->bl_tree[curlen].Freq++;
+            s->bl_tree[REP_3_6].Freq++;
+        } else if (count <= 10) {
+            s->bl_tree[REPZ_3_10].Freq++;
+        } else {
+            s->bl_tree[REPZ_11_138].Freq++;
+        }
+        count = 0; prevlen = curlen;
+        if (nextlen == 0) {
+            max_count = 138, min_count = 3;
+        } else if (curlen == nextlen) {
+            max_count = 6, min_count = 3;
+        } else {
+            max_count = 7, min_count = 4;
+        }
+    }
+}
+
+/* ===========================================================================
+ * Send a literal or distance tree in compressed form, using the codes in
+ * bl_tree.
+ */
+local void send_tree (s, tree, max_code)
+    deflate_state *s;
+    ct_data *tree; /* the tree to be scanned */
+    int max_code;       /* and its largest code of non zero frequency */
+{
+    int n;                     /* iterates over all tree elements */
+    int prevlen = -1;          /* last emitted length */
+    int curlen;                /* length of current code */
+    int nextlen = tree[0].Len; /* length of next code */
+    int count = 0;             /* repeat count of the current code */
+    int max_count = 7;         /* max repeat count */
+    int min_count = 4;         /* min repeat count */
+
+    /* tree[max_code+1].Len = -1; */  /* guard already set */
+    if (nextlen == 0) max_count = 138, min_count = 3;
+
+    for (n = 0; n <= max_code; n++) {
+        curlen = nextlen; nextlen = tree[n+1].Len;
+        if (++count < max_count && curlen == nextlen) {
+            continue;
+        } else if (count < min_count) {
+            do { send_code(s, curlen, s->bl_tree); } while (--count != 0);
+
+        } else if (curlen != 0) {
+            if (curlen != prevlen) {
+                send_code(s, curlen, s->bl_tree); count--;
+            }
+            Assert(count >= 3 && count <= 6, " 3_6?");
+            send_code(s, REP_3_6, s->bl_tree); send_bits(s, count-3, 2);
+
+        } else if (count <= 10) {
+            send_code(s, REPZ_3_10, s->bl_tree); send_bits(s, count-3, 3);
+
+        } else {
+            send_code(s, REPZ_11_138, s->bl_tree); send_bits(s, count-11, 7);
+        }
+        count = 0; prevlen = curlen;
+        if (nextlen == 0) {
+            max_count = 138, min_count = 3;
+        } else if (curlen == nextlen) {
+            max_count = 6, min_count = 3;
+        } else {
+            max_count = 7, min_count = 4;
+        }
+    }
+}
+
+/* ===========================================================================
+ * Construct the Huffman tree for the bit lengths and return the index in
+ * bl_order of the last bit length code to send.
+ */
+local int build_bl_tree(s)
+    deflate_state *s;
+{
+    int max_blindex;  /* index of last bit length code of non zero freq */
+
+    /* Determine the bit length frequencies for literal and distance trees */
+    scan_tree(s, (ct_data *)s->dyn_ltree, s->l_desc.max_code);
+    scan_tree(s, (ct_data *)s->dyn_dtree, s->d_desc.max_code);
+
+    /* Build the bit length tree: */
+    build_tree(s, (tree_desc *)(&(s->bl_desc)));
+    /* opt_len now includes the length of the tree representations, except
+     * the lengths of the bit lengths codes and the 5+5+4 bits for the counts.
+     */
+
+    /* Determine the number of bit length codes to send. The pkzip format
+     * requires that at least 4 bit length codes be sent. (appnote.txt says
+     * 3 but the actual value used is 4.)
+     */
+    for (max_blindex = BL_CODES-1; max_blindex >= 3; max_blindex--) {
+        if (s->bl_tree[bl_order[max_blindex]].Len != 0) break;
+    }
+    /* Update opt_len to include the bit length tree and counts */
     s->opt_len += 3*((ulg)max_blindex+1) + 5+5+4;
-    Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld", 
-            s->opt_len, s->static_len)); 
- 
-    return max_blindex; 
-} 
- 
-/* =========================================================================== 
- * Send the header for a block using dynamic Huffman trees: the counts, the 
- * lengths of the bit length codes, the literal tree and the distance tree. 
- * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4. 
- */ 
-local void send_all_trees(s, lcodes, dcodes, blcodes) 
-    deflate_state *s; 
-    int lcodes, dcodes, blcodes; /* number of codes for each tree */ 
-{ 
-    int rank;                    /* index in bl_order */ 
- 
-    Assert (lcodes >= 257 && dcodes >= 1 && blcodes >= 4, "not enough codes"); 
-    Assert (lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES, 
-            "too many codes"); 
-    Tracev((stderr, "\nbl counts: ")); 
-    send_bits(s, lcodes-257, 5); /* not +255 as stated in appnote.txt */ 
-    send_bits(s, dcodes-1,   5); 
-    send_bits(s, blcodes-4,  4); /* not -3 as stated in appnote.txt */ 
-    for (rank = 0; rank < blcodes; rank++) { 
-        Tracev((stderr, "\nbl code %2d ", bl_order[rank])); 
-        send_bits(s, s->bl_tree[bl_order[rank]].Len, 3); 
-    } 
-    Tracev((stderr, "\nbl tree: sent %ld", s->bits_sent)); 
- 
-    send_tree(s, (ct_data *)s->dyn_ltree, lcodes-1); /* literal tree */ 
-    Tracev((stderr, "\nlit tree: sent %ld", s->bits_sent)); 
- 
-    send_tree(s, (ct_data *)s->dyn_dtree, dcodes-1); /* distance tree */ 
-    Tracev((stderr, "\ndist tree: sent %ld", s->bits_sent)); 
-} 
- 
-/* =========================================================================== 
- * Send a stored block 
- */ 
-void ZLIB_INTERNAL _tr_stored_block(s, buf, stored_len, last) 
-    deflate_state *s; 
-    charf *buf;       /* input block */ 
-    ulg stored_len;   /* length of input block */ 
-    int last;         /* one if this is the last block for a file */ 
-{ 
-    send_bits(s, (STORED_BLOCK<<1)+last, 3);    /* send block type */ 
+    Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld",
+            s->opt_len, s->static_len));
+
+    return max_blindex;
+}
+
+/* ===========================================================================
+ * Send the header for a block using dynamic Huffman trees: the counts, the
+ * lengths of the bit length codes, the literal tree and the distance tree.
+ * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4.
+ */
+local void send_all_trees(s, lcodes, dcodes, blcodes)
+    deflate_state *s;
+    int lcodes, dcodes, blcodes; /* number of codes for each tree */
+{
+    int rank;                    /* index in bl_order */
+
+    Assert (lcodes >= 257 && dcodes >= 1 && blcodes >= 4, "not enough codes");
+    Assert (lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES,
+            "too many codes");
+    Tracev((stderr, "\nbl counts: "));
+    send_bits(s, lcodes-257, 5); /* not +255 as stated in appnote.txt */
+    send_bits(s, dcodes-1,   5);
+    send_bits(s, blcodes-4,  4); /* not -3 as stated in appnote.txt */
+    for (rank = 0; rank < blcodes; rank++) {
+        Tracev((stderr, "\nbl code %2d ", bl_order[rank]));
+        send_bits(s, s->bl_tree[bl_order[rank]].Len, 3);
+    }
+    Tracev((stderr, "\nbl tree: sent %ld", s->bits_sent));
+
+    send_tree(s, (ct_data *)s->dyn_ltree, lcodes-1); /* literal tree */
+    Tracev((stderr, "\nlit tree: sent %ld", s->bits_sent));
+
+    send_tree(s, (ct_data *)s->dyn_dtree, dcodes-1); /* distance tree */
+    Tracev((stderr, "\ndist tree: sent %ld", s->bits_sent));
+}
+
+/* ===========================================================================
+ * Send a stored block
+ */
+void ZLIB_INTERNAL _tr_stored_block(s, buf, stored_len, last)
+    deflate_state *s;
+    charf *buf;       /* input block */
+    ulg stored_len;   /* length of input block */
+    int last;         /* one if this is the last block for a file */
+{
+    send_bits(s, (STORED_BLOCK<<1)+last, 3);    /* send block type */
     bi_windup(s);        /* align on byte boundary */
     put_short(s, (ush)stored_len);
     put_short(s, (ush)~stored_len);
@@ -875,331 +875,331 @@ void ZLIB_INTERNAL _tr_stored_block(s, buf, stored_len, last)
         s->pending += stored_len;
     }
 #ifdef ZLIB_DEBUG
-    s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L; 
-    s->compressed_len += (stored_len + 4) << 3; 
+    s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L;
+    s->compressed_len += (stored_len + 4) << 3;
     s->bits_sent += 2*16;
     s->bits_sent += stored_len<<3;
-#endif 
-} 
- 
-/* =========================================================================== 
- * Flush the bits in the bit buffer to pending output (leaves at most 7 bits) 
- */ 
-void ZLIB_INTERNAL _tr_flush_bits(s) 
-    deflate_state *s; 
-{ 
-    bi_flush(s); 
-} 
- 
-/* =========================================================================== 
- * Send one empty static block to give enough lookahead for inflate. 
- * This takes 10 bits, of which 7 may remain in the bit buffer. 
- */ 
-void ZLIB_INTERNAL _tr_align(s) 
-    deflate_state *s; 
-{ 
-    send_bits(s, STATIC_TREES<<1, 3); 
-    send_code(s, END_BLOCK, static_ltree); 
+#endif
+}
+
+/* ===========================================================================
+ * Flush the bits in the bit buffer to pending output (leaves at most 7 bits)
+ */
+void ZLIB_INTERNAL _tr_flush_bits(s)
+    deflate_state *s;
+{
+    bi_flush(s);
+}
+
+/* ===========================================================================
+ * Send one empty static block to give enough lookahead for inflate.
+ * This takes 10 bits, of which 7 may remain in the bit buffer.
+ */
+void ZLIB_INTERNAL _tr_align(s)
+    deflate_state *s;
+{
+    send_bits(s, STATIC_TREES<<1, 3);
+    send_code(s, END_BLOCK, static_ltree);
 #ifdef ZLIB_DEBUG
-    s->compressed_len += 10L; /* 3 for block type, 7 for EOB */ 
-#endif 
-    bi_flush(s); 
-} 
- 
-/* =========================================================================== 
- * Determine the best encoding for the current block: dynamic trees, static 
+    s->compressed_len += 10L; /* 3 for block type, 7 for EOB */
+#endif
+    bi_flush(s);
+}
+
+/* ===========================================================================
+ * Determine the best encoding for the current block: dynamic trees, static
  * trees or store, and write out the encoded block.
- */ 
-void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last) 
-    deflate_state *s; 
-    charf *buf;       /* input block, or NULL if too old */ 
-    ulg stored_len;   /* length of input block */ 
-    int last;         /* one if this is the last block for a file */ 
-{ 
-    ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */ 
-    int max_blindex = 0;  /* index of last bit length code of non zero freq */ 
- 
-    /* Build the Huffman trees unless a stored block is forced */ 
-    if (s->level > 0) { 
- 
-        /* Check if the file is binary or text */ 
-        if (s->strm->data_type == Z_UNKNOWN) 
-            s->strm->data_type = detect_data_type(s); 
- 
-        /* Construct the literal and distance trees */ 
-        build_tree(s, (tree_desc *)(&(s->l_desc))); 
-        Tracev((stderr, "\nlit data: dyn %ld, stat %ld", s->opt_len, 
-                s->static_len)); 
- 
-        build_tree(s, (tree_desc *)(&(s->d_desc))); 
-        Tracev((stderr, "\ndist data: dyn %ld, stat %ld", s->opt_len, 
-                s->static_len)); 
-        /* At this point, opt_len and static_len are the total bit lengths of 
-         * the compressed block data, excluding the tree representations. 
-         */ 
- 
-        /* Build the bit length tree for the above two trees, and get the index 
-         * in bl_order of the last bit length code to send. 
-         */ 
-        max_blindex = build_bl_tree(s); 
- 
-        /* Determine the best encoding. Compute the block lengths in bytes. */ 
-        opt_lenb = (s->opt_len+3+7)>>3; 
-        static_lenb = (s->static_len+3+7)>>3; 
- 
-        Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ", 
-                opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len, 
-                s->last_lit)); 
- 
-        if (static_lenb <= opt_lenb) opt_lenb = static_lenb; 
- 
-    } else { 
-        Assert(buf != (char*)0, "lost buf"); 
-        opt_lenb = static_lenb = stored_len + 5; /* force a stored block */ 
-    } 
- 
-#ifdef FORCE_STORED 
-    if (buf != (char*)0) { /* force stored block */ 
-#else 
-    if (stored_len+4 <= opt_lenb && buf != (char*)0) { 
-                       /* 4: two words for the lengths */ 
-#endif 
-        /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE. 
-         * Otherwise we can't have processed more than WSIZE input bytes since 
-         * the last block flush, because compression would have been 
-         * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to 
-         * transform a block into a stored block. 
-         */ 
-        _tr_stored_block(s, buf, stored_len, last); 
- 
-#ifdef FORCE_STATIC 
-    } else if (static_lenb >= 0) { /* force static trees */ 
-#else 
-    } else if (s->strategy == Z_FIXED || static_lenb == opt_lenb) { 
-#endif 
-        send_bits(s, (STATIC_TREES<<1)+last, 3); 
-        compress_block(s, (const ct_data *)static_ltree, 
-                       (const ct_data *)static_dtree); 
+ */
+void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
+    deflate_state *s;
+    charf *buf;       /* input block, or NULL if too old */
+    ulg stored_len;   /* length of input block */
+    int last;         /* one if this is the last block for a file */
+{
+    ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */
+    int max_blindex = 0;  /* index of last bit length code of non zero freq */
+
+    /* Build the Huffman trees unless a stored block is forced */
+    if (s->level > 0) {
+
+        /* Check if the file is binary or text */
+        if (s->strm->data_type == Z_UNKNOWN)
+            s->strm->data_type = detect_data_type(s);
+
+        /* Construct the literal and distance trees */
+        build_tree(s, (tree_desc *)(&(s->l_desc)));
+        Tracev((stderr, "\nlit data: dyn %ld, stat %ld", s->opt_len,
+                s->static_len));
+
+        build_tree(s, (tree_desc *)(&(s->d_desc)));
+        Tracev((stderr, "\ndist data: dyn %ld, stat %ld", s->opt_len,
+                s->static_len));
+        /* At this point, opt_len and static_len are the total bit lengths of
+         * the compressed block data, excluding the tree representations.
+         */
+
+        /* Build the bit length tree for the above two trees, and get the index
+         * in bl_order of the last bit length code to send.
+         */
+        max_blindex = build_bl_tree(s);
+
+        /* Determine the best encoding. Compute the block lengths in bytes. */
+        opt_lenb = (s->opt_len+3+7)>>3;
+        static_lenb = (s->static_len+3+7)>>3;
+
+        Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ",
+                opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len,
+                s->last_lit));
+
+        if (static_lenb <= opt_lenb) opt_lenb = static_lenb;
+
+    } else {
+        Assert(buf != (char*)0, "lost buf");
+        opt_lenb = static_lenb = stored_len + 5; /* force a stored block */
+    }
+
+#ifdef FORCE_STORED
+    if (buf != (char*)0) { /* force stored block */
+#else
+    if (stored_len+4 <= opt_lenb && buf != (char*)0) {
+                       /* 4: two words for the lengths */
+#endif
+        /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE.
+         * Otherwise we can't have processed more than WSIZE input bytes since
+         * the last block flush, because compression would have been
+         * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to
+         * transform a block into a stored block.
+         */
+        _tr_stored_block(s, buf, stored_len, last);
+
+#ifdef FORCE_STATIC
+    } else if (static_lenb >= 0) { /* force static trees */
+#else
+    } else if (s->strategy == Z_FIXED || static_lenb == opt_lenb) {
+#endif
+        send_bits(s, (STATIC_TREES<<1)+last, 3);
+        compress_block(s, (const ct_data *)static_ltree,
+                       (const ct_data *)static_dtree);
 #ifdef ZLIB_DEBUG
-        s->compressed_len += 3 + s->static_len; 
-#endif 
-    } else { 
-        send_bits(s, (DYN_TREES<<1)+last, 3); 
-        send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1, 
-                       max_blindex+1); 
-        compress_block(s, (const ct_data *)s->dyn_ltree, 
-                       (const ct_data *)s->dyn_dtree); 
+        s->compressed_len += 3 + s->static_len;
+#endif
+    } else {
+        send_bits(s, (DYN_TREES<<1)+last, 3);
+        send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1,
+                       max_blindex+1);
+        compress_block(s, (const ct_data *)s->dyn_ltree,
+                       (const ct_data *)s->dyn_dtree);
 #ifdef ZLIB_DEBUG
-        s->compressed_len += 3 + s->opt_len; 
-#endif 
-    } 
-    Assert (s->compressed_len == s->bits_sent, "bad compressed size"); 
-    /* The above check is made mod 2^32, for files larger than 512 MB 
-     * and uLong implemented on 32 bits. 
-     */ 
-    init_block(s); 
- 
-    if (last) { 
-        bi_windup(s); 
+        s->compressed_len += 3 + s->opt_len;
+#endif
+    }
+    Assert (s->compressed_len == s->bits_sent, "bad compressed size");
+    /* The above check is made mod 2^32, for files larger than 512 MB
+     * and uLong implemented on 32 bits.
+     */
+    init_block(s);
+
+    if (last) {
+        bi_windup(s);
 #ifdef ZLIB_DEBUG
-        s->compressed_len += 7;  /* align on byte boundary */ 
-#endif 
-    } 
-    Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len>>3, 
-           s->compressed_len-7*last)); 
-} 
- 
-/* =========================================================================== 
- * Save the match info and tally the frequency counts. Return true if 
- * the current block must be flushed. 
- */ 
-int ZLIB_INTERNAL _tr_tally (s, dist, lc) 
-    deflate_state *s; 
-    unsigned dist;  /* distance of matched string */ 
-    unsigned lc;    /* match length-MIN_MATCH or unmatched char (if dist==0) */ 
-{ 
-    s->d_buf[s->last_lit] = (ush)dist; 
-    s->l_buf[s->last_lit++] = (uch)lc; 
-    if (dist == 0) { 
-        /* lc is the unmatched char */ 
-        s->dyn_ltree[lc].Freq++; 
-    } else { 
-        s->matches++; 
-        /* Here, lc is the match length - MIN_MATCH */ 
-        dist--;             /* dist = match distance - 1 */ 
-        Assert((ush)dist < (ush)MAX_DIST(s) && 
-               (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) && 
-               (ush)d_code(dist) < (ush)D_CODES,  "_tr_tally: bad match"); 
- 
-        s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++; 
-        s->dyn_dtree[d_code(dist)].Freq++; 
-    } 
- 
-#ifdef TRUNCATE_BLOCK 
-    /* Try to guess if it is profitable to stop the current block here */ 
-    if ((s->last_lit & 0x1fff) == 0 && s->level > 2) { 
-        /* Compute an upper bound for the compressed length */ 
-        ulg out_length = (ulg)s->last_lit*8L; 
-        ulg in_length = (ulg)((long)s->strstart - s->block_start); 
-        int dcode; 
-        for (dcode = 0; dcode < D_CODES; dcode++) { 
-            out_length += (ulg)s->dyn_dtree[dcode].Freq * 
-                (5L+extra_dbits[dcode]); 
-        } 
-        out_length >>= 3; 
-        Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ", 
-               s->last_lit, in_length, out_length, 
-               100L - out_length*100L/in_length)); 
-        if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1; 
-    } 
-#endif 
-    return (s->last_lit == s->lit_bufsize-1); 
-    /* We avoid equality with lit_bufsize because of wraparound at 64K 
-     * on 16 bit machines and because stored blocks are restricted to 
-     * 64K-1 bytes. 
-     */ 
-} 
- 
-/* =========================================================================== 
- * Send the block data compressed using the given Huffman trees 
- */ 
-local void compress_block(s, ltree, dtree) 
-    deflate_state *s; 
-    const ct_data *ltree; /* literal tree */ 
-    const ct_data *dtree; /* distance tree */ 
-{ 
-    unsigned dist;      /* distance of matched string */ 
-    int lc;             /* match length or unmatched char (if dist == 0) */ 
-    unsigned lx = 0;    /* running index in l_buf */ 
-    unsigned code;      /* the code to send */ 
-    int extra;          /* number of extra bits to send */ 
- 
-    if (s->last_lit != 0) do { 
-        dist = s->d_buf[lx]; 
-        lc = s->l_buf[lx++]; 
-        if (dist == 0) { 
-            send_code(s, lc, ltree); /* send a literal byte */ 
-            Tracecv(isgraph(lc), (stderr," '%c' ", lc)); 
-        } else { 
-            /* Here, lc is the match length - MIN_MATCH */ 
-            code = _length_code[lc]; 
-            send_code(s, code+LITERALS+1, ltree); /* send the length code */ 
-            extra = extra_lbits[code]; 
-            if (extra != 0) { 
-                lc -= base_length[code]; 
-                send_bits(s, lc, extra);       /* send the extra length bits */ 
-            } 
-            dist--; /* dist is now the match distance - 1 */ 
-            code = d_code(dist); 
-            Assert (code < D_CODES, "bad d_code"); 
- 
-            send_code(s, code, dtree);       /* send the distance code */ 
-            extra = extra_dbits[code]; 
-            if (extra != 0) { 
+        s->compressed_len += 7;  /* align on byte boundary */
+#endif
+    }
+    Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len>>3,
+           s->compressed_len-7*last));
+}
+
+/* ===========================================================================
+ * Save the match info and tally the frequency counts. Return true if
+ * the current block must be flushed.
+ */
+int ZLIB_INTERNAL _tr_tally (s, dist, lc)
+    deflate_state *s;
+    unsigned dist;  /* distance of matched string */
+    unsigned lc;    /* match length-MIN_MATCH or unmatched char (if dist==0) */
+{
+    s->d_buf[s->last_lit] = (ush)dist;
+    s->l_buf[s->last_lit++] = (uch)lc;
+    if (dist == 0) {
+        /* lc is the unmatched char */
+        s->dyn_ltree[lc].Freq++;
+    } else {
+        s->matches++;
+        /* Here, lc is the match length - MIN_MATCH */
+        dist--;             /* dist = match distance - 1 */
+        Assert((ush)dist < (ush)MAX_DIST(s) &&
+               (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) &&
+               (ush)d_code(dist) < (ush)D_CODES,  "_tr_tally: bad match");
+
+        s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++;
+        s->dyn_dtree[d_code(dist)].Freq++;
+    }
+
+#ifdef TRUNCATE_BLOCK
+    /* Try to guess if it is profitable to stop the current block here */
+    if ((s->last_lit & 0x1fff) == 0 && s->level > 2) {
+        /* Compute an upper bound for the compressed length */
+        ulg out_length = (ulg)s->last_lit*8L;
+        ulg in_length = (ulg)((long)s->strstart - s->block_start);
+        int dcode;
+        for (dcode = 0; dcode < D_CODES; dcode++) {
+            out_length += (ulg)s->dyn_dtree[dcode].Freq *
+                (5L+extra_dbits[dcode]);
+        }
+        out_length >>= 3;
+        Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ",
+               s->last_lit, in_length, out_length,
+               100L - out_length*100L/in_length));
+        if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1;
+    }
+#endif
+    return (s->last_lit == s->lit_bufsize-1);
+    /* We avoid equality with lit_bufsize because of wraparound at 64K
+     * on 16 bit machines and because stored blocks are restricted to
+     * 64K-1 bytes.
+     */
+}
+
+/* ===========================================================================
+ * Send the block data compressed using the given Huffman trees
+ */
+local void compress_block(s, ltree, dtree)
+    deflate_state *s;
+    const ct_data *ltree; /* literal tree */
+    const ct_data *dtree; /* distance tree */
+{
+    unsigned dist;      /* distance of matched string */
+    int lc;             /* match length or unmatched char (if dist == 0) */
+    unsigned lx = 0;    /* running index in l_buf */
+    unsigned code;      /* the code to send */
+    int extra;          /* number of extra bits to send */
+
+    if (s->last_lit != 0) do {
+        dist = s->d_buf[lx];
+        lc = s->l_buf[lx++];
+        if (dist == 0) {
+            send_code(s, lc, ltree); /* send a literal byte */
+            Tracecv(isgraph(lc), (stderr," '%c' ", lc));
+        } else {
+            /* Here, lc is the match length - MIN_MATCH */
+            code = _length_code[lc];
+            send_code(s, code+LITERALS+1, ltree); /* send the length code */
+            extra = extra_lbits[code];
+            if (extra != 0) {
+                lc -= base_length[code];
+                send_bits(s, lc, extra);       /* send the extra length bits */
+            }
+            dist--; /* dist is now the match distance - 1 */
+            code = d_code(dist);
+            Assert (code < D_CODES, "bad d_code");
+
+            send_code(s, code, dtree);       /* send the distance code */
+            extra = extra_dbits[code];
+            if (extra != 0) {
                 dist -= (unsigned)base_dist[code];
-                send_bits(s, dist, extra);   /* send the extra distance bits */ 
-            } 
-        } /* literal or match pair ? */ 
- 
-        /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */ 
-        Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx, 
-               "pendingBuf overflow"); 
- 
-    } while (lx < s->last_lit); 
- 
-    send_code(s, END_BLOCK, ltree); 
-} 
- 
-/* =========================================================================== 
- * Check if the data type is TEXT or BINARY, using the following algorithm: 
- * - TEXT if the two conditions below are satisfied: 
- *    a) There are no non-portable control characters belonging to the 
- *       "black list" (0..6, 14..25, 28..31). 
- *    b) There is at least one printable character belonging to the 
- *       "white list" (9 {TAB}, 10 {LF}, 13 {CR}, 32..255). 
- * - BINARY otherwise. 
- * - The following partially-portable control characters form a 
- *   "gray list" that is ignored in this detection algorithm: 
- *   (7 {BEL}, 8 {BS}, 11 {VT}, 12 {FF}, 26 {SUB}, 27 {ESC}). 
- * IN assertion: the fields Freq of dyn_ltree are set. 
- */ 
-local int detect_data_type(s) 
-    deflate_state *s; 
-{ 
-    /* black_mask is the bit mask of black-listed bytes 
-     * set bits 0..6, 14..25, and 28..31 
-     * 0xf3ffc07f = binary 11110011111111111100000001111111 
-     */ 
-    unsigned long black_mask = 0xf3ffc07fUL; 
-    int n; 
- 
-    /* Check for non-textual ("black-listed") bytes. */ 
-    for (n = 0; n <= 31; n++, black_mask >>= 1) 
-        if ((black_mask & 1) && (s->dyn_ltree[n].Freq != 0)) 
-            return Z_BINARY; 
- 
-    /* Check for textual ("white-listed") bytes. */ 
-    if (s->dyn_ltree[9].Freq != 0 || s->dyn_ltree[10].Freq != 0 
-            || s->dyn_ltree[13].Freq != 0) 
-        return Z_TEXT; 
-    for (n = 32; n < LITERALS; n++) 
-        if (s->dyn_ltree[n].Freq != 0) 
-            return Z_TEXT; 
- 
-    /* There are no "black-listed" or "white-listed" bytes: 
-     * this stream either is empty or has tolerated ("gray-listed") bytes only. 
-     */ 
-    return Z_BINARY; 
-} 
- 
-/* =========================================================================== 
- * Reverse the first len bits of a code, using straightforward code (a faster 
- * method would use a table) 
- * IN assertion: 1 <= len <= 15 
- */ 
-local unsigned bi_reverse(code, len) 
-    unsigned code; /* the value to invert */ 
-    int len;       /* its bit length */ 
-{ 
+                send_bits(s, dist, extra);   /* send the extra distance bits */
+            }
+        } /* literal or match pair ? */
+
+        /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */
+        Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx,
+               "pendingBuf overflow");
+
+    } while (lx < s->last_lit);
+
+    send_code(s, END_BLOCK, ltree);
+}
+
+/* ===========================================================================
+ * Check if the data type is TEXT or BINARY, using the following algorithm:
+ * - TEXT if the two conditions below are satisfied:
+ *    a) There are no non-portable control characters belonging to the
+ *       "black list" (0..6, 14..25, 28..31).
+ *    b) There is at least one printable character belonging to the
+ *       "white list" (9 {TAB}, 10 {LF}, 13 {CR}, 32..255).
+ * - BINARY otherwise.
+ * - The following partially-portable control characters form a
+ *   "gray list" that is ignored in this detection algorithm:
+ *   (7 {BEL}, 8 {BS}, 11 {VT}, 12 {FF}, 26 {SUB}, 27 {ESC}).
+ * IN assertion: the fields Freq of dyn_ltree are set.
+ */
+local int detect_data_type(s)
+    deflate_state *s;
+{
+    /* black_mask is the bit mask of black-listed bytes
+     * set bits 0..6, 14..25, and 28..31
+     * 0xf3ffc07f = binary 11110011111111111100000001111111
+     */
+    unsigned long black_mask = 0xf3ffc07fUL;
+    int n;
+
+    /* Check for non-textual ("black-listed") bytes. */
+    for (n = 0; n <= 31; n++, black_mask >>= 1)
+        if ((black_mask & 1) && (s->dyn_ltree[n].Freq != 0))
+            return Z_BINARY;
+
+    /* Check for textual ("white-listed") bytes. */
+    if (s->dyn_ltree[9].Freq != 0 || s->dyn_ltree[10].Freq != 0
+            || s->dyn_ltree[13].Freq != 0)
+        return Z_TEXT;
+    for (n = 32; n < LITERALS; n++)
+        if (s->dyn_ltree[n].Freq != 0)
+            return Z_TEXT;
+
+    /* There are no "black-listed" or "white-listed" bytes:
+     * this stream either is empty or has tolerated ("gray-listed") bytes only.
+     */
+    return Z_BINARY;
+}
+
+/* ===========================================================================
+ * Reverse the first len bits of a code, using straightforward code (a faster
+ * method would use a table)
+ * IN assertion: 1 <= len <= 15
+ */
+local unsigned bi_reverse(code, len)
+    unsigned code; /* the value to invert */
+    int len;       /* its bit length */
+{
     register unsigned res = 0;
-    do { 
-        res |= code & 1; 
-        code >>= 1, res <<= 1; 
-    } while (--len > 0); 
-    return res >> 1; 
-} 
- 
-/* =========================================================================== 
- * Flush the bit buffer, keeping at most 7 bits in it. 
- */ 
-local void bi_flush(s) 
-    deflate_state *s; 
-{ 
-    if (s->bi_valid == 16) { 
-        put_short(s, s->bi_buf); 
-        s->bi_buf = 0; 
-        s->bi_valid = 0; 
-    } else if (s->bi_valid >= 8) { 
-        put_byte(s, (Byte)s->bi_buf); 
-        s->bi_buf >>= 8; 
-        s->bi_valid -= 8; 
-    } 
-} 
- 
-/* =========================================================================== 
- * Flush the bit buffer and align the output on a byte boundary 
- */ 
-local void bi_windup(s) 
-    deflate_state *s; 
-{ 
-    if (s->bi_valid > 8) { 
-        put_short(s, s->bi_buf); 
-    } else if (s->bi_valid > 0) { 
-        put_byte(s, (Byte)s->bi_buf); 
-    } 
-    s->bi_buf = 0; 
-    s->bi_valid = 0; 
+    do {
+        res |= code & 1;
+        code >>= 1, res <<= 1;
+    } while (--len > 0);
+    return res >> 1;
+}
+
+/* ===========================================================================
+ * Flush the bit buffer, keeping at most 7 bits in it.
+ */
+local void bi_flush(s)
+    deflate_state *s;
+{
+    if (s->bi_valid == 16) {
+        put_short(s, s->bi_buf);
+        s->bi_buf = 0;
+        s->bi_valid = 0;
+    } else if (s->bi_valid >= 8) {
+        put_byte(s, (Byte)s->bi_buf);
+        s->bi_buf >>= 8;
+        s->bi_valid -= 8;
+    }
+}
+
+/* ===========================================================================
+ * Flush the bit buffer and align the output on a byte boundary
+ */
+local void bi_windup(s)
+    deflate_state *s;
+{
+    if (s->bi_valid > 8) {
+        put_short(s, s->bi_buf);
+    } else if (s->bi_valid > 0) {
+        put_byte(s, (Byte)s->bi_buf);
+    }
+    s->bi_buf = 0;
+    s->bi_valid = 0;
 #ifdef ZLIB_DEBUG
-    s->bits_sent = (s->bits_sent+7) & ~7; 
-#endif 
-} 
+    s->bits_sent = (s->bits_sent+7) & ~7;
+#endif
+}
diff --git a/contrib/libs/zlib/trees.h b/contrib/libs/zlib/trees.h
index e3beb5a68e..d35639d82a 100644
--- a/contrib/libs/zlib/trees.h
+++ b/contrib/libs/zlib/trees.h
@@ -1,128 +1,128 @@
-/* header created automatically with -DGEN_TREES_H */ 
- 
-local const ct_data static_ltree[L_CODES+2] = { 
-{{ 12},{  8}}, {{140},{  8}}, {{ 76},{  8}}, {{204},{  8}}, {{ 44},{  8}}, 
-{{172},{  8}}, {{108},{  8}}, {{236},{  8}}, {{ 28},{  8}}, {{156},{  8}}, 
-{{ 92},{  8}}, {{220},{  8}}, {{ 60},{  8}}, {{188},{  8}}, {{124},{  8}}, 
-{{252},{  8}}, {{  2},{  8}}, {{130},{  8}}, {{ 66},{  8}}, {{194},{  8}}, 
-{{ 34},{  8}}, {{162},{  8}}, {{ 98},{  8}}, {{226},{  8}}, {{ 18},{  8}}, 
-{{146},{  8}}, {{ 82},{  8}}, {{210},{  8}}, {{ 50},{  8}}, {{178},{  8}}, 
-{{114},{  8}}, {{242},{  8}}, {{ 10},{  8}}, {{138},{  8}}, {{ 74},{  8}}, 
-{{202},{  8}}, {{ 42},{  8}}, {{170},{  8}}, {{106},{  8}}, {{234},{  8}}, 
-{{ 26},{  8}}, {{154},{  8}}, {{ 90},{  8}}, {{218},{  8}}, {{ 58},{  8}}, 
-{{186},{  8}}, {{122},{  8}}, {{250},{  8}}, {{  6},{  8}}, {{134},{  8}}, 
-{{ 70},{  8}}, {{198},{  8}}, {{ 38},{  8}}, {{166},{  8}}, {{102},{  8}}, 
-{{230},{  8}}, {{ 22},{  8}}, {{150},{  8}}, {{ 86},{  8}}, {{214},{  8}}, 
-{{ 54},{  8}}, {{182},{  8}}, {{118},{  8}}, {{246},{  8}}, {{ 14},{  8}}, 
-{{142},{  8}}, {{ 78},{  8}}, {{206},{  8}}, {{ 46},{  8}}, {{174},{  8}}, 
-{{110},{  8}}, {{238},{  8}}, {{ 30},{  8}}, {{158},{  8}}, {{ 94},{  8}}, 
-{{222},{  8}}, {{ 62},{  8}}, {{190},{  8}}, {{126},{  8}}, {{254},{  8}}, 
-{{  1},{  8}}, {{129},{  8}}, {{ 65},{  8}}, {{193},{  8}}, {{ 33},{  8}}, 
-{{161},{  8}}, {{ 97},{  8}}, {{225},{  8}}, {{ 17},{  8}}, {{145},{  8}}, 
-{{ 81},{  8}}, {{209},{  8}}, {{ 49},{  8}}, {{177},{  8}}, {{113},{  8}}, 
-{{241},{  8}}, {{  9},{  8}}, {{137},{  8}}, {{ 73},{  8}}, {{201},{  8}}, 
-{{ 41},{  8}}, {{169},{  8}}, {{105},{  8}}, {{233},{  8}}, {{ 25},{  8}}, 
-{{153},{  8}}, {{ 89},{  8}}, {{217},{  8}}, {{ 57},{  8}}, {{185},{  8}}, 
-{{121},{  8}}, {{249},{  8}}, {{  5},{  8}}, {{133},{  8}}, {{ 69},{  8}}, 
-{{197},{  8}}, {{ 37},{  8}}, {{165},{  8}}, {{101},{  8}}, {{229},{  8}}, 
-{{ 21},{  8}}, {{149},{  8}}, {{ 85},{  8}}, {{213},{  8}}, {{ 53},{  8}}, 
-{{181},{  8}}, {{117},{  8}}, {{245},{  8}}, {{ 13},{  8}}, {{141},{  8}}, 
-{{ 77},{  8}}, {{205},{  8}}, {{ 45},{  8}}, {{173},{  8}}, {{109},{  8}}, 
-{{237},{  8}}, {{ 29},{  8}}, {{157},{  8}}, {{ 93},{  8}}, {{221},{  8}}, 
-{{ 61},{  8}}, {{189},{  8}}, {{125},{  8}}, {{253},{  8}}, {{ 19},{  9}}, 
-{{275},{  9}}, {{147},{  9}}, {{403},{  9}}, {{ 83},{  9}}, {{339},{  9}}, 
-{{211},{  9}}, {{467},{  9}}, {{ 51},{  9}}, {{307},{  9}}, {{179},{  9}}, 
-{{435},{  9}}, {{115},{  9}}, {{371},{  9}}, {{243},{  9}}, {{499},{  9}}, 
-{{ 11},{  9}}, {{267},{  9}}, {{139},{  9}}, {{395},{  9}}, {{ 75},{  9}}, 
-{{331},{  9}}, {{203},{  9}}, {{459},{  9}}, {{ 43},{  9}}, {{299},{  9}}, 
-{{171},{  9}}, {{427},{  9}}, {{107},{  9}}, {{363},{  9}}, {{235},{  9}}, 
-{{491},{  9}}, {{ 27},{  9}}, {{283},{  9}}, {{155},{  9}}, {{411},{  9}}, 
-{{ 91},{  9}}, {{347},{  9}}, {{219},{  9}}, {{475},{  9}}, {{ 59},{  9}}, 
-{{315},{  9}}, {{187},{  9}}, {{443},{  9}}, {{123},{  9}}, {{379},{  9}}, 
-{{251},{  9}}, {{507},{  9}}, {{  7},{  9}}, {{263},{  9}}, {{135},{  9}}, 
-{{391},{  9}}, {{ 71},{  9}}, {{327},{  9}}, {{199},{  9}}, {{455},{  9}}, 
-{{ 39},{  9}}, {{295},{  9}}, {{167},{  9}}, {{423},{  9}}, {{103},{  9}}, 
-{{359},{  9}}, {{231},{  9}}, {{487},{  9}}, {{ 23},{  9}}, {{279},{  9}}, 
-{{151},{  9}}, {{407},{  9}}, {{ 87},{  9}}, {{343},{  9}}, {{215},{  9}}, 
-{{471},{  9}}, {{ 55},{  9}}, {{311},{  9}}, {{183},{  9}}, {{439},{  9}}, 
-{{119},{  9}}, {{375},{  9}}, {{247},{  9}}, {{503},{  9}}, {{ 15},{  9}}, 
-{{271},{  9}}, {{143},{  9}}, {{399},{  9}}, {{ 79},{  9}}, {{335},{  9}}, 
-{{207},{  9}}, {{463},{  9}}, {{ 47},{  9}}, {{303},{  9}}, {{175},{  9}}, 
-{{431},{  9}}, {{111},{  9}}, {{367},{  9}}, {{239},{  9}}, {{495},{  9}}, 
-{{ 31},{  9}}, {{287},{  9}}, {{159},{  9}}, {{415},{  9}}, {{ 95},{  9}}, 
-{{351},{  9}}, {{223},{  9}}, {{479},{  9}}, {{ 63},{  9}}, {{319},{  9}}, 
-{{191},{  9}}, {{447},{  9}}, {{127},{  9}}, {{383},{  9}}, {{255},{  9}}, 
-{{511},{  9}}, {{  0},{  7}}, {{ 64},{  7}}, {{ 32},{  7}}, {{ 96},{  7}}, 
-{{ 16},{  7}}, {{ 80},{  7}}, {{ 48},{  7}}, {{112},{  7}}, {{  8},{  7}}, 
-{{ 72},{  7}}, {{ 40},{  7}}, {{104},{  7}}, {{ 24},{  7}}, {{ 88},{  7}}, 
-{{ 56},{  7}}, {{120},{  7}}, {{  4},{  7}}, {{ 68},{  7}}, {{ 36},{  7}}, 
-{{100},{  7}}, {{ 20},{  7}}, {{ 84},{  7}}, {{ 52},{  7}}, {{116},{  7}}, 
-{{  3},{  8}}, {{131},{  8}}, {{ 67},{  8}}, {{195},{  8}}, {{ 35},{  8}}, 
-{{163},{  8}}, {{ 99},{  8}}, {{227},{  8}} 
-}; 
- 
-local const ct_data static_dtree[D_CODES] = { 
-{{ 0},{ 5}}, {{16},{ 5}}, {{ 8},{ 5}}, {{24},{ 5}}, {{ 4},{ 5}}, 
-{{20},{ 5}}, {{12},{ 5}}, {{28},{ 5}}, {{ 2},{ 5}}, {{18},{ 5}}, 
-{{10},{ 5}}, {{26},{ 5}}, {{ 6},{ 5}}, {{22},{ 5}}, {{14},{ 5}}, 
-{{30},{ 5}}, {{ 1},{ 5}}, {{17},{ 5}}, {{ 9},{ 5}}, {{25},{ 5}}, 
-{{ 5},{ 5}}, {{21},{ 5}}, {{13},{ 5}}, {{29},{ 5}}, {{ 3},{ 5}}, 
-{{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}} 
-}; 
- 
-const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = { 
- 0,  1,  2,  3,  4,  4,  5,  5,  6,  6,  6,  6,  7,  7,  7,  7,  8,  8,  8,  8, 
- 8,  8,  8,  8,  9,  9,  9,  9,  9,  9,  9,  9, 10, 10, 10, 10, 10, 10, 10, 10, 
-10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 
-11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 
-12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13, 
-13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 
-13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15, 
-15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
-15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
-15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,  0,  0, 16, 17, 
-18, 18, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22, 
-23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 
-24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 
-26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
-26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 
-27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 
-27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 
-28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 
-28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 
-28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 
-29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 
-29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 
-29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29 
-}; 
- 
-const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= { 
- 0,  1,  2,  3,  4,  5,  6,  7,  8,  8,  9,  9, 10, 10, 11, 11, 12, 12, 12, 12, 
-13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16, 
-17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19, 
-19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 
-21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22, 
-22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23, 
-23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 
-24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 
-25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 
-25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26, 
-26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
-26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 
-27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28 
-}; 
- 
-local const int base_length[LENGTH_CODES] = { 
-0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56, 
-64, 80, 96, 112, 128, 160, 192, 224, 0 
-}; 
- 
-local const int base_dist[D_CODES] = { 
-    0,     1,     2,     3,     4,     6,     8,    12,    16,    24, 
-   32,    48,    64,    96,   128,   192,   256,   384,   512,   768, 
- 1024,  1536,  2048,  3072,  4096,  6144,  8192, 12288, 16384, 24576 
-}; 
+/* header created automatically with -DGEN_TREES_H */
+
+local const ct_data static_ltree[L_CODES+2] = {
+{{ 12},{  8}}, {{140},{  8}}, {{ 76},{  8}}, {{204},{  8}}, {{ 44},{  8}},
+{{172},{  8}}, {{108},{  8}}, {{236},{  8}}, {{ 28},{  8}}, {{156},{  8}},
+{{ 92},{  8}}, {{220},{  8}}, {{ 60},{  8}}, {{188},{  8}}, {{124},{  8}},
+{{252},{  8}}, {{  2},{  8}}, {{130},{  8}}, {{ 66},{  8}}, {{194},{  8}},
+{{ 34},{  8}}, {{162},{  8}}, {{ 98},{  8}}, {{226},{  8}}, {{ 18},{  8}},
+{{146},{  8}}, {{ 82},{  8}}, {{210},{  8}}, {{ 50},{  8}}, {{178},{  8}},
+{{114},{  8}}, {{242},{  8}}, {{ 10},{  8}}, {{138},{  8}}, {{ 74},{  8}},
+{{202},{  8}}, {{ 42},{  8}}, {{170},{  8}}, {{106},{  8}}, {{234},{  8}},
+{{ 26},{  8}}, {{154},{  8}}, {{ 90},{  8}}, {{218},{  8}}, {{ 58},{  8}},
+{{186},{  8}}, {{122},{  8}}, {{250},{  8}}, {{  6},{  8}}, {{134},{  8}},
+{{ 70},{  8}}, {{198},{  8}}, {{ 38},{  8}}, {{166},{  8}}, {{102},{  8}},
+{{230},{  8}}, {{ 22},{  8}}, {{150},{  8}}, {{ 86},{  8}}, {{214},{  8}},
+{{ 54},{  8}}, {{182},{  8}}, {{118},{  8}}, {{246},{  8}}, {{ 14},{  8}},
+{{142},{  8}}, {{ 78},{  8}}, {{206},{  8}}, {{ 46},{  8}}, {{174},{  8}},
+{{110},{  8}}, {{238},{  8}}, {{ 30},{  8}}, {{158},{  8}}, {{ 94},{  8}},
+{{222},{  8}}, {{ 62},{  8}}, {{190},{  8}}, {{126},{  8}}, {{254},{  8}},
+{{  1},{  8}}, {{129},{  8}}, {{ 65},{  8}}, {{193},{  8}}, {{ 33},{  8}},
+{{161},{  8}}, {{ 97},{  8}}, {{225},{  8}}, {{ 17},{  8}}, {{145},{  8}},
+{{ 81},{  8}}, {{209},{  8}}, {{ 49},{  8}}, {{177},{  8}}, {{113},{  8}},
+{{241},{  8}}, {{  9},{  8}}, {{137},{  8}}, {{ 73},{  8}}, {{201},{  8}},
+{{ 41},{  8}}, {{169},{  8}}, {{105},{  8}}, {{233},{  8}}, {{ 25},{  8}},
+{{153},{  8}}, {{ 89},{  8}}, {{217},{  8}}, {{ 57},{  8}}, {{185},{  8}},
+{{121},{  8}}, {{249},{  8}}, {{  5},{  8}}, {{133},{  8}}, {{ 69},{  8}},
+{{197},{  8}}, {{ 37},{  8}}, {{165},{  8}}, {{101},{  8}}, {{229},{  8}},
+{{ 21},{  8}}, {{149},{  8}}, {{ 85},{  8}}, {{213},{  8}}, {{ 53},{  8}},
+{{181},{  8}}, {{117},{  8}}, {{245},{  8}}, {{ 13},{  8}}, {{141},{  8}},
+{{ 77},{  8}}, {{205},{  8}}, {{ 45},{  8}}, {{173},{  8}}, {{109},{  8}},
+{{237},{  8}}, {{ 29},{  8}}, {{157},{  8}}, {{ 93},{  8}}, {{221},{  8}},
+{{ 61},{  8}}, {{189},{  8}}, {{125},{  8}}, {{253},{  8}}, {{ 19},{  9}},
+{{275},{  9}}, {{147},{  9}}, {{403},{  9}}, {{ 83},{  9}}, {{339},{  9}},
+{{211},{  9}}, {{467},{  9}}, {{ 51},{  9}}, {{307},{  9}}, {{179},{  9}},
+{{435},{  9}}, {{115},{  9}}, {{371},{  9}}, {{243},{  9}}, {{499},{  9}},
+{{ 11},{  9}}, {{267},{  9}}, {{139},{  9}}, {{395},{  9}}, {{ 75},{  9}},
+{{331},{  9}}, {{203},{  9}}, {{459},{  9}}, {{ 43},{  9}}, {{299},{  9}},
+{{171},{  9}}, {{427},{  9}}, {{107},{  9}}, {{363},{  9}}, {{235},{  9}},
+{{491},{  9}}, {{ 27},{  9}}, {{283},{  9}}, {{155},{  9}}, {{411},{  9}},
+{{ 91},{  9}}, {{347},{  9}}, {{219},{  9}}, {{475},{  9}}, {{ 59},{  9}},
+{{315},{  9}}, {{187},{  9}}, {{443},{  9}}, {{123},{  9}}, {{379},{  9}},
+{{251},{  9}}, {{507},{  9}}, {{  7},{  9}}, {{263},{  9}}, {{135},{  9}},
+{{391},{  9}}, {{ 71},{  9}}, {{327},{  9}}, {{199},{  9}}, {{455},{  9}},
+{{ 39},{  9}}, {{295},{  9}}, {{167},{  9}}, {{423},{  9}}, {{103},{  9}},
+{{359},{  9}}, {{231},{  9}}, {{487},{  9}}, {{ 23},{  9}}, {{279},{  9}},
+{{151},{  9}}, {{407},{  9}}, {{ 87},{  9}}, {{343},{  9}}, {{215},{  9}},
+{{471},{  9}}, {{ 55},{  9}}, {{311},{  9}}, {{183},{  9}}, {{439},{  9}},
+{{119},{  9}}, {{375},{  9}}, {{247},{  9}}, {{503},{  9}}, {{ 15},{  9}},
+{{271},{  9}}, {{143},{  9}}, {{399},{  9}}, {{ 79},{  9}}, {{335},{  9}},
+{{207},{  9}}, {{463},{  9}}, {{ 47},{  9}}, {{303},{  9}}, {{175},{  9}},
+{{431},{  9}}, {{111},{  9}}, {{367},{  9}}, {{239},{  9}}, {{495},{  9}},
+{{ 31},{  9}}, {{287},{  9}}, {{159},{  9}}, {{415},{  9}}, {{ 95},{  9}},
+{{351},{  9}}, {{223},{  9}}, {{479},{  9}}, {{ 63},{  9}}, {{319},{  9}},
+{{191},{  9}}, {{447},{  9}}, {{127},{  9}}, {{383},{  9}}, {{255},{  9}},
+{{511},{  9}}, {{  0},{  7}}, {{ 64},{  7}}, {{ 32},{  7}}, {{ 96},{  7}},
+{{ 16},{  7}}, {{ 80},{  7}}, {{ 48},{  7}}, {{112},{  7}}, {{  8},{  7}},
+{{ 72},{  7}}, {{ 40},{  7}}, {{104},{  7}}, {{ 24},{  7}}, {{ 88},{  7}},
+{{ 56},{  7}}, {{120},{  7}}, {{  4},{  7}}, {{ 68},{  7}}, {{ 36},{  7}},
+{{100},{  7}}, {{ 20},{  7}}, {{ 84},{  7}}, {{ 52},{  7}}, {{116},{  7}},
+{{  3},{  8}}, {{131},{  8}}, {{ 67},{  8}}, {{195},{  8}}, {{ 35},{  8}},
+{{163},{  8}}, {{ 99},{  8}}, {{227},{  8}}
+};
+
+local const ct_data static_dtree[D_CODES] = {
+{{ 0},{ 5}}, {{16},{ 5}}, {{ 8},{ 5}}, {{24},{ 5}}, {{ 4},{ 5}},
+{{20},{ 5}}, {{12},{ 5}}, {{28},{ 5}}, {{ 2},{ 5}}, {{18},{ 5}},
+{{10},{ 5}}, {{26},{ 5}}, {{ 6},{ 5}}, {{22},{ 5}}, {{14},{ 5}},
+{{30},{ 5}}, {{ 1},{ 5}}, {{17},{ 5}}, {{ 9},{ 5}}, {{25},{ 5}},
+{{ 5},{ 5}}, {{21},{ 5}}, {{13},{ 5}}, {{29},{ 5}}, {{ 3},{ 5}},
+{{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}}
+};
+
+const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = {
+ 0,  1,  2,  3,  4,  4,  5,  5,  6,  6,  6,  6,  7,  7,  7,  7,  8,  8,  8,  8,
+ 8,  8,  8,  8,  9,  9,  9,  9,  9,  9,  9,  9, 10, 10, 10, 10, 10, 10, 10, 10,
+10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
+12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13,
+13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15,
+15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,  0,  0, 16, 17,
+18, 18, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22,
+23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27,
+27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29
+};
+
+const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= {
+ 0,  1,  2,  3,  4,  5,  6,  7,  8,  8,  9,  9, 10, 10, 11, 11, 12, 12, 12, 12,
+13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16,
+17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19,
+19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22,
+22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23,
+23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26,
+26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28
+};
+
+local const int base_length[LENGTH_CODES] = {
+0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56,
+64, 80, 96, 112, 128, 160, 192, 224, 0
+};
+
+local const int base_dist[D_CODES] = {
+    0,     1,     2,     3,     4,     6,     8,    12,    16,    24,
+   32,    48,    64,    96,   128,   192,   256,   384,   512,   768,
+ 1024,  1536,  2048,  3072,  4096,  6144,  8192, 12288, 16384, 24576
+};
 
diff --git a/contrib/libs/zlib/uncompr.c b/contrib/libs/zlib/uncompr.c
index c0501ab2a7..f03a1a865e 100644
--- a/contrib/libs/zlib/uncompr.c
+++ b/contrib/libs/zlib/uncompr.c
@@ -1,14 +1,14 @@
-/* uncompr.c -- decompress a memory buffer 
+/* uncompr.c -- decompress a memory buffer
  * Copyright (C) 1995-2003, 2010, 2014, 2016 Jean-loup Gailly, Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */ 
- 
-/* @(#) $Id$ */ 
- 
-#define ZLIB_INTERNAL 
-#include "zlib.h" 
- 
-/* =========================================================================== 
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
+#define ZLIB_INTERNAL
+#include "zlib.h"
+
+/* ===========================================================================
      Decompresses the source buffer into the destination buffer.  *sourceLen is
    the byte length of the source buffer. Upon entry, *destLen is the total size
    of the destination buffer, which must be large enough to hold the entire
@@ -18,24 +18,24 @@
    *destLen is the size of the decompressed data and *sourceLen is the number
    of source bytes consumed. Upon return, source + *sourceLen points to the
    first unused input byte.
- 
+
      uncompress returns Z_OK if success, Z_MEM_ERROR if there was not enough
    memory, Z_BUF_ERROR if there was not enough room in the output buffer, or
    Z_DATA_ERROR if the input data was corrupted, including if the input data is
    an incomplete zlib stream.
-*/ 
+*/
 int ZEXPORT uncompress2 (dest, destLen, source, sourceLen)
-    Bytef *dest; 
-    uLongf *destLen; 
-    const Bytef *source; 
+    Bytef *dest;
+    uLongf *destLen;
+    const Bytef *source;
     uLong *sourceLen;
-{ 
-    z_stream stream; 
-    int err; 
+{
+    z_stream stream;
+    int err;
     const uInt max = (uInt)-1;
     uLong len, left;
     Byte buf[1];    /* for detection of incomplete stream when *destLen == 0 */
- 
+
     len = *sourceLen;
     if (*destLen) {
         left = *destLen;
@@ -46,18 +46,18 @@ int ZEXPORT uncompress2 (dest, destLen, source, sourceLen)
         dest = buf;
     }
 
-    stream.next_in = (z_const Bytef *)source; 
+    stream.next_in = (z_const Bytef *)source;
     stream.avail_in = 0;
-    stream.zalloc = (alloc_func)0; 
-    stream.zfree = (free_func)0; 
+    stream.zalloc = (alloc_func)0;
+    stream.zfree = (free_func)0;
     stream.opaque = (voidpf)0;
- 
-    err = inflateInit(&stream); 
-    if (err != Z_OK) return err; 
- 
+
+    err = inflateInit(&stream);
+    if (err != Z_OK) return err;
+
     stream.next_out = dest;
     stream.avail_out = 0;
- 
+
     do {
         if (stream.avail_out == 0) {
             stream.avail_out = left > (uLong)max ? max : (uInt)left;
@@ -81,7 +81,7 @@ int ZEXPORT uncompress2 (dest, destLen, source, sourceLen)
            err == Z_NEED_DICT ? Z_DATA_ERROR  :
            err == Z_BUF_ERROR && left + stream.avail_out ? Z_DATA_ERROR :
            err;
-} 
+}
 
 int ZEXPORT uncompress (dest, destLen, source, sourceLen)
     Bytef *dest;
diff --git a/contrib/libs/zlib/ya.make b/contrib/libs/zlib/ya.make
index 745d9a3ab1..ced6573475 100644
--- a/contrib/libs/zlib/ya.make
+++ b/contrib/libs/zlib/ya.make
@@ -1,9 +1,9 @@
 # Generated by devtools/yamaker from nixpkgs 5852a21819542e6809f68ba5a798600e69874e76.
 
-LIBRARY() 
+LIBRARY()
 
 OWNER(g:cpp-contrib)
- 
+
 VERSION(1.2.11)
 
 ORIGINAL_SOURCE(https://www.zlib.net/fossils/zlib-1.2.11.tar.gz)
@@ -22,25 +22,25 @@ ADDINCL(
 )
 
 NO_COMPILER_WARNINGS()
- 
+
 NO_RUNTIME()
 
-SRCS( 
-    adler32.c 
-    compress.c 
-    crc32.c 
-    deflate.c 
-    gzclose.c 
-    gzlib.c 
-    gzread.c 
-    gzwrite.c 
-    infback.c 
-    inffast.c 
-    inflate.c 
-    inftrees.c 
-    trees.c 
-    uncompr.c 
-    zutil.c 
-) 
- 
-END() 
+SRCS(
+    adler32.c
+    compress.c
+    crc32.c
+    deflate.c
+    gzclose.c
+    gzlib.c
+    gzread.c
+    gzwrite.c
+    infback.c
+    inffast.c
+    inflate.c
+    inftrees.c
+    trees.c
+    uncompr.c
+    zutil.c
+)
+
+END()
diff --git a/contrib/libs/zlib/zconf.h b/contrib/libs/zlib/zconf.h
index 2a3489917a..b73be42ba5 100644
--- a/contrib/libs/zlib/zconf.h
+++ b/contrib/libs/zlib/zconf.h
@@ -1,22 +1,22 @@
-/* zconf.h -- configuration of the zlib compression library 
+/* zconf.h -- configuration of the zlib compression library
  * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */ 
- 
-/* @(#) $Id$ */ 
- 
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
 #ifndef ZCONF_H
 #define ZCONF_H
- 
-/* 
- * If you *really* need a unique prefix for all types and library functions, 
- * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it. 
- * Even better than compiling with -DZ_PREFIX would be to use configure to set 
- * this permanently in zconf.h using "./configure --zprefix". 
- */ 
-#ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */ 
-#  define Z_PREFIX_SET 
- 
+
+/*
+ * If you *really* need a unique prefix for all types and library functions,
+ * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
+ * Even better than compiling with -DZ_PREFIX would be to use configure to set
+ * this permanently in zconf.h using "./configure --zprefix".
+ */
+#ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
+#  define Z_PREFIX_SET
+
 /* all linked symbols and init macros */
 #  define _dist_code            z__dist_code
 #  define _length_code          z__length_code
@@ -30,11 +30,11 @@
 #  define adler32_combine       z_adler32_combine
 #  define adler32_combine64     z_adler32_combine64
 #  define adler32_z             z_adler32_z
-#  ifndef Z_SOLO 
+#  ifndef Z_SOLO
 #    define compress              z_compress
 #    define compress2             z_compress2
 #    define compressBound         z_compressBound
-#  endif 
+#  endif
 #  define crc32                 z_crc32
 #  define crc32_combine         z_crc32_combine
 #  define crc32_combine64       z_crc32_combine64
@@ -58,7 +58,7 @@
 #  define deflateTune           z_deflateTune
 #  define deflate_copyright     z_deflate_copyright
 #  define get_crc_table         z_get_crc_table
-#  ifndef Z_SOLO 
+#  ifndef Z_SOLO
 #    define gz_error              z_gz_error
 #    define gz_intmax             z_gz_intmax
 #    define gz_strwinerror        z_gz_strwinerror
@@ -81,9 +81,9 @@
 #    define gzoffset64            z_gzoffset64
 #    define gzopen                z_gzopen
 #    define gzopen64              z_gzopen64
-#    ifdef _WIN32 
+#    ifdef _WIN32
 #      define gzopen_w              z_gzopen_w
-#    endif 
+#    endif
 #    define gzprintf              z_gzprintf
 #    define gzputc                z_gzputc
 #    define gzputs                z_gzputs
@@ -97,7 +97,7 @@
 #    define gzungetc              z_gzungetc
 #    define gzvprintf             z_gzvprintf
 #    define gzwrite               z_gzwrite
-#  endif 
+#  endif
 #  define inflate               z_inflate
 #  define inflateBack           z_inflateBack
 #  define inflateBackEnd        z_inflateBackEnd
@@ -125,27 +125,27 @@
 #  define inflate_copyright     z_inflate_copyright
 #  define inflate_fast          z_inflate_fast
 #  define inflate_table         z_inflate_table
-#  ifndef Z_SOLO 
+#  ifndef Z_SOLO
 #    define uncompress            z_uncompress
 #    define uncompress2           z_uncompress2
-#  endif 
+#  endif
 #  define zError                z_zError
-#  ifndef Z_SOLO 
+#  ifndef Z_SOLO
 #    define zcalloc               z_zcalloc
 #    define zcfree                z_zcfree
-#  endif 
+#  endif
 #  define zlibCompileFlags      z_zlibCompileFlags
 #  define zlibVersion           z_zlibVersion
- 
-/* all zlib typedefs in zlib.h and zconf.h */ 
+
+/* all zlib typedefs in zlib.h and zconf.h */
 #  define Byte                  z_Byte
 #  define Bytef                 z_Bytef
 #  define alloc_func            z_alloc_func
 #  define charf                 z_charf
 #  define free_func             z_free_func
-#  ifndef Z_SOLO 
+#  ifndef Z_SOLO
 #    define gzFile                z_gzFile
-#  endif 
+#  endif
 #  define gz_header             z_gz_header
 #  define gz_headerp            z_gz_headerp
 #  define in_func               z_in_func
@@ -158,85 +158,85 @@
 #  define voidp                 z_voidp
 #  define voidpc                z_voidpc
 #  define voidpf                z_voidpf
- 
-/* all zlib structs in zlib.h and zconf.h */ 
+
+/* all zlib structs in zlib.h and zconf.h */
 #  define gz_header_s           z_gz_header_s
 #  define internal_state        z_internal_state
- 
-#endif 
- 
-#if defined(__MSDOS__) && !defined(MSDOS) 
-#  define MSDOS 
-#endif 
-#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2) 
-#  define OS2 
-#endif 
-#if defined(_WINDOWS) && !defined(WINDOWS) 
-#  define WINDOWS 
-#endif 
-#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__) 
-#  ifndef WIN32 
-#    define WIN32 
-#  endif 
-#endif 
-#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32) 
-#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__) 
-#    ifndef SYS16BIT 
-#      define SYS16BIT 
-#    endif 
-#  endif 
-#endif 
- 
-/* 
- * Compile with -DMAXSEG_64K if the alloc function cannot allocate more 
- * than 64k bytes at a time (needed on systems with 16-bit int). 
- */ 
-#ifdef SYS16BIT 
-#  define MAXSEG_64K 
-#endif 
-#if defined(MSDOS) || defined(_i386_) || defined(_x86_64_) 
-#  define UNALIGNED_OK 
-#endif 
- 
-#ifdef __STDC_VERSION__ 
-#  ifndef STDC 
-#    define STDC 
-#  endif 
-#  if __STDC_VERSION__ >= 199901L 
-#    ifndef STDC99 
-#      define STDC99 
-#    endif 
-#  endif 
-#endif 
-#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus)) 
-#  define STDC 
-#endif 
-#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__)) 
-#  define STDC 
-#endif 
-#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32)) 
-#  define STDC 
-#endif 
-#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__)) 
-#  define STDC 
-#endif 
- 
-#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */ 
-#  define STDC 
-#endif 
- 
-#ifndef STDC 
-#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */ 
-#    define const       /* note: need a more gentle solution here */ 
-#  endif 
-#endif 
- 
-#if defined(ZLIB_CONST) && !defined(z_const) 
-#  define z_const const 
-#else 
-#  define z_const 
-#endif 
- 
+
+#endif
+
+#if defined(__MSDOS__) && !defined(MSDOS)
+#  define MSDOS
+#endif
+#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
+#  define OS2
+#endif
+#if defined(_WINDOWS) && !defined(WINDOWS)
+#  define WINDOWS
+#endif
+#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
+#  ifndef WIN32
+#    define WIN32
+#  endif
+#endif
+#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
+#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
+#    ifndef SYS16BIT
+#      define SYS16BIT
+#    endif
+#  endif
+#endif
+
+/*
+ * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
+ * than 64k bytes at a time (needed on systems with 16-bit int).
+ */
+#ifdef SYS16BIT
+#  define MAXSEG_64K
+#endif
+#if defined(MSDOS) || defined(_i386_) || defined(_x86_64_)
+#  define UNALIGNED_OK
+#endif
+
+#ifdef __STDC_VERSION__
+#  ifndef STDC
+#    define STDC
+#  endif
+#  if __STDC_VERSION__ >= 199901L
+#    ifndef STDC99
+#      define STDC99
+#    endif
+#  endif
+#endif
+#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
+#  define STDC
+#endif
+
+#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */
+#  define STDC
+#endif
+
+#ifndef STDC
+#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
+#    define const       /* note: need a more gentle solution here */
+#  endif
+#endif
+
+#if defined(ZLIB_CONST) && !defined(z_const)
+#  define z_const const
+#else
+#  define z_const
+#endif
+
 #ifdef Z_SOLO
    typedef unsigned long z_size_t;
 #else
@@ -250,129 +250,129 @@
      typedef unsigned long z_size_t;
 #  endif
 #  undef z_longlong
-#endif 
- 
-/* Maximum value for memLevel in deflateInit2 */ 
-#ifndef MAX_MEM_LEVEL 
-#  ifdef MAXSEG_64K 
-#    define MAX_MEM_LEVEL 8 
-#  else 
-#    define MAX_MEM_LEVEL 9 
-#  endif 
-#endif 
- 
-/* Maximum value for windowBits in deflateInit2 and inflateInit2. 
- * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files 
- * created by gzip. (Files created by minigzip can still be extracted by 
- * gzip.) 
- */ 
-#ifndef MAX_WBITS 
-#  define MAX_WBITS   15 /* 32K LZ77 window */ 
-#endif 
- 
-/* The memory requirements for deflate are (in bytes): 
-            (1 << (windowBits+2)) +  (1 << (memLevel+9)) 
- that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values) 
- plus a few kilobytes for small objects. For example, if you want to reduce 
- the default memory requirements from 256K to 128K, compile with 
-     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7" 
- Of course this will generally degrade compression (there's no free lunch). 
- 
-   The memory requirements for inflate are (in bytes) 1 << windowBits 
+#endif
+
+/* Maximum value for memLevel in deflateInit2 */
+#ifndef MAX_MEM_LEVEL
+#  ifdef MAXSEG_64K
+#    define MAX_MEM_LEVEL 8
+#  else
+#    define MAX_MEM_LEVEL 9
+#  endif
+#endif
+
+/* Maximum value for windowBits in deflateInit2 and inflateInit2.
+ * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
+ * created by gzip. (Files created by minigzip can still be extracted by
+ * gzip.)
+ */
+#ifndef MAX_WBITS
+#  define MAX_WBITS   15 /* 32K LZ77 window */
+#endif
+
+/* The memory requirements for deflate are (in bytes):
+            (1 << (windowBits+2)) +  (1 << (memLevel+9))
+ that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
+ plus a few kilobytes for small objects. For example, if you want to reduce
+ the default memory requirements from 256K to 128K, compile with
+     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
+ Of course this will generally degrade compression (there's no free lunch).
+
+   The memory requirements for inflate are (in bytes) 1 << windowBits
  that is, 32K for windowBits=15 (default value) plus about 7 kilobytes
- for small objects. 
-*/ 
- 
-                        /* Type declarations */ 
- 
-#ifndef OF /* function prototypes */ 
-#  ifdef STDC 
-#    define OF(args)  args 
-#  else 
-#    define OF(args)  () 
-#  endif 
-#endif 
- 
-#ifndef Z_ARG /* function prototypes for stdarg */ 
-#  if defined(STDC) || defined(Z_HAVE_STDARG_H) 
-#    define Z_ARG(args)  args 
-#  else 
-#    define Z_ARG(args)  () 
-#  endif 
-#endif 
- 
-/* The following definitions for FAR are needed only for MSDOS mixed 
- * model programming (small or medium model with some far allocations). 
- * This was tested only with MSC; for other MSDOS compilers you may have 
- * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model, 
- * just define FAR to be empty. 
- */ 
-#ifdef SYS16BIT 
-#  if defined(M_I86SM) || defined(M_I86MM) 
-     /* MSC small or medium model */ 
-#    define SMALL_MEDIUM 
-#    ifdef _MSC_VER 
-#      define FAR _far 
-#    else 
-#      define FAR far 
-#    endif 
-#  endif 
-#  if (defined(__SMALL__) || defined(__MEDIUM__)) 
-     /* Turbo C small or medium model */ 
-#    define SMALL_MEDIUM 
-#    ifdef __BORLANDC__ 
-#      define FAR _far 
-#    else 
-#      define FAR far 
-#    endif 
-#  endif 
-#endif 
- 
-#if defined(WINDOWS) || defined(WIN32) 
-   /* If building or using zlib as a DLL, define ZLIB_DLL. 
-    * This is not mandatory, but it offers a little performance increase. 
-    */ 
-#  ifdef ZLIB_DLL 
-#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500)) 
-#      ifdef ZLIB_INTERNAL 
-#        define ZEXTERN extern __declspec(dllexport) 
-#      else 
-#        define ZEXTERN extern __declspec(dllimport) 
-#      endif 
-#    endif 
-#  endif  /* ZLIB_DLL */ 
-   /* If building or using zlib with the WINAPI/WINAPIV calling convention, 
-    * define ZLIB_WINAPI. 
-    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI. 
-    */ 
-#  ifdef ZLIB_WINAPI 
-#    ifdef FAR 
-#      undef FAR 
-#    endif 
-#    include <windows.h> 
-     /* No need for _export, use ZLIB.DEF instead. */ 
-     /* For complete Windows compatibility, use WINAPI, not __stdcall. */ 
-#    define ZEXPORT WINAPI 
-#    ifdef WIN32 
-#      define ZEXPORTVA WINAPIV 
-#    else 
-#      define ZEXPORTVA FAR CDECL 
-#    endif 
-#  endif 
-#endif 
- 
-#if defined (__BEOS__) 
-#  ifdef ZLIB_DLL 
-#    ifdef ZLIB_INTERNAL 
-#      define ZEXPORT   __declspec(dllexport) 
-#      define ZEXPORTVA __declspec(dllexport) 
-#    else 
-#      define ZEXPORT   __declspec(dllimport) 
-#      define ZEXPORTVA __declspec(dllimport) 
-#    endif 
-#  endif 
-#endif 
- 
+ for small objects.
+*/
+
+                        /* Type declarations */
+
+#ifndef OF /* function prototypes */
+#  ifdef STDC
+#    define OF(args)  args
+#  else
+#    define OF(args)  ()
+#  endif
+#endif
+
+#ifndef Z_ARG /* function prototypes for stdarg */
+#  if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#    define Z_ARG(args)  args
+#  else
+#    define Z_ARG(args)  ()
+#  endif
+#endif
+
+/* The following definitions for FAR are needed only for MSDOS mixed
+ * model programming (small or medium model with some far allocations).
+ * This was tested only with MSC; for other MSDOS compilers you may have
+ * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
+ * just define FAR to be empty.
+ */
+#ifdef SYS16BIT
+#  if defined(M_I86SM) || defined(M_I86MM)
+     /* MSC small or medium model */
+#    define SMALL_MEDIUM
+#    ifdef _MSC_VER
+#      define FAR _far
+#    else
+#      define FAR far
+#    endif
+#  endif
+#  if (defined(__SMALL__) || defined(__MEDIUM__))
+     /* Turbo C small or medium model */
+#    define SMALL_MEDIUM
+#    ifdef __BORLANDC__
+#      define FAR _far
+#    else
+#      define FAR far
+#    endif
+#  endif
+#endif
+
+#if defined(WINDOWS) || defined(WIN32)
+   /* If building or using zlib as a DLL, define ZLIB_DLL.
+    * This is not mandatory, but it offers a little performance increase.
+    */
+#  ifdef ZLIB_DLL
+#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
+#      ifdef ZLIB_INTERNAL
+#        define ZEXTERN extern __declspec(dllexport)
+#      else
+#        define ZEXTERN extern __declspec(dllimport)
+#      endif
+#    endif
+#  endif  /* ZLIB_DLL */
+   /* If building or using zlib with the WINAPI/WINAPIV calling convention,
+    * define ZLIB_WINAPI.
+    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
+    */
+#  ifdef ZLIB_WINAPI
+#    ifdef FAR
+#      undef FAR
+#    endif
+#    include <windows.h>
+     /* No need for _export, use ZLIB.DEF instead. */
+     /* For complete Windows compatibility, use WINAPI, not __stdcall. */
+#    define ZEXPORT WINAPI
+#    ifdef WIN32
+#      define ZEXPORTVA WINAPIV
+#    else
+#      define ZEXPORTVA FAR CDECL
+#    endif
+#  endif
+#endif
+
+#if defined (__BEOS__)
+#  ifdef ZLIB_DLL
+#    ifdef ZLIB_INTERNAL
+#      define ZEXPORT   __declspec(dllexport)
+#      define ZEXPORTVA __declspec(dllexport)
+#    else
+#      define ZEXPORT   __declspec(dllimport)
+#      define ZEXPORTVA __declspec(dllimport)
+#    endif
+#  endif
+#endif
+
 #if !defined(WINDOWS) && !defined(WIN32) && !defined(__BEOS__)
 #  ifdef ZLIB_DLL
 #    define ZEXPORT __attribute__((visibility("default")))
@@ -380,170 +380,170 @@
 #  endif
 #endif
 
-#ifndef ZEXTERN 
-#  define ZEXTERN extern 
-#endif 
-#ifndef ZEXPORT 
-#  define ZEXPORT 
-#endif 
-#ifndef ZEXPORTVA 
-#  define ZEXPORTVA 
-#endif 
- 
-#ifndef FAR 
-#  define FAR 
-#endif 
- 
-#if !defined(__MACTYPES__) 
-typedef unsigned char  Byte;  /* 8 bits */ 
-#endif 
-typedef unsigned int   uInt;  /* 16 bits or more */ 
-typedef unsigned long  uLong; /* 32 bits or more */ 
- 
-#ifdef SMALL_MEDIUM 
-   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */ 
-#  define Bytef Byte FAR 
-#else 
-   typedef Byte  FAR Bytef; 
-#endif 
-typedef char  FAR charf; 
-typedef int   FAR intf; 
-typedef uInt  FAR uIntf; 
-typedef uLong FAR uLongf; 
- 
-#ifdef STDC 
-   typedef void const *voidpc; 
-   typedef void FAR   *voidpf; 
-   typedef void       *voidp; 
-#else 
-   typedef Byte const *voidpc; 
-   typedef Byte FAR   *voidpf; 
-   typedef Byte       *voidp; 
-#endif 
- 
-#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC) 
-#  include <limits.h> 
-#  if (UINT_MAX == 0xffffffffUL) 
-#    define Z_U4 unsigned 
-#  elif (ULONG_MAX == 0xffffffffUL) 
-#    define Z_U4 unsigned long 
-#  elif (USHRT_MAX == 0xffffffffUL) 
-#    define Z_U4 unsigned short 
-#  endif 
-#endif 
- 
-#ifdef Z_U4 
-   typedef Z_U4 z_crc_t; 
-#else 
-   typedef unsigned long z_crc_t; 
-#endif 
- 
+#ifndef ZEXTERN
+#  define ZEXTERN extern
+#endif
+#ifndef ZEXPORT
+#  define ZEXPORT
+#endif
+#ifndef ZEXPORTVA
+#  define ZEXPORTVA
+#endif
+
+#ifndef FAR
+#  define FAR
+#endif
+
+#if !defined(__MACTYPES__)
+typedef unsigned char  Byte;  /* 8 bits */
+#endif
+typedef unsigned int   uInt;  /* 16 bits or more */
+typedef unsigned long  uLong; /* 32 bits or more */
+
+#ifdef SMALL_MEDIUM
+   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
+#  define Bytef Byte FAR
+#else
+   typedef Byte  FAR Bytef;
+#endif
+typedef char  FAR charf;
+typedef int   FAR intf;
+typedef uInt  FAR uIntf;
+typedef uLong FAR uLongf;
+
+#ifdef STDC
+   typedef void const *voidpc;
+   typedef void FAR   *voidpf;
+   typedef void       *voidp;
+#else
+   typedef Byte const *voidpc;
+   typedef Byte FAR   *voidpf;
+   typedef Byte       *voidp;
+#endif
+
+#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
+#  include <limits.h>
+#  if (UINT_MAX == 0xffffffffUL)
+#    define Z_U4 unsigned
+#  elif (ULONG_MAX == 0xffffffffUL)
+#    define Z_U4 unsigned long
+#  elif (USHRT_MAX == 0xffffffffUL)
+#    define Z_U4 unsigned short
+#  endif
+#endif
+
+#ifdef Z_U4
+   typedef Z_U4 z_crc_t;
+#else
+   typedef unsigned long z_crc_t;
+#endif
+
 #ifdef __GNUC__
-#  define Z_HAVE_UNISTD_H 
+#  define Z_HAVE_UNISTD_H
 #else
 #  if __has_include(<unistd.h>)
 #    define Z_HAVE_UNISTD_H
 #  endif
-#endif 
- 
+#endif
+
 #ifdef __GNUC__
 #  define Z_HAVE_UNISTD_H
 #else
 #  if __has_include(<stdarg.h>)
 #    define Z_HAVE_STDARG_H
 #  endif
-#endif 
- 
-#ifdef STDC 
-#  ifndef Z_SOLO 
-#    include <sys/types.h>      /* for off_t */ 
-#  endif 
-#endif 
- 
-#if defined(STDC) || defined(Z_HAVE_STDARG_H) 
-#  ifndef Z_SOLO 
-#    include <stdarg.h>         /* for va_list */ 
-#  endif 
-#endif 
- 
-#ifdef _WIN32 
-#  ifndef Z_SOLO 
-#    include <stddef.h>         /* for wchar_t */ 
-#  endif 
-#endif 
- 
-/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and 
- * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even 
- * though the former does not conform to the LFS document), but considering 
- * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as 
- * equivalently requesting no 64-bit operations 
- */ 
-#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1 
-#  undef _LARGEFILE64_SOURCE 
-#endif 
- 
-#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H) 
-#  define Z_HAVE_UNISTD_H 
-#endif 
-#ifndef Z_SOLO 
+#endif
+
+#ifdef STDC
+#  ifndef Z_SOLO
+#    include <sys/types.h>      /* for off_t */
+#  endif
+#endif
+
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#  ifndef Z_SOLO
+#    include <stdarg.h>         /* for va_list */
+#  endif
+#endif
+
+#ifdef _WIN32
+#  ifndef Z_SOLO
+#    include <stddef.h>         /* for wchar_t */
+#  endif
+#endif
+
+/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
+ * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
+ * though the former does not conform to the LFS document), but considering
+ * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
+ * equivalently requesting no 64-bit operations
+ */
+#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
+#  undef _LARGEFILE64_SOURCE
+#endif
+
+#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
+#  define Z_HAVE_UNISTD_H
+#endif
+#ifndef Z_SOLO
 #  if !defined(_WINDOWS) && (defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE))
-#    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */ 
-#    ifdef VMS 
-#      include <unixio.h>       /* for off_t */ 
-#    endif 
-#    ifndef z_off_t 
-#      define z_off_t off_t 
-#    endif 
-#  endif 
-#endif 
- 
-#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0 
-#  define Z_LFS64 
-#endif 
- 
-#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64) 
-#  define Z_LARGE64 
-#endif 
- 
-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64) 
-#  define Z_WANT64 
-#endif 
- 
-#if !defined(SEEK_SET) && !defined(Z_SOLO) 
-#  define SEEK_SET        0       /* Seek from beginning of file.  */ 
-#  define SEEK_CUR        1       /* Seek from current position.  */ 
-#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */ 
-#endif 
- 
-#ifndef z_off_t 
-#  define z_off_t long 
-#endif 
- 
-#if !defined(_WIN32) && defined(Z_LARGE64) 
-#  define z_off64_t off64_t 
-#else 
-#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO) 
-#    define z_off64_t __int64 
-#  else 
-#    define z_off64_t z_off_t 
-#  endif 
-#endif 
- 
-/* MVS linker does not support external names larger than 8 bytes */ 
-#if defined(__MVS__) 
-  #pragma map(deflateInit_,"DEIN") 
-  #pragma map(deflateInit2_,"DEIN2") 
-  #pragma map(deflateEnd,"DEEND") 
-  #pragma map(deflateBound,"DEBND") 
-  #pragma map(inflateInit_,"ININ") 
-  #pragma map(inflateInit2_,"ININ2") 
-  #pragma map(inflateEnd,"INEND") 
-  #pragma map(inflateSync,"INSY") 
-  #pragma map(inflateSetDictionary,"INSEDI") 
-  #pragma map(compressBound,"CMBND") 
-  #pragma map(inflate_table,"INTABL") 
-  #pragma map(inflate_fast,"INFA") 
-  #pragma map(inflate_copyright,"INCOPY") 
-#endif 
+#    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
+#    ifdef VMS
+#      include <unixio.h>       /* for off_t */
+#    endif
+#    ifndef z_off_t
+#      define z_off_t off_t
+#    endif
+#  endif
+#endif
+
+#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
+#  define Z_LFS64
+#endif
+
+#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
+#  define Z_LARGE64
+#endif
+
+#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
+#  define Z_WANT64
+#endif
+
+#if !defined(SEEK_SET) && !defined(Z_SOLO)
+#  define SEEK_SET        0       /* Seek from beginning of file.  */
+#  define SEEK_CUR        1       /* Seek from current position.  */
+#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
+#endif
+
+#ifndef z_off_t
+#  define z_off_t long
+#endif
+
+#if !defined(_WIN32) && defined(Z_LARGE64)
+#  define z_off64_t off64_t
+#else
+#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
+#    define z_off64_t __int64
+#  else
+#    define z_off64_t z_off_t
+#  endif
+#endif
+
+/* MVS linker does not support external names larger than 8 bytes */
+#if defined(__MVS__)
+  #pragma map(deflateInit_,"DEIN")
+  #pragma map(deflateInit2_,"DEIN2")
+  #pragma map(deflateEnd,"DEEND")
+  #pragma map(deflateBound,"DEBND")
+  #pragma map(inflateInit_,"ININ")
+  #pragma map(inflateInit2_,"ININ2")
+  #pragma map(inflateEnd,"INEND")
+  #pragma map(inflateSync,"INSY")
+  #pragma map(inflateSetDictionary,"INSEDI")
+  #pragma map(compressBound,"CMBND")
+  #pragma map(inflate_table,"INTABL")
+  #pragma map(inflate_fast,"INFA")
+  #pragma map(inflate_copyright,"INCOPY")
+#endif
 
 #endif /* ZCONF_H */
diff --git a/contrib/libs/zlib/zlib.h b/contrib/libs/zlib/zlib.h
index a84f233721..f09cdaf1e0 100644
--- a/contrib/libs/zlib/zlib.h
+++ b/contrib/libs/zlib/zlib.h
@@ -1,560 +1,560 @@
-/* zlib.h -- interface of the 'zlib' general purpose compression library 
+/* zlib.h -- interface of the 'zlib' general purpose compression library
   version 1.2.11, January 15th, 2017
- 
+
   Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
- 
-  This software is provided 'as-is', without any express or implied 
-  warranty.  In no event will the authors be held liable for any damages 
-  arising from the use of this software. 
- 
-  Permission is granted to anyone to use this software for any purpose, 
-  including commercial applications, and to alter it and redistribute it 
-  freely, subject to the following restrictions: 
- 
-  1. The origin of this software must not be misrepresented; you must not 
-     claim that you wrote the original software. If you use this software 
-     in a product, an acknowledgment in the product documentation would be 
-     appreciated but is not required. 
-  2. Altered source versions must be plainly marked as such, and must not be 
-     misrepresented as being the original software. 
-  3. This notice may not be removed or altered from any source distribution. 
- 
-  Jean-loup Gailly        Mark Adler 
-  jloup@gzip.org          madler@alumni.caltech.edu 
- 
- 
-  The data format used by the zlib library is described by RFCs (Request for 
-  Comments) 1950 to 1952 in the files http://tools.ietf.org/html/rfc1950 
-  (zlib format), rfc1951 (deflate format) and rfc1952 (gzip format). 
-*/ 
- 
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Jean-loup Gailly        Mark Adler
+  jloup@gzip.org          madler@alumni.caltech.edu
+
+
+  The data format used by the zlib library is described by RFCs (Request for
+  Comments) 1950 to 1952 in the files http://tools.ietf.org/html/rfc1950
+  (zlib format), rfc1951 (deflate format) and rfc1952 (gzip format).
+*/
+
 #ifndef ZLIB_H
 #define ZLIB_H
- 
+
 #include "zconf.h"
 
-#ifdef __cplusplus 
-extern "C" { 
-#endif 
- 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define ZLIB_VERSION "1.2.11"
 #define ZLIB_VERNUM 0x12b0
-#define ZLIB_VER_MAJOR 1 
-#define ZLIB_VER_MINOR 2 
+#define ZLIB_VER_MAJOR 1
+#define ZLIB_VER_MINOR 2
 #define ZLIB_VER_REVISION 11
-#define ZLIB_VER_SUBREVISION 0 
- 
-/* 
-    The 'zlib' compression library provides in-memory compression and 
-  decompression functions, including integrity checks of the uncompressed data. 
-  This version of the library supports only one compression method (deflation) 
-  but other algorithms will be added later and will have the same stream 
-  interface. 
- 
-    Compression can be done in a single step if the buffers are large enough, 
-  or can be done by repeated calls of the compression function.  In the latter 
-  case, the application must provide more input and/or consume the output 
-  (providing more output space) before each call. 
- 
-    The compressed data format used by default by the in-memory functions is 
-  the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped 
-  around a deflate stream, which is itself documented in RFC 1951. 
- 
-    The library also supports reading and writing files in gzip (.gz) format 
-  with an interface similar to that of stdio using the functions that start 
-  with "gz".  The gzip format is different from the zlib format.  gzip is a 
-  gzip wrapper, documented in RFC 1952, wrapped around a deflate stream. 
- 
+#define ZLIB_VER_SUBREVISION 0
+
+/*
+    The 'zlib' compression library provides in-memory compression and
+  decompression functions, including integrity checks of the uncompressed data.
+  This version of the library supports only one compression method (deflation)
+  but other algorithms will be added later and will have the same stream
+  interface.
+
+    Compression can be done in a single step if the buffers are large enough,
+  or can be done by repeated calls of the compression function.  In the latter
+  case, the application must provide more input and/or consume the output
+  (providing more output space) before each call.
+
+    The compressed data format used by default by the in-memory functions is
+  the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped
+  around a deflate stream, which is itself documented in RFC 1951.
+
+    The library also supports reading and writing files in gzip (.gz) format
+  with an interface similar to that of stdio using the functions that start
+  with "gz".  The gzip format is different from the zlib format.  gzip is a
+  gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
+
     This library can optionally read and write gzip and raw deflate streams in
   memory as well.
- 
-    The zlib format was designed to be compact and fast for use in memory 
-  and on communications channels.  The gzip format was designed for single- 
-  file compression on file systems, has a larger header than zlib to maintain 
-  directory information, and uses a different, slower check method than zlib. 
- 
-    The library does not install any signal handler.  The decoder checks 
-  the consistency of the compressed data, so the library should never crash 
+
+    The zlib format was designed to be compact and fast for use in memory
+  and on communications channels.  The gzip format was designed for single-
+  file compression on file systems, has a larger header than zlib to maintain
+  directory information, and uses a different, slower check method than zlib.
+
+    The library does not install any signal handler.  The decoder checks
+  the consistency of the compressed data, so the library should never crash
   even in the case of corrupted input.
-*/ 
- 
-typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size)); 
-typedef void   (*free_func)  OF((voidpf opaque, voidpf address)); 
- 
-struct internal_state; 
- 
-typedef struct z_stream_s { 
-    z_const Bytef *next_in;     /* next input byte */ 
-    uInt     avail_in;  /* number of bytes available at next_in */ 
-    uLong    total_in;  /* total number of input bytes read so far */ 
- 
+*/
+
+typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
+typedef void   (*free_func)  OF((voidpf opaque, voidpf address));
+
+struct internal_state;
+
+typedef struct z_stream_s {
+    z_const Bytef *next_in;     /* next input byte */
+    uInt     avail_in;  /* number of bytes available at next_in */
+    uLong    total_in;  /* total number of input bytes read so far */
+
     Bytef    *next_out; /* next output byte will go here */
-    uInt     avail_out; /* remaining free space at next_out */ 
-    uLong    total_out; /* total number of bytes output so far */ 
- 
-    z_const char *msg;  /* last error message, NULL if no error */ 
-    struct internal_state FAR *state; /* not visible by applications */ 
- 
-    alloc_func zalloc;  /* used to allocate the internal state */ 
-    free_func  zfree;   /* used to free the internal state */ 
-    voidpf     opaque;  /* private data object passed to zalloc and zfree */ 
- 
+    uInt     avail_out; /* remaining free space at next_out */
+    uLong    total_out; /* total number of bytes output so far */
+
+    z_const char *msg;  /* last error message, NULL if no error */
+    struct internal_state FAR *state; /* not visible by applications */
+
+    alloc_func zalloc;  /* used to allocate the internal state */
+    free_func  zfree;   /* used to free the internal state */
+    voidpf     opaque;  /* private data object passed to zalloc and zfree */
+
     int     data_type;  /* best guess about the data type: binary or text
                            for deflate, or the decoding state for inflate */
     uLong   adler;      /* Adler-32 or CRC-32 value of the uncompressed data */
-    uLong   reserved;   /* reserved for future use */ 
-} z_stream; 
- 
-typedef z_stream FAR *z_streamp; 
- 
-/* 
-     gzip header information passed to and from zlib routines.  See RFC 1952 
-  for more details on the meanings of these fields. 
-*/ 
-typedef struct gz_header_s { 
-    int     text;       /* true if compressed data believed to be text */ 
-    uLong   time;       /* modification time */ 
-    int     xflags;     /* extra flags (not used when writing a gzip file) */ 
-    int     os;         /* operating system */ 
-    Bytef   *extra;     /* pointer to extra field or Z_NULL if none */ 
-    uInt    extra_len;  /* extra field length (valid if extra != Z_NULL) */ 
-    uInt    extra_max;  /* space at extra (only when reading header) */ 
-    Bytef   *name;      /* pointer to zero-terminated file name or Z_NULL */ 
-    uInt    name_max;   /* space at name (only when reading header) */ 
-    Bytef   *comment;   /* pointer to zero-terminated comment or Z_NULL */ 
-    uInt    comm_max;   /* space at comment (only when reading header) */ 
-    int     hcrc;       /* true if there was or will be a header crc */ 
-    int     done;       /* true when done reading gzip header (not used 
-                           when writing a gzip file) */ 
-} gz_header; 
- 
-typedef gz_header FAR *gz_headerp; 
- 
-/* 
-     The application must update next_in and avail_in when avail_in has dropped 
-   to zero.  It must update next_out and avail_out when avail_out has dropped 
-   to zero.  The application must initialize zalloc, zfree and opaque before 
-   calling the init function.  All other fields are set by the compression 
-   library and must not be updated by the application. 
- 
-     The opaque value provided by the application will be passed as the first 
-   parameter for calls of zalloc and zfree.  This can be useful for custom 
-   memory management.  The compression library attaches no meaning to the 
-   opaque value. 
- 
-     zalloc must return Z_NULL if there is not enough memory for the object. 
-   If zlib is used in a multi-threaded application, zalloc and zfree must be 
+    uLong   reserved;   /* reserved for future use */
+} z_stream;
+
+typedef z_stream FAR *z_streamp;
+
+/*
+     gzip header information passed to and from zlib routines.  See RFC 1952
+  for more details on the meanings of these fields.
+*/
+typedef struct gz_header_s {
+    int     text;       /* true if compressed data believed to be text */
+    uLong   time;       /* modification time */
+    int     xflags;     /* extra flags (not used when writing a gzip file) */
+    int     os;         /* operating system */
+    Bytef   *extra;     /* pointer to extra field or Z_NULL if none */
+    uInt    extra_len;  /* extra field length (valid if extra != Z_NULL) */
+    uInt    extra_max;  /* space at extra (only when reading header) */
+    Bytef   *name;      /* pointer to zero-terminated file name or Z_NULL */
+    uInt    name_max;   /* space at name (only when reading header) */
+    Bytef   *comment;   /* pointer to zero-terminated comment or Z_NULL */
+    uInt    comm_max;   /* space at comment (only when reading header) */
+    int     hcrc;       /* true if there was or will be a header crc */
+    int     done;       /* true when done reading gzip header (not used
+                           when writing a gzip file) */
+} gz_header;
+
+typedef gz_header FAR *gz_headerp;
+
+/*
+     The application must update next_in and avail_in when avail_in has dropped
+   to zero.  It must update next_out and avail_out when avail_out has dropped
+   to zero.  The application must initialize zalloc, zfree and opaque before
+   calling the init function.  All other fields are set by the compression
+   library and must not be updated by the application.
+
+     The opaque value provided by the application will be passed as the first
+   parameter for calls of zalloc and zfree.  This can be useful for custom
+   memory management.  The compression library attaches no meaning to the
+   opaque value.
+
+     zalloc must return Z_NULL if there is not enough memory for the object.
+   If zlib is used in a multi-threaded application, zalloc and zfree must be
    thread safe.  In that case, zlib is thread-safe.  When zalloc and zfree are
    Z_NULL on entry to the initialization function, they are set to internal
    routines that use the standard library functions malloc() and free().
- 
-     On 16-bit systems, the functions zalloc and zfree must be able to allocate 
-   exactly 65536 bytes, but will not be required to allocate more than this if 
-   the symbol MAXSEG_64K is defined (see zconf.h).  WARNING: On MSDOS, pointers 
-   returned by zalloc for objects of exactly 65536 bytes *must* have their 
-   offset normalized to zero.  The default allocation function provided by this 
-   library ensures this (see zutil.c).  To reduce memory requirements and avoid 
-   any allocation of 64K objects, at the expense of compression ratio, compile 
-   the library with -DMAX_WBITS=14 (see zconf.h). 
- 
-     The fields total_in and total_out can be used for statistics or progress 
-   reports.  After compression, total_in holds the total size of the 
+
+     On 16-bit systems, the functions zalloc and zfree must be able to allocate
+   exactly 65536 bytes, but will not be required to allocate more than this if
+   the symbol MAXSEG_64K is defined (see zconf.h).  WARNING: On MSDOS, pointers
+   returned by zalloc for objects of exactly 65536 bytes *must* have their
+   offset normalized to zero.  The default allocation function provided by this
+   library ensures this (see zutil.c).  To reduce memory requirements and avoid
+   any allocation of 64K objects, at the expense of compression ratio, compile
+   the library with -DMAX_WBITS=14 (see zconf.h).
+
+     The fields total_in and total_out can be used for statistics or progress
+   reports.  After compression, total_in holds the total size of the
    uncompressed data and may be saved for use by the decompressor (particularly
-   if the decompressor wants to decompress everything in a single step). 
-*/ 
- 
-                        /* constants */ 
- 
-#define Z_NO_FLUSH      0 
-#define Z_PARTIAL_FLUSH 1 
-#define Z_SYNC_FLUSH    2 
-#define Z_FULL_FLUSH    3 
-#define Z_FINISH        4 
-#define Z_BLOCK         5 
-#define Z_TREES         6 
-/* Allowed flush values; see deflate() and inflate() below for details */ 
- 
-#define Z_OK            0 
-#define Z_STREAM_END    1 
-#define Z_NEED_DICT     2 
-#define Z_ERRNO        (-1) 
-#define Z_STREAM_ERROR (-2) 
-#define Z_DATA_ERROR   (-3) 
-#define Z_MEM_ERROR    (-4) 
-#define Z_BUF_ERROR    (-5) 
-#define Z_VERSION_ERROR (-6) 
-/* Return codes for the compression/decompression functions. Negative values 
- * are errors, positive values are used for special but normal events. 
- */ 
- 
-#define Z_NO_COMPRESSION         0 
-#define Z_BEST_SPEED             1 
-#define Z_BEST_COMPRESSION       9 
-#define Z_DEFAULT_COMPRESSION  (-1) 
-/* compression levels */ 
- 
-#define Z_FILTERED            1 
-#define Z_HUFFMAN_ONLY        2 
-#define Z_RLE                 3 
-#define Z_FIXED               4 
-#define Z_DEFAULT_STRATEGY    0 
-/* compression strategy; see deflateInit2() below for details */ 
- 
-#define Z_BINARY   0 
-#define Z_TEXT     1 
-#define Z_ASCII    Z_TEXT   /* for compatibility with 1.2.2 and earlier */ 
-#define Z_UNKNOWN  2 
+   if the decompressor wants to decompress everything in a single step).
+*/
+
+                        /* constants */
+
+#define Z_NO_FLUSH      0
+#define Z_PARTIAL_FLUSH 1
+#define Z_SYNC_FLUSH    2
+#define Z_FULL_FLUSH    3
+#define Z_FINISH        4
+#define Z_BLOCK         5
+#define Z_TREES         6
+/* Allowed flush values; see deflate() and inflate() below for details */
+
+#define Z_OK            0
+#define Z_STREAM_END    1
+#define Z_NEED_DICT     2
+#define Z_ERRNO        (-1)
+#define Z_STREAM_ERROR (-2)
+#define Z_DATA_ERROR   (-3)
+#define Z_MEM_ERROR    (-4)
+#define Z_BUF_ERROR    (-5)
+#define Z_VERSION_ERROR (-6)
+/* Return codes for the compression/decompression functions. Negative values
+ * are errors, positive values are used for special but normal events.
+ */
+
+#define Z_NO_COMPRESSION         0
+#define Z_BEST_SPEED             1
+#define Z_BEST_COMPRESSION       9
+#define Z_DEFAULT_COMPRESSION  (-1)
+/* compression levels */
+
+#define Z_FILTERED            1
+#define Z_HUFFMAN_ONLY        2
+#define Z_RLE                 3
+#define Z_FIXED               4
+#define Z_DEFAULT_STRATEGY    0
+/* compression strategy; see deflateInit2() below for details */
+
+#define Z_BINARY   0
+#define Z_TEXT     1
+#define Z_ASCII    Z_TEXT   /* for compatibility with 1.2.2 and earlier */
+#define Z_UNKNOWN  2
 /* Possible values of the data_type field for deflate() */
- 
-#define Z_DEFLATED   8 
-/* The deflate compression method (the only one supported in this version) */ 
- 
-#define Z_NULL  0  /* for initializing zalloc, zfree, opaque */ 
- 
-#define zlib_version zlibVersion() 
-/* for compatibility with versions < 1.0.2 */ 
- 
- 
-                        /* basic functions */ 
- 
-ZEXTERN const char * ZEXPORT zlibVersion OF((void)); 
-/* The application can compare zlibVersion and ZLIB_VERSION for consistency. 
-   If the first character differs, the library code actually used is not 
-   compatible with the zlib.h header file used by the application.  This check 
-   is automatically made by deflateInit and inflateInit. 
- */ 
- 
-/* 
-ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level)); 
- 
-     Initializes the internal stream state for compression.  The fields 
-   zalloc, zfree and opaque must be initialized before by the caller.  If 
-   zalloc and zfree are set to Z_NULL, deflateInit updates them to use default 
-   allocation functions. 
- 
-     The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9: 
-   1 gives best speed, 9 gives best compression, 0 gives no compression at all 
-   (the input data is simply copied a block at a time).  Z_DEFAULT_COMPRESSION 
-   requests a default compromise between speed and compression (currently 
-   equivalent to level 6). 
- 
-     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough 
-   memory, Z_STREAM_ERROR if level is not a valid compression level, or 
-   Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible 
-   with the version assumed by the caller (ZLIB_VERSION).  msg is set to null 
-   if there is no error message.  deflateInit does not perform any compression: 
-   this will be done by deflate(). 
-*/ 
- 
- 
-ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush)); 
-/* 
-    deflate compresses as much data as possible, and stops when the input 
-  buffer becomes empty or the output buffer becomes full.  It may introduce 
-  some output latency (reading input without producing any output) except when 
-  forced to flush. 
- 
-    The detailed semantics are as follows.  deflate performs one or both of the 
-  following actions: 
- 
-  - Compress more input starting at next_in and update next_in and avail_in 
-    accordingly.  If not all input can be processed (because there is not 
-    enough room in the output buffer), next_in and avail_in are updated and 
-    processing will resume at this point for the next call of deflate(). 
- 
+
+#define Z_DEFLATED   8
+/* The deflate compression method (the only one supported in this version) */
+
+#define Z_NULL  0  /* for initializing zalloc, zfree, opaque */
+
+#define zlib_version zlibVersion()
+/* for compatibility with versions < 1.0.2 */
+
+
+                        /* basic functions */
+
+ZEXTERN const char * ZEXPORT zlibVersion OF((void));
+/* The application can compare zlibVersion and ZLIB_VERSION for consistency.
+   If the first character differs, the library code actually used is not
+   compatible with the zlib.h header file used by the application.  This check
+   is automatically made by deflateInit and inflateInit.
+ */
+
+/*
+ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
+
+     Initializes the internal stream state for compression.  The fields
+   zalloc, zfree and opaque must be initialized before by the caller.  If
+   zalloc and zfree are set to Z_NULL, deflateInit updates them to use default
+   allocation functions.
+
+     The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
+   1 gives best speed, 9 gives best compression, 0 gives no compression at all
+   (the input data is simply copied a block at a time).  Z_DEFAULT_COMPRESSION
+   requests a default compromise between speed and compression (currently
+   equivalent to level 6).
+
+     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_STREAM_ERROR if level is not a valid compression level, or
+   Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
+   with the version assumed by the caller (ZLIB_VERSION).  msg is set to null
+   if there is no error message.  deflateInit does not perform any compression:
+   this will be done by deflate().
+*/
+
+
+ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
+/*
+    deflate compresses as much data as possible, and stops when the input
+  buffer becomes empty or the output buffer becomes full.  It may introduce
+  some output latency (reading input without producing any output) except when
+  forced to flush.
+
+    The detailed semantics are as follows.  deflate performs one or both of the
+  following actions:
+
+  - Compress more input starting at next_in and update next_in and avail_in
+    accordingly.  If not all input can be processed (because there is not
+    enough room in the output buffer), next_in and avail_in are updated and
+    processing will resume at this point for the next call of deflate().
+
   - Generate more output starting at next_out and update next_out and avail_out
-    accordingly.  This action is forced if the parameter flush is non zero. 
-    Forcing flush frequently degrades the compression ratio, so this parameter 
+    accordingly.  This action is forced if the parameter flush is non zero.
+    Forcing flush frequently degrades the compression ratio, so this parameter
     should be set only when necessary.  Some output may be provided even if
     flush is zero.
- 
-    Before the call of deflate(), the application should ensure that at least 
-  one of the actions is possible, by providing more input and/or consuming more 
-  output, and updating avail_in or avail_out accordingly; avail_out should 
-  never be zero before the call.  The application can consume the compressed 
-  output when it wants, for example when the output buffer is full (avail_out 
-  == 0), or after each call of deflate().  If deflate returns Z_OK and with 
-  zero avail_out, it must be called again after making room in the output 
+
+    Before the call of deflate(), the application should ensure that at least
+  one of the actions is possible, by providing more input and/or consuming more
+  output, and updating avail_in or avail_out accordingly; avail_out should
+  never be zero before the call.  The application can consume the compressed
+  output when it wants, for example when the output buffer is full (avail_out
+  == 0), or after each call of deflate().  If deflate returns Z_OK and with
+  zero avail_out, it must be called again after making room in the output
   buffer because there might be more output pending. See deflatePending(),
   which can be used if desired to determine whether or not there is more ouput
   in that case.
- 
-    Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to 
-  decide how much data to accumulate before producing output, in order to 
-  maximize compression. 
- 
-    If the parameter flush is set to Z_SYNC_FLUSH, all pending output is 
-  flushed to the output buffer and the output is aligned on a byte boundary, so 
-  that the decompressor can get all input data available so far.  (In 
-  particular avail_in is zero after the call if enough output space has been 
-  provided before the call.) Flushing may degrade compression for some 
-  compression algorithms and so it should be used only when necessary.  This 
-  completes the current deflate block and follows it with an empty stored block 
-  that is three bits plus filler bits to the next byte, followed by four bytes 
-  (00 00 ff ff). 
- 
-    If flush is set to Z_PARTIAL_FLUSH, all pending output is flushed to the 
-  output buffer, but the output is not aligned to a byte boundary.  All of the 
-  input data so far will be available to the decompressor, as for Z_SYNC_FLUSH. 
-  This completes the current deflate block and follows it with an empty fixed 
-  codes block that is 10 bits long.  This assures that enough bytes are output 
+
+    Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
+  decide how much data to accumulate before producing output, in order to
+  maximize compression.
+
+    If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
+  flushed to the output buffer and the output is aligned on a byte boundary, so
+  that the decompressor can get all input data available so far.  (In
+  particular avail_in is zero after the call if enough output space has been
+  provided before the call.) Flushing may degrade compression for some
+  compression algorithms and so it should be used only when necessary.  This
+  completes the current deflate block and follows it with an empty stored block
+  that is three bits plus filler bits to the next byte, followed by four bytes
+  (00 00 ff ff).
+
+    If flush is set to Z_PARTIAL_FLUSH, all pending output is flushed to the
+  output buffer, but the output is not aligned to a byte boundary.  All of the
+  input data so far will be available to the decompressor, as for Z_SYNC_FLUSH.
+  This completes the current deflate block and follows it with an empty fixed
+  codes block that is 10 bits long.  This assures that enough bytes are output
   in order for the decompressor to finish the block before the empty fixed
   codes block.
- 
-    If flush is set to Z_BLOCK, a deflate block is completed and emitted, as 
-  for Z_SYNC_FLUSH, but the output is not aligned on a byte boundary, and up to 
-  seven bits of the current block are held to be written as the next byte after 
-  the next deflate block is completed.  In this case, the decompressor may not 
-  be provided enough bits at this point in order to complete decompression of 
-  the data provided so far to the compressor.  It may need to wait for the next 
-  block to be emitted.  This is for advanced applications that need to control 
-  the emission of deflate blocks. 
- 
-    If flush is set to Z_FULL_FLUSH, all output is flushed as with 
-  Z_SYNC_FLUSH, and the compression state is reset so that decompression can 
-  restart from this point if previous compressed data has been damaged or if 
-  random access is desired.  Using Z_FULL_FLUSH too often can seriously degrade 
-  compression. 
- 
-    If deflate returns with avail_out == 0, this function must be called again 
-  with the same value of the flush parameter and more output space (updated 
-  avail_out), until the flush is complete (deflate returns with non-zero 
-  avail_out).  In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that 
-  avail_out is greater than six to avoid repeated flush markers due to 
-  avail_out == 0 on return. 
- 
-    If the parameter flush is set to Z_FINISH, pending input is processed, 
-  pending output is flushed and deflate returns with Z_STREAM_END if there was 
+
+    If flush is set to Z_BLOCK, a deflate block is completed and emitted, as
+  for Z_SYNC_FLUSH, but the output is not aligned on a byte boundary, and up to
+  seven bits of the current block are held to be written as the next byte after
+  the next deflate block is completed.  In this case, the decompressor may not
+  be provided enough bits at this point in order to complete decompression of
+  the data provided so far to the compressor.  It may need to wait for the next
+  block to be emitted.  This is for advanced applications that need to control
+  the emission of deflate blocks.
+
+    If flush is set to Z_FULL_FLUSH, all output is flushed as with
+  Z_SYNC_FLUSH, and the compression state is reset so that decompression can
+  restart from this point if previous compressed data has been damaged or if
+  random access is desired.  Using Z_FULL_FLUSH too often can seriously degrade
+  compression.
+
+    If deflate returns with avail_out == 0, this function must be called again
+  with the same value of the flush parameter and more output space (updated
+  avail_out), until the flush is complete (deflate returns with non-zero
+  avail_out).  In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
+  avail_out is greater than six to avoid repeated flush markers due to
+  avail_out == 0 on return.
+
+    If the parameter flush is set to Z_FINISH, pending input is processed,
+  pending output is flushed and deflate returns with Z_STREAM_END if there was
   enough output space.  If deflate returns with Z_OK or Z_BUF_ERROR, this
   function must be called again with Z_FINISH and more output space (updated
   avail_out) but no more input data, until it returns with Z_STREAM_END or an
   error.  After deflate has returned Z_STREAM_END, the only possible operations
   on the stream are deflateReset or deflateEnd.
- 
+
     Z_FINISH can be used in the first deflate call after deflateInit if all the
   compression is to be done in a single step.  In order to complete in one
   call, avail_out must be at least the value returned by deflateBound (see
   below).  Then deflate is guaranteed to return Z_STREAM_END.  If not enough
   output space is provided, deflate will not return Z_STREAM_END, and it must
   be called again as described above.
- 
+
     deflate() sets strm->adler to the Adler-32 checksum of all input read
   so far (that is, total_in bytes).  If a gzip stream is being generated, then
   strm->adler will be the CRC-32 checksum of the input read so far.  (See
   deflateInit2 below.)
- 
-    deflate() may update strm->data_type if it can make a good guess about 
+
+    deflate() may update strm->data_type if it can make a good guess about
   the input data type (Z_BINARY or Z_TEXT).  If in doubt, the data is
   considered binary.  This field is only for information purposes and does not
   affect the compression algorithm in any manner.
- 
-    deflate() returns Z_OK if some progress has been made (more input 
-  processed or more output produced), Z_STREAM_END if all input has been 
-  consumed and all output has been produced (only when flush is set to 
-  Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example 
+
+    deflate() returns Z_OK if some progress has been made (more input
+  processed or more output produced), Z_STREAM_END if all input has been
+  consumed and all output has been produced (only when flush is set to
+  Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
   if next_in or next_out was Z_NULL or the state was inadvertently written over
   by the application), or Z_BUF_ERROR if no progress is possible (for example
   avail_in or avail_out was zero).  Note that Z_BUF_ERROR is not fatal, and
   deflate() can be called again with more input and more output space to
   continue compressing.
-*/ 
- 
- 
-ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm)); 
-/* 
-     All dynamically allocated data structures for this stream are freed. 
-   This function discards any unprocessed input and does not flush any pending 
-   output. 
- 
-     deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the 
-   stream state was inconsistent, Z_DATA_ERROR if the stream was freed 
-   prematurely (some input or output was discarded).  In the error case, msg 
-   may be set but then points to a static string (which must not be 
-   deallocated). 
-*/ 
- 
- 
-/* 
-ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm)); 
- 
-     Initializes the internal stream state for decompression.  The fields 
-   next_in, avail_in, zalloc, zfree and opaque must be initialized before by 
+*/
+
+
+ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
+/*
+     All dynamically allocated data structures for this stream are freed.
+   This function discards any unprocessed input and does not flush any pending
+   output.
+
+     deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
+   stream state was inconsistent, Z_DATA_ERROR if the stream was freed
+   prematurely (some input or output was discarded).  In the error case, msg
+   may be set but then points to a static string (which must not be
+   deallocated).
+*/
+
+
+/*
+ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
+
+     Initializes the internal stream state for decompression.  The fields
+   next_in, avail_in, zalloc, zfree and opaque must be initialized before by
    the caller.  In the current version of inflate, the provided input is not
    read or consumed.  The allocation of a sliding window will be deferred to
    the first call of inflate (if the decompression does not complete on the
    first call).  If zalloc and zfree are set to Z_NULL, inflateInit updates
    them to use default allocation functions.
- 
-     inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough 
-   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the 
-   version assumed by the caller, or Z_STREAM_ERROR if the parameters are 
-   invalid, such as a null pointer to the structure.  msg is set to null if 
+
+     inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
+   version assumed by the caller, or Z_STREAM_ERROR if the parameters are
+   invalid, such as a null pointer to the structure.  msg is set to null if
    there is no error message.  inflateInit does not perform any decompression.
    Actual decompression will be done by inflate().  So next_in, and avail_in,
    next_out, and avail_out are unused and unchanged.  The current
    implementation of inflateInit() does not process any header information --
    that is deferred until inflate() is called.
-*/ 
- 
- 
-ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush)); 
-/* 
-    inflate decompresses as much data as possible, and stops when the input 
-  buffer becomes empty or the output buffer becomes full.  It may introduce 
-  some output latency (reading input without producing any output) except when 
-  forced to flush. 
- 
-  The detailed semantics are as follows.  inflate performs one or both of the 
-  following actions: 
- 
-  - Decompress more input starting at next_in and update next_in and avail_in 
-    accordingly.  If not all input can be processed (because there is not 
+*/
+
+
+ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
+/*
+    inflate decompresses as much data as possible, and stops when the input
+  buffer becomes empty or the output buffer becomes full.  It may introduce
+  some output latency (reading input without producing any output) except when
+  forced to flush.
+
+  The detailed semantics are as follows.  inflate performs one or both of the
+  following actions:
+
+  - Decompress more input starting at next_in and update next_in and avail_in
+    accordingly.  If not all input can be processed (because there is not
     enough room in the output buffer), then next_in and avail_in are updated
     accordingly, and processing will resume at this point for the next call of
     inflate().
- 
+
   - Generate more output starting at next_out and update next_out and avail_out
-    accordingly.  inflate() provides as much output as possible, until there is 
-    no more input data or no more space in the output buffer (see below about 
-    the flush parameter). 
- 
-    Before the call of inflate(), the application should ensure that at least 
-  one of the actions is possible, by providing more input and/or consuming more 
+    accordingly.  inflate() provides as much output as possible, until there is
+    no more input data or no more space in the output buffer (see below about
+    the flush parameter).
+
+    Before the call of inflate(), the application should ensure that at least
+  one of the actions is possible, by providing more input and/or consuming more
   output, and updating the next_* and avail_* values accordingly.  If the
   caller of inflate() does not provide both available input and available
   output space, it is possible that there will be no progress made.  The
-  application can consume the uncompressed output when it wants, for example 
-  when the output buffer is full (avail_out == 0), or after each call of 
-  inflate().  If inflate returns Z_OK and with zero avail_out, it must be 
-  called again after making room in the output buffer because there might be 
-  more output pending. 
- 
-    The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH, Z_FINISH, 
-  Z_BLOCK, or Z_TREES.  Z_SYNC_FLUSH requests that inflate() flush as much 
-  output as possible to the output buffer.  Z_BLOCK requests that inflate() 
-  stop if and when it gets to the next deflate block boundary.  When decoding 
-  the zlib or gzip format, this will cause inflate() to return immediately 
-  after the header and before the first block.  When doing a raw inflate, 
-  inflate() will go ahead and process the first block, and will return when it 
-  gets to the end of that block, or when it runs out of data. 
- 
-    The Z_BLOCK option assists in appending to or combining deflate streams. 
+  application can consume the uncompressed output when it wants, for example
+  when the output buffer is full (avail_out == 0), or after each call of
+  inflate().  If inflate returns Z_OK and with zero avail_out, it must be
+  called again after making room in the output buffer because there might be
+  more output pending.
+
+    The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH, Z_FINISH,
+  Z_BLOCK, or Z_TREES.  Z_SYNC_FLUSH requests that inflate() flush as much
+  output as possible to the output buffer.  Z_BLOCK requests that inflate()
+  stop if and when it gets to the next deflate block boundary.  When decoding
+  the zlib or gzip format, this will cause inflate() to return immediately
+  after the header and before the first block.  When doing a raw inflate,
+  inflate() will go ahead and process the first block, and will return when it
+  gets to the end of that block, or when it runs out of data.
+
+    The Z_BLOCK option assists in appending to or combining deflate streams.
   To assist in this, on return inflate() always sets strm->data_type to the
-  number of unused bits in the last byte taken from strm->next_in, plus 64 if 
-  inflate() is currently decoding the last block in the deflate stream, plus 
-  128 if inflate() returned immediately after decoding an end-of-block code or 
-  decoding the complete header up to just before the first byte of the deflate 
-  stream.  The end-of-block will not be indicated until all of the uncompressed 
-  data from that block has been written to strm->next_out.  The number of 
-  unused bits may in general be greater than seven, except when bit 7 of 
-  data_type is set, in which case the number of unused bits will be less than 
-  eight.  data_type is set as noted here every time inflate() returns for all 
-  flush options, and so can be used to determine the amount of currently 
-  consumed input in bits. 
- 
-    The Z_TREES option behaves as Z_BLOCK does, but it also returns when the 
-  end of each deflate block header is reached, before any actual data in that 
-  block is decoded.  This allows the caller to determine the length of the 
-  deflate block header for later use in random access within a deflate block. 
-  256 is added to the value of strm->data_type when inflate() returns 
-  immediately after reaching the end of the deflate block header. 
- 
-    inflate() should normally be called until it returns Z_STREAM_END or an 
-  error.  However if all decompression is to be performed in a single step (a 
-  single call of inflate), the parameter flush should be set to Z_FINISH.  In 
-  this case all pending input is processed and all pending output is flushed; 
-  avail_out must be large enough to hold all of the uncompressed data for the 
-  operation to complete.  (The size of the uncompressed data may have been 
+  number of unused bits in the last byte taken from strm->next_in, plus 64 if
+  inflate() is currently decoding the last block in the deflate stream, plus
+  128 if inflate() returned immediately after decoding an end-of-block code or
+  decoding the complete header up to just before the first byte of the deflate
+  stream.  The end-of-block will not be indicated until all of the uncompressed
+  data from that block has been written to strm->next_out.  The number of
+  unused bits may in general be greater than seven, except when bit 7 of
+  data_type is set, in which case the number of unused bits will be less than
+  eight.  data_type is set as noted here every time inflate() returns for all
+  flush options, and so can be used to determine the amount of currently
+  consumed input in bits.
+
+    The Z_TREES option behaves as Z_BLOCK does, but it also returns when the
+  end of each deflate block header is reached, before any actual data in that
+  block is decoded.  This allows the caller to determine the length of the
+  deflate block header for later use in random access within a deflate block.
+  256 is added to the value of strm->data_type when inflate() returns
+  immediately after reaching the end of the deflate block header.
+
+    inflate() should normally be called until it returns Z_STREAM_END or an
+  error.  However if all decompression is to be performed in a single step (a
+  single call of inflate), the parameter flush should be set to Z_FINISH.  In
+  this case all pending input is processed and all pending output is flushed;
+  avail_out must be large enough to hold all of the uncompressed data for the
+  operation to complete.  (The size of the uncompressed data may have been
   saved by the compressor for this purpose.)  The use of Z_FINISH is not
-  required to perform an inflation in one step.  However it may be used to 
-  inform inflate that a faster approach can be used for the single inflate() 
-  call.  Z_FINISH also informs inflate to not maintain a sliding window if the 
-  stream completes, which reduces inflate's memory footprint.  If the stream 
-  does not complete, either because not all of the stream is provided or not 
-  enough output space is provided, then a sliding window will be allocated and 
-  inflate() can be called again to continue the operation as if Z_NO_FLUSH had 
-  been used. 
- 
-     In this implementation, inflate() always flushes as much output as 
-  possible to the output buffer, and always uses the faster approach on the 
-  first call.  So the effects of the flush parameter in this implementation are 
-  on the return value of inflate() as noted below, when inflate() returns early 
-  when Z_BLOCK or Z_TREES is used, and when inflate() avoids the allocation of 
-  memory for a sliding window when Z_FINISH is used. 
- 
-     If a preset dictionary is needed after this call (see inflateSetDictionary 
-  below), inflate sets strm->adler to the Adler-32 checksum of the dictionary 
-  chosen by the compressor and returns Z_NEED_DICT; otherwise it sets 
-  strm->adler to the Adler-32 checksum of all output produced so far (that is, 
-  total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described 
+  required to perform an inflation in one step.  However it may be used to
+  inform inflate that a faster approach can be used for the single inflate()
+  call.  Z_FINISH also informs inflate to not maintain a sliding window if the
+  stream completes, which reduces inflate's memory footprint.  If the stream
+  does not complete, either because not all of the stream is provided or not
+  enough output space is provided, then a sliding window will be allocated and
+  inflate() can be called again to continue the operation as if Z_NO_FLUSH had
+  been used.
+
+     In this implementation, inflate() always flushes as much output as
+  possible to the output buffer, and always uses the faster approach on the
+  first call.  So the effects of the flush parameter in this implementation are
+  on the return value of inflate() as noted below, when inflate() returns early
+  when Z_BLOCK or Z_TREES is used, and when inflate() avoids the allocation of
+  memory for a sliding window when Z_FINISH is used.
+
+     If a preset dictionary is needed after this call (see inflateSetDictionary
+  below), inflate sets strm->adler to the Adler-32 checksum of the dictionary
+  chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
+  strm->adler to the Adler-32 checksum of all output produced so far (that is,
+  total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
   below.  At the end of the stream, inflate() checks that its computed Adler-32
-  checksum is equal to that saved by the compressor and returns Z_STREAM_END 
-  only if the checksum is correct. 
- 
-    inflate() can decompress and check either zlib-wrapped or gzip-wrapped 
-  deflate data.  The header type is detected automatically, if requested when 
-  initializing with inflateInit2().  Any information contained in the gzip 
+  checksum is equal to that saved by the compressor and returns Z_STREAM_END
+  only if the checksum is correct.
+
+    inflate() can decompress and check either zlib-wrapped or gzip-wrapped
+  deflate data.  The header type is detected automatically, if requested when
+  initializing with inflateInit2().  Any information contained in the gzip
   header is not retained unless inflateGetHeader() is used.  When processing
-  gzip-wrapped deflate data, strm->adler32 is set to the CRC-32 of the output 
+  gzip-wrapped deflate data, strm->adler32 is set to the CRC-32 of the output
   produced so far.  The CRC-32 is checked against the gzip trailer, as is the
   uncompressed length, modulo 2^32.
- 
-    inflate() returns Z_OK if some progress has been made (more input processed 
-  or more output produced), Z_STREAM_END if the end of the compressed data has 
-  been reached and all uncompressed output has been produced, Z_NEED_DICT if a 
-  preset dictionary is needed at this point, Z_DATA_ERROR if the input data was 
-  corrupted (input stream not conforming to the zlib format or incorrect check 
+
+    inflate() returns Z_OK if some progress has been made (more input processed
+  or more output produced), Z_STREAM_END if the end of the compressed data has
+  been reached and all uncompressed output has been produced, Z_NEED_DICT if a
+  preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
+  corrupted (input stream not conforming to the zlib format or incorrect check
   value, in which case strm->msg points to a string with a more specific
   error), Z_STREAM_ERROR if the stream structure was inconsistent (for example
   next_in or next_out was Z_NULL, or the state was inadvertently written over
   by the application), Z_MEM_ERROR if there was not enough memory, Z_BUF_ERROR
   if no progress was possible or if there was not enough room in the output
   buffer when Z_FINISH is used.  Note that Z_BUF_ERROR is not fatal, and
-  inflate() can be called again with more input and more output space to 
-  continue decompressing.  If Z_DATA_ERROR is returned, the application may 
-  then call inflateSync() to look for a good compression block if a partial 
+  inflate() can be called again with more input and more output space to
+  continue decompressing.  If Z_DATA_ERROR is returned, the application may
+  then call inflateSync() to look for a good compression block if a partial
   recovery of the data is to be attempted.
-*/ 
- 
- 
-ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm)); 
-/* 
-     All dynamically allocated data structures for this stream are freed. 
-   This function discards any unprocessed input and does not flush any pending 
-   output. 
- 
+*/
+
+
+ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
+/*
+     All dynamically allocated data structures for this stream are freed.
+   This function discards any unprocessed input and does not flush any pending
+   output.
+
      inflateEnd returns Z_OK if success, or Z_STREAM_ERROR if the stream state
    was inconsistent.
-*/ 
- 
- 
-                        /* Advanced functions */ 
- 
-/* 
-    The following functions are needed only in some special applications. 
-*/ 
- 
-/* 
-ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm, 
-                                     int  level, 
-                                     int  method, 
-                                     int  windowBits, 
-                                     int  memLevel, 
-                                     int  strategy)); 
- 
-     This is another version of deflateInit with more compression options.  The 
-   fields next_in, zalloc, zfree and opaque must be initialized before by the 
-   caller. 
- 
-     The method parameter is the compression method.  It must be Z_DEFLATED in 
-   this version of the library. 
- 
-     The windowBits parameter is the base two logarithm of the window size 
-   (the size of the history buffer).  It should be in the range 8..15 for this 
-   version of the library.  Larger values of this parameter result in better 
-   compression at the expense of memory usage.  The default value is 15 if 
-   deflateInit is used instead. 
- 
+*/
+
+
+                        /* Advanced functions */
+
+/*
+    The following functions are needed only in some special applications.
+*/
+
+/*
+ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
+                                     int  level,
+                                     int  method,
+                                     int  windowBits,
+                                     int  memLevel,
+                                     int  strategy));
+
+     This is another version of deflateInit with more compression options.  The
+   fields next_in, zalloc, zfree and opaque must be initialized before by the
+   caller.
+
+     The method parameter is the compression method.  It must be Z_DEFLATED in
+   this version of the library.
+
+     The windowBits parameter is the base two logarithm of the window size
+   (the size of the history buffer).  It should be in the range 8..15 for this
+   version of the library.  Larger values of this parameter result in better
+   compression at the expense of memory usage.  The default value is 15 if
+   deflateInit is used instead.
+
      For the current implementation of deflate(), a windowBits value of 8 (a
    window size of 256 bytes) is not supported.  As a result, a request for 8
    will result in 9 (a 512-byte window).  In that case, providing 8 to
@@ -563,95 +563,95 @@ ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
    with deflateInit2() with this initialization, or at least in that case use 9
    with inflateInit2().
 
-     windowBits can also be -8..-15 for raw deflate.  In this case, -windowBits 
-   determines the window size.  deflate() will then generate raw deflate data 
+     windowBits can also be -8..-15 for raw deflate.  In this case, -windowBits
+   determines the window size.  deflate() will then generate raw deflate data
    with no zlib header or trailer, and will not compute a check value.
- 
-     windowBits can also be greater than 15 for optional gzip encoding.  Add 
-   16 to windowBits to write a simple gzip header and trailer around the 
-   compressed data instead of a zlib wrapper.  The gzip header will have no 
-   file name, no extra data, no comment, no modification time (set to zero), no 
+
+     windowBits can also be greater than 15 for optional gzip encoding.  Add
+   16 to windowBits to write a simple gzip header and trailer around the
+   compressed data instead of a zlib wrapper.  The gzip header will have no
+   file name, no extra data, no comment, no modification time (set to zero), no
    header crc, and the operating system will be set to the appropriate value,
    if the operating system was determined at compile time.  If a gzip stream is
    being written, strm->adler is a CRC-32 instead of an Adler-32.
- 
+
      For raw deflate or gzip encoding, a request for a 256-byte window is
    rejected as invalid, since only the zlib header provides a means of
    transmitting the window size to the decompressor.
 
-     The memLevel parameter specifies how much memory should be allocated 
-   for the internal compression state.  memLevel=1 uses minimum memory but is 
-   slow and reduces compression ratio; memLevel=9 uses maximum memory for 
-   optimal speed.  The default value is 8.  See zconf.h for total memory usage 
-   as a function of windowBits and memLevel. 
- 
-     The strategy parameter is used to tune the compression algorithm.  Use the 
-   value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a 
-   filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no 
-   string match), or Z_RLE to limit match distances to one (run-length 
-   encoding).  Filtered data consists mostly of small values with a somewhat 
-   random distribution.  In this case, the compression algorithm is tuned to 
-   compress them better.  The effect of Z_FILTERED is to force more Huffman 
-   coding and less string matching; it is somewhat intermediate between 
-   Z_DEFAULT_STRATEGY and Z_HUFFMAN_ONLY.  Z_RLE is designed to be almost as 
-   fast as Z_HUFFMAN_ONLY, but give better compression for PNG image data.  The 
-   strategy parameter only affects the compression ratio but not the 
-   correctness of the compressed output even if it is not set appropriately. 
-   Z_FIXED prevents the use of dynamic Huffman codes, allowing for a simpler 
-   decoder for special applications. 
- 
-     deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough 
-   memory, Z_STREAM_ERROR if any parameter is invalid (such as an invalid 
-   method), or Z_VERSION_ERROR if the zlib library version (zlib_version) is 
-   incompatible with the version assumed by the caller (ZLIB_VERSION).  msg is 
-   set to null if there is no error message.  deflateInit2 does not perform any 
-   compression: this will be done by deflate(). 
-*/ 
- 
-ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm, 
-                                             const Bytef *dictionary, 
-                                             uInt  dictLength)); 
-/* 
-     Initializes the compression dictionary from the given byte sequence 
-   without producing any compressed output.  When using the zlib format, this 
-   function must be called immediately after deflateInit, deflateInit2 or 
-   deflateReset, and before any call of deflate.  When doing raw deflate, this 
-   function must be called either before any call of deflate, or immediately 
-   after the completion of a deflate block, i.e. after all input has been 
-   consumed and all output has been delivered when using any of the flush 
-   options Z_BLOCK, Z_PARTIAL_FLUSH, Z_SYNC_FLUSH, or Z_FULL_FLUSH.  The 
-   compressor and decompressor must use exactly the same dictionary (see 
-   inflateSetDictionary). 
- 
-     The dictionary should consist of strings (byte sequences) that are likely 
-   to be encountered later in the data to be compressed, with the most commonly 
-   used strings preferably put towards the end of the dictionary.  Using a 
-   dictionary is most useful when the data to be compressed is short and can be 
-   predicted with good accuracy; the data can then be compressed better than 
-   with the default empty dictionary. 
- 
-     Depending on the size of the compression data structures selected by 
-   deflateInit or deflateInit2, a part of the dictionary may in effect be 
-   discarded, for example if the dictionary is larger than the window size 
-   provided in deflateInit or deflateInit2.  Thus the strings most likely to be 
-   useful should be put at the end of the dictionary, not at the front.  In 
-   addition, the current implementation of deflate will use at most the window 
-   size minus 262 bytes of the provided dictionary. 
- 
+     The memLevel parameter specifies how much memory should be allocated
+   for the internal compression state.  memLevel=1 uses minimum memory but is
+   slow and reduces compression ratio; memLevel=9 uses maximum memory for
+   optimal speed.  The default value is 8.  See zconf.h for total memory usage
+   as a function of windowBits and memLevel.
+
+     The strategy parameter is used to tune the compression algorithm.  Use the
+   value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
+   filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no
+   string match), or Z_RLE to limit match distances to one (run-length
+   encoding).  Filtered data consists mostly of small values with a somewhat
+   random distribution.  In this case, the compression algorithm is tuned to
+   compress them better.  The effect of Z_FILTERED is to force more Huffman
+   coding and less string matching; it is somewhat intermediate between
+   Z_DEFAULT_STRATEGY and Z_HUFFMAN_ONLY.  Z_RLE is designed to be almost as
+   fast as Z_HUFFMAN_ONLY, but give better compression for PNG image data.  The
+   strategy parameter only affects the compression ratio but not the
+   correctness of the compressed output even if it is not set appropriately.
+   Z_FIXED prevents the use of dynamic Huffman codes, allowing for a simpler
+   decoder for special applications.
+
+     deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_STREAM_ERROR if any parameter is invalid (such as an invalid
+   method), or Z_VERSION_ERROR if the zlib library version (zlib_version) is
+   incompatible with the version assumed by the caller (ZLIB_VERSION).  msg is
+   set to null if there is no error message.  deflateInit2 does not perform any
+   compression: this will be done by deflate().
+*/
+
+ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
+                                             const Bytef *dictionary,
+                                             uInt  dictLength));
+/*
+     Initializes the compression dictionary from the given byte sequence
+   without producing any compressed output.  When using the zlib format, this
+   function must be called immediately after deflateInit, deflateInit2 or
+   deflateReset, and before any call of deflate.  When doing raw deflate, this
+   function must be called either before any call of deflate, or immediately
+   after the completion of a deflate block, i.e. after all input has been
+   consumed and all output has been delivered when using any of the flush
+   options Z_BLOCK, Z_PARTIAL_FLUSH, Z_SYNC_FLUSH, or Z_FULL_FLUSH.  The
+   compressor and decompressor must use exactly the same dictionary (see
+   inflateSetDictionary).
+
+     The dictionary should consist of strings (byte sequences) that are likely
+   to be encountered later in the data to be compressed, with the most commonly
+   used strings preferably put towards the end of the dictionary.  Using a
+   dictionary is most useful when the data to be compressed is short and can be
+   predicted with good accuracy; the data can then be compressed better than
+   with the default empty dictionary.
+
+     Depending on the size of the compression data structures selected by
+   deflateInit or deflateInit2, a part of the dictionary may in effect be
+   discarded, for example if the dictionary is larger than the window size
+   provided in deflateInit or deflateInit2.  Thus the strings most likely to be
+   useful should be put at the end of the dictionary, not at the front.  In
+   addition, the current implementation of deflate will use at most the window
+   size minus 262 bytes of the provided dictionary.
+
      Upon return of this function, strm->adler is set to the Adler-32 value
-   of the dictionary; the decompressor may later use this value to determine 
+   of the dictionary; the decompressor may later use this value to determine
    which dictionary has been used by the compressor.  (The Adler-32 value
-   applies to the whole dictionary even if only a subset of the dictionary is 
-   actually used by the compressor.) If a raw deflate was requested, then the 
+   applies to the whole dictionary even if only a subset of the dictionary is
+   actually used by the compressor.) If a raw deflate was requested, then the
    Adler-32 value is not computed and strm->adler is not set.
- 
-     deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a 
-   parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is 
-   inconsistent (for example if deflate has already been called for this stream 
-   or if not at a block boundary for raw deflate).  deflateSetDictionary does 
-   not perform any compression: this will be done by deflate(). 
-*/ 
- 
+
+     deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
+   parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
+   inconsistent (for example if deflate has already been called for this stream
+   or if not at a block boundary for raw deflate).  deflateSetDictionary does
+   not perform any compression: this will be done by deflate().
+*/
+
 ZEXTERN int ZEXPORT deflateGetDictionary OF((z_streamp strm,
                                              Bytef *dictionary,
                                              uInt  *dictLength));
@@ -674,55 +674,55 @@ ZEXTERN int ZEXPORT deflateGetDictionary OF((z_streamp strm,
    stream state is inconsistent.
 */
 
-ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest, 
-                                    z_streamp source)); 
-/* 
-     Sets the destination stream as a complete copy of the source stream. 
- 
-     This function can be useful when several compression strategies will be 
-   tried, for example when there are several ways of pre-processing the input 
-   data with a filter.  The streams that will be discarded should then be freed 
-   by calling deflateEnd.  Note that deflateCopy duplicates the internal 
-   compression state which can be quite large, so this strategy is slow and can 
-   consume lots of memory. 
- 
-     deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not 
-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent 
-   (such as zalloc being Z_NULL).  msg is left unchanged in both source and 
-   destination. 
-*/ 
- 
-ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm)); 
-/* 
+ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
+                                    z_streamp source));
+/*
+     Sets the destination stream as a complete copy of the source stream.
+
+     This function can be useful when several compression strategies will be
+   tried, for example when there are several ways of pre-processing the input
+   data with a filter.  The streams that will be discarded should then be freed
+   by calling deflateEnd.  Note that deflateCopy duplicates the internal
+   compression state which can be quite large, so this strategy is slow and can
+   consume lots of memory.
+
+     deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
+   (such as zalloc being Z_NULL).  msg is left unchanged in both source and
+   destination.
+*/
+
+ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
+/*
      This function is equivalent to deflateEnd followed by deflateInit, but
    does not free and reallocate the internal compression state.  The stream
    will leave the compression level and any other attributes that may have been
    set unchanged.
- 
-     deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source 
-   stream state was inconsistent (such as zalloc or state being Z_NULL). 
-*/ 
- 
-ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm, 
-                                      int level, 
-                                      int strategy)); 
-/* 
-     Dynamically update the compression level and compression strategy.  The 
+
+     deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent (such as zalloc or state being Z_NULL).
+*/
+
+ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
+                                      int level,
+                                      int strategy));
+/*
+     Dynamically update the compression level and compression strategy.  The
    interpretation of level and strategy is as in deflateInit2().  This can be
-   used to switch between compression and straight copy of the input data, or 
-   to switch to a different kind of input data requiring a different strategy. 
+   used to switch between compression and straight copy of the input data, or
+   to switch to a different kind of input data requiring a different strategy.
    If the compression approach (which is a function of the level) or the
    strategy is changed, and if any input has been consumed in a previous
    deflate() call, then the input available so far is compressed with the old
    level and strategy using deflate(strm, Z_BLOCK).  There are three approaches
    for the compression levels 0, 1..3, and 4..9 respectively.  The new level
    and strategy will take effect at the next call of deflate().
- 
+
      If a deflate(strm, Z_BLOCK) is performed by deflateParams(), and it does
    not have enough output space to complete, then the parameter change will not
    take effect.  In this case, deflateParams() can be called again with the
    same parameters and more output space to try again.
- 
+
      In order to assure a change in the parameters on the first try, the
    deflate stream should be flushed using deflate() with Z_BLOCK or other flush
    request until strm.avail_out is not zero, before calling deflateParams().
@@ -738,548 +738,548 @@ ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
    in the case of a Z_BUF_ERROR, the parameters are not changed.  A return
    value of Z_BUF_ERROR is not fatal, in which case deflateParams() can be
    retried with more output space.
-*/ 
- 
-ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm, 
-                                    int good_length, 
-                                    int max_lazy, 
-                                    int nice_length, 
-                                    int max_chain)); 
-/* 
-     Fine tune deflate's internal compression parameters.  This should only be 
-   used by someone who understands the algorithm used by zlib's deflate for 
-   searching for the best matching string, and even then only by the most 
-   fanatic optimizer trying to squeeze out the last compressed bit for their 
-   specific input data.  Read the deflate.c source code for the meaning of the 
-   max_lazy, good_length, nice_length, and max_chain parameters. 
- 
-     deflateTune() can be called after deflateInit() or deflateInit2(), and 
-   returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream. 
- */ 
- 
-ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm, 
-                                       uLong sourceLen)); 
-/* 
-     deflateBound() returns an upper bound on the compressed size after 
-   deflation of sourceLen bytes.  It must be called after deflateInit() or 
-   deflateInit2(), and after deflateSetHeader(), if used.  This would be used 
-   to allocate an output buffer for deflation in a single pass, and so would be 
-   called before deflate().  If that first deflate() call is provided the 
-   sourceLen input bytes, an output buffer allocated to the size returned by 
-   deflateBound(), and the flush value Z_FINISH, then deflate() is guaranteed 
-   to return Z_STREAM_END.  Note that it is possible for the compressed size to 
-   be larger than the value returned by deflateBound() if flush options other 
-   than Z_FINISH or Z_NO_FLUSH are used. 
-*/ 
- 
-ZEXTERN int ZEXPORT deflatePending OF((z_streamp strm, 
-                                       unsigned *pending, 
-                                       int *bits)); 
-/* 
-     deflatePending() returns the number of bytes and bits of output that have 
-   been generated, but not yet provided in the available output.  The bytes not 
-   provided would be due to the available output space having being consumed. 
-   The number of bits of output not provided are between 0 and 7, where they 
-   await more bits to join them in order to fill out a full byte.  If pending 
-   or bits are Z_NULL, then those values are not set. 
- 
-     deflatePending returns Z_OK if success, or Z_STREAM_ERROR if the source 
-   stream state was inconsistent. 
- */ 
- 
-ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm, 
-                                     int bits, 
-                                     int value)); 
-/* 
-     deflatePrime() inserts bits in the deflate output stream.  The intent 
-   is that this function is used to start off the deflate output with the bits 
-   leftover from a previous deflate stream when appending to it.  As such, this 
-   function can only be used for raw deflate, and must be used before the first 
-   deflate() call after a deflateInit2() or deflateReset().  bits must be less 
-   than or equal to 16, and that many of the least significant bits of value 
-   will be inserted in the output. 
- 
-     deflatePrime returns Z_OK if success, Z_BUF_ERROR if there was not enough 
-   room in the internal buffer to insert the bits, or Z_STREAM_ERROR if the 
-   source stream state was inconsistent. 
-*/ 
- 
-ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm, 
-                                         gz_headerp head)); 
-/* 
-     deflateSetHeader() provides gzip header information for when a gzip 
-   stream is requested by deflateInit2().  deflateSetHeader() may be called 
-   after deflateInit2() or deflateReset() and before the first call of 
-   deflate().  The text, time, os, extra field, name, and comment information 
-   in the provided gz_header structure are written to the gzip header (xflag is 
-   ignored -- the extra flags are set according to the compression level).  The 
-   caller must assure that, if not Z_NULL, name and comment are terminated with 
-   a zero byte, and that if extra is not Z_NULL, that extra_len bytes are 
-   available there.  If hcrc is true, a gzip header crc is included.  Note that 
-   the current versions of the command-line version of gzip (up through version 
-   1.3.x) do not support header crc's, and will report that it is a "multi-part 
-   gzip file" and give up. 
- 
-     If deflateSetHeader is not used, the default gzip header has text false, 
-   the time set to zero, and os set to 255, with no extra, name, or comment 
-   fields.  The gzip header is returned to the default state by deflateReset(). 
- 
-     deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source 
-   stream state was inconsistent. 
-*/ 
- 
-/* 
-ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm, 
-                                     int  windowBits)); 
- 
-     This is another version of inflateInit with an extra parameter.  The 
-   fields next_in, avail_in, zalloc, zfree and opaque must be initialized 
-   before by the caller. 
- 
-     The windowBits parameter is the base two logarithm of the maximum window 
-   size (the size of the history buffer).  It should be in the range 8..15 for 
-   this version of the library.  The default value is 15 if inflateInit is used 
-   instead.  windowBits must be greater than or equal to the windowBits value 
-   provided to deflateInit2() while compressing, or it must be equal to 15 if 
-   deflateInit2() was not used.  If a compressed stream with a larger window 
-   size is given as input, inflate() will return with the error code 
-   Z_DATA_ERROR instead of trying to allocate a larger window. 
- 
-     windowBits can also be zero to request that inflate use the window size in 
-   the zlib header of the compressed stream. 
- 
-     windowBits can also be -8..-15 for raw inflate.  In this case, -windowBits 
-   determines the window size.  inflate() will then process raw deflate data, 
-   not looking for a zlib or gzip header, not generating a check value, and not 
-   looking for any check values for comparison at the end of the stream.  This 
-   is for use with other formats that use the deflate compressed data format 
-   such as zip.  Those formats provide their own check values.  If a custom 
-   format is developed using the raw deflate format for compressed data, it is 
+*/
+
+ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
+                                    int good_length,
+                                    int max_lazy,
+                                    int nice_length,
+                                    int max_chain));
+/*
+     Fine tune deflate's internal compression parameters.  This should only be
+   used by someone who understands the algorithm used by zlib's deflate for
+   searching for the best matching string, and even then only by the most
+   fanatic optimizer trying to squeeze out the last compressed bit for their
+   specific input data.  Read the deflate.c source code for the meaning of the
+   max_lazy, good_length, nice_length, and max_chain parameters.
+
+     deflateTune() can be called after deflateInit() or deflateInit2(), and
+   returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream.
+ */
+
+ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
+                                       uLong sourceLen));
+/*
+     deflateBound() returns an upper bound on the compressed size after
+   deflation of sourceLen bytes.  It must be called after deflateInit() or
+   deflateInit2(), and after deflateSetHeader(), if used.  This would be used
+   to allocate an output buffer for deflation in a single pass, and so would be
+   called before deflate().  If that first deflate() call is provided the
+   sourceLen input bytes, an output buffer allocated to the size returned by
+   deflateBound(), and the flush value Z_FINISH, then deflate() is guaranteed
+   to return Z_STREAM_END.  Note that it is possible for the compressed size to
+   be larger than the value returned by deflateBound() if flush options other
+   than Z_FINISH or Z_NO_FLUSH are used.
+*/
+
+ZEXTERN int ZEXPORT deflatePending OF((z_streamp strm,
+                                       unsigned *pending,
+                                       int *bits));
+/*
+     deflatePending() returns the number of bytes and bits of output that have
+   been generated, but not yet provided in the available output.  The bytes not
+   provided would be due to the available output space having being consumed.
+   The number of bits of output not provided are between 0 and 7, where they
+   await more bits to join them in order to fill out a full byte.  If pending
+   or bits are Z_NULL, then those values are not set.
+
+     deflatePending returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+ */
+
+ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
+                                     int bits,
+                                     int value));
+/*
+     deflatePrime() inserts bits in the deflate output stream.  The intent
+   is that this function is used to start off the deflate output with the bits
+   leftover from a previous deflate stream when appending to it.  As such, this
+   function can only be used for raw deflate, and must be used before the first
+   deflate() call after a deflateInit2() or deflateReset().  bits must be less
+   than or equal to 16, and that many of the least significant bits of value
+   will be inserted in the output.
+
+     deflatePrime returns Z_OK if success, Z_BUF_ERROR if there was not enough
+   room in the internal buffer to insert the bits, or Z_STREAM_ERROR if the
+   source stream state was inconsistent.
+*/
+
+ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
+                                         gz_headerp head));
+/*
+     deflateSetHeader() provides gzip header information for when a gzip
+   stream is requested by deflateInit2().  deflateSetHeader() may be called
+   after deflateInit2() or deflateReset() and before the first call of
+   deflate().  The text, time, os, extra field, name, and comment information
+   in the provided gz_header structure are written to the gzip header (xflag is
+   ignored -- the extra flags are set according to the compression level).  The
+   caller must assure that, if not Z_NULL, name and comment are terminated with
+   a zero byte, and that if extra is not Z_NULL, that extra_len bytes are
+   available there.  If hcrc is true, a gzip header crc is included.  Note that
+   the current versions of the command-line version of gzip (up through version
+   1.3.x) do not support header crc's, and will report that it is a "multi-part
+   gzip file" and give up.
+
+     If deflateSetHeader is not used, the default gzip header has text false,
+   the time set to zero, and os set to 255, with no extra, name, or comment
+   fields.  The gzip header is returned to the default state by deflateReset().
+
+     deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+*/
+
+/*
+ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
+                                     int  windowBits));
+
+     This is another version of inflateInit with an extra parameter.  The
+   fields next_in, avail_in, zalloc, zfree and opaque must be initialized
+   before by the caller.
+
+     The windowBits parameter is the base two logarithm of the maximum window
+   size (the size of the history buffer).  It should be in the range 8..15 for
+   this version of the library.  The default value is 15 if inflateInit is used
+   instead.  windowBits must be greater than or equal to the windowBits value
+   provided to deflateInit2() while compressing, or it must be equal to 15 if
+   deflateInit2() was not used.  If a compressed stream with a larger window
+   size is given as input, inflate() will return with the error code
+   Z_DATA_ERROR instead of trying to allocate a larger window.
+
+     windowBits can also be zero to request that inflate use the window size in
+   the zlib header of the compressed stream.
+
+     windowBits can also be -8..-15 for raw inflate.  In this case, -windowBits
+   determines the window size.  inflate() will then process raw deflate data,
+   not looking for a zlib or gzip header, not generating a check value, and not
+   looking for any check values for comparison at the end of the stream.  This
+   is for use with other formats that use the deflate compressed data format
+   such as zip.  Those formats provide their own check values.  If a custom
+   format is developed using the raw deflate format for compressed data, it is
    recommended that a check value such as an Adler-32 or a CRC-32 be applied to
-   the uncompressed data as is done in the zlib, gzip, and zip formats.  For 
-   most applications, the zlib format should be used as is.  Note that comments 
-   above on the use in deflateInit2() applies to the magnitude of windowBits. 
- 
-     windowBits can also be greater than 15 for optional gzip decoding.  Add 
-   32 to windowBits to enable zlib and gzip decoding with automatic header 
-   detection, or add 16 to decode only the gzip format (the zlib format will 
-   return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is a 
+   the uncompressed data as is done in the zlib, gzip, and zip formats.  For
+   most applications, the zlib format should be used as is.  Note that comments
+   above on the use in deflateInit2() applies to the magnitude of windowBits.
+
+     windowBits can also be greater than 15 for optional gzip decoding.  Add
+   32 to windowBits to enable zlib and gzip decoding with automatic header
+   detection, or add 16 to decode only the gzip format (the zlib format will
+   return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is a
    CRC-32 instead of an Adler-32.  Unlike the gunzip utility and gzread() (see
    below), inflate() will not automatically decode concatenated gzip streams.
    inflate() will return Z_STREAM_END at the end of the gzip stream.  The state
    would need to be reset to continue decoding a subsequent gzip stream.
- 
-     inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough 
-   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the 
-   version assumed by the caller, or Z_STREAM_ERROR if the parameters are 
-   invalid, such as a null pointer to the structure.  msg is set to null if 
-   there is no error message.  inflateInit2 does not perform any decompression 
-   apart from possibly reading the zlib header if present: actual decompression 
-   will be done by inflate().  (So next_in and avail_in may be modified, but 
-   next_out and avail_out are unused and unchanged.) The current implementation 
-   of inflateInit2() does not process any header information -- that is 
-   deferred until inflate() is called. 
-*/ 
- 
-ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm, 
-                                             const Bytef *dictionary, 
-                                             uInt  dictLength)); 
-/* 
-     Initializes the decompression dictionary from the given uncompressed byte 
-   sequence.  This function must be called immediately after a call of inflate, 
-   if that call returned Z_NEED_DICT.  The dictionary chosen by the compressor 
+
+     inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
+   version assumed by the caller, or Z_STREAM_ERROR if the parameters are
+   invalid, such as a null pointer to the structure.  msg is set to null if
+   there is no error message.  inflateInit2 does not perform any decompression
+   apart from possibly reading the zlib header if present: actual decompression
+   will be done by inflate().  (So next_in and avail_in may be modified, but
+   next_out and avail_out are unused and unchanged.) The current implementation
+   of inflateInit2() does not process any header information -- that is
+   deferred until inflate() is called.
+*/
+
+ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
+                                             const Bytef *dictionary,
+                                             uInt  dictLength));
+/*
+     Initializes the decompression dictionary from the given uncompressed byte
+   sequence.  This function must be called immediately after a call of inflate,
+   if that call returned Z_NEED_DICT.  The dictionary chosen by the compressor
    can be determined from the Adler-32 value returned by that call of inflate.
-   The compressor and decompressor must use exactly the same dictionary (see 
-   deflateSetDictionary).  For raw inflate, this function can be called at any 
-   time to set the dictionary.  If the provided dictionary is smaller than the 
-   window and there is already data in the window, then the provided dictionary 
-   will amend what's there.  The application must insure that the dictionary 
-   that was used for compression is provided. 
- 
-     inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a 
-   parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is 
-   inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the 
+   The compressor and decompressor must use exactly the same dictionary (see
+   deflateSetDictionary).  For raw inflate, this function can be called at any
+   time to set the dictionary.  If the provided dictionary is smaller than the
+   window and there is already data in the window, then the provided dictionary
+   will amend what's there.  The application must insure that the dictionary
+   that was used for compression is provided.
+
+     inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
+   parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
+   inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
    expected one (incorrect Adler-32 value).  inflateSetDictionary does not
-   perform any decompression: this will be done by subsequent calls of 
-   inflate(). 
-*/ 
- 
-ZEXTERN int ZEXPORT inflateGetDictionary OF((z_streamp strm, 
-                                             Bytef *dictionary, 
-                                             uInt  *dictLength)); 
-/* 
-     Returns the sliding dictionary being maintained by inflate.  dictLength is 
-   set to the number of bytes in the dictionary, and that many bytes are copied 
-   to dictionary.  dictionary must have enough space, where 32768 bytes is 
-   always enough.  If inflateGetDictionary() is called with dictionary equal to 
-   Z_NULL, then only the dictionary length is returned, and nothing is copied. 
-   Similary, if dictLength is Z_NULL, then it is not set. 
- 
-     inflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the 
-   stream state is inconsistent. 
-*/ 
- 
-ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm)); 
-/* 
-     Skips invalid compressed data until a possible full flush point (see above 
-   for the description of deflate with Z_FULL_FLUSH) can be found, or until all 
-   available input is skipped.  No output is provided. 
- 
-     inflateSync searches for a 00 00 FF FF pattern in the compressed data. 
-   All full flush points have this pattern, but not all occurrences of this 
-   pattern are full flush points. 
- 
-     inflateSync returns Z_OK if a possible full flush point has been found, 
-   Z_BUF_ERROR if no more input was provided, Z_DATA_ERROR if no flush point 
-   has been found, or Z_STREAM_ERROR if the stream structure was inconsistent. 
-   In the success case, the application may save the current current value of 
-   total_in which indicates where valid compressed data was found.  In the 
-   error case, the application may repeatedly call inflateSync, providing more 
-   input each time, until success or end of the input data. 
-*/ 
- 
-ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest, 
-                                    z_streamp source)); 
-/* 
-     Sets the destination stream as a complete copy of the source stream. 
- 
-     This function can be useful when randomly accessing a large stream.  The 
-   first pass through the stream can periodically record the inflate state, 
-   allowing restarting inflate at those points when randomly accessing the 
-   stream. 
- 
-     inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not 
-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent 
-   (such as zalloc being Z_NULL).  msg is left unchanged in both source and 
-   destination. 
-*/ 
- 
-ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm)); 
-/* 
-     This function is equivalent to inflateEnd followed by inflateInit, 
+   perform any decompression: this will be done by subsequent calls of
+   inflate().
+*/
+
+ZEXTERN int ZEXPORT inflateGetDictionary OF((z_streamp strm,
+                                             Bytef *dictionary,
+                                             uInt  *dictLength));
+/*
+     Returns the sliding dictionary being maintained by inflate.  dictLength is
+   set to the number of bytes in the dictionary, and that many bytes are copied
+   to dictionary.  dictionary must have enough space, where 32768 bytes is
+   always enough.  If inflateGetDictionary() is called with dictionary equal to
+   Z_NULL, then only the dictionary length is returned, and nothing is copied.
+   Similary, if dictLength is Z_NULL, then it is not set.
+
+     inflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
+   stream state is inconsistent.
+*/
+
+ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
+/*
+     Skips invalid compressed data until a possible full flush point (see above
+   for the description of deflate with Z_FULL_FLUSH) can be found, or until all
+   available input is skipped.  No output is provided.
+
+     inflateSync searches for a 00 00 FF FF pattern in the compressed data.
+   All full flush points have this pattern, but not all occurrences of this
+   pattern are full flush points.
+
+     inflateSync returns Z_OK if a possible full flush point has been found,
+   Z_BUF_ERROR if no more input was provided, Z_DATA_ERROR if no flush point
+   has been found, or Z_STREAM_ERROR if the stream structure was inconsistent.
+   In the success case, the application may save the current current value of
+   total_in which indicates where valid compressed data was found.  In the
+   error case, the application may repeatedly call inflateSync, providing more
+   input each time, until success or end of the input data.
+*/
+
+ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
+                                    z_streamp source));
+/*
+     Sets the destination stream as a complete copy of the source stream.
+
+     This function can be useful when randomly accessing a large stream.  The
+   first pass through the stream can periodically record the inflate state,
+   allowing restarting inflate at those points when randomly accessing the
+   stream.
+
+     inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
+   (such as zalloc being Z_NULL).  msg is left unchanged in both source and
+   destination.
+*/
+
+ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
+/*
+     This function is equivalent to inflateEnd followed by inflateInit,
    but does not free and reallocate the internal decompression state.  The
-   stream will keep attributes that may have been set by inflateInit2. 
- 
-     inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source 
-   stream state was inconsistent (such as zalloc or state being Z_NULL). 
-*/ 
- 
-ZEXTERN int ZEXPORT inflateReset2 OF((z_streamp strm, 
-                                      int windowBits)); 
-/* 
-     This function is the same as inflateReset, but it also permits changing 
-   the wrap and window size requests.  The windowBits parameter is interpreted 
+   stream will keep attributes that may have been set by inflateInit2.
+
+     inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent (such as zalloc or state being Z_NULL).
+*/
+
+ZEXTERN int ZEXPORT inflateReset2 OF((z_streamp strm,
+                                      int windowBits));
+/*
+     This function is the same as inflateReset, but it also permits changing
+   the wrap and window size requests.  The windowBits parameter is interpreted
    the same as it is for inflateInit2.  If the window size is changed, then the
    memory allocated for the window is freed, and the window will be reallocated
    by inflate() if needed.
- 
-     inflateReset2 returns Z_OK if success, or Z_STREAM_ERROR if the source 
-   stream state was inconsistent (such as zalloc or state being Z_NULL), or if 
-   the windowBits parameter is invalid. 
-*/ 
- 
-ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm, 
-                                     int bits, 
-                                     int value)); 
-/* 
-     This function inserts bits in the inflate input stream.  The intent is 
-   that this function is used to start inflating at a bit position in the 
-   middle of a byte.  The provided bits will be used before any bytes are used 
-   from next_in.  This function should only be used with raw inflate, and 
-   should be used before the first inflate() call after inflateInit2() or 
-   inflateReset().  bits must be less than or equal to 16, and that many of the 
-   least significant bits of value will be inserted in the input. 
- 
-     If bits is negative, then the input stream bit buffer is emptied.  Then 
-   inflatePrime() can be called again to put bits in the buffer.  This is used 
-   to clear out bits leftover after feeding inflate a block description prior 
-   to feeding inflate codes. 
- 
-     inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source 
-   stream state was inconsistent. 
-*/ 
- 
-ZEXTERN long ZEXPORT inflateMark OF((z_streamp strm)); 
-/* 
-     This function returns two values, one in the lower 16 bits of the return 
-   value, and the other in the remaining upper bits, obtained by shifting the 
-   return value down 16 bits.  If the upper value is -1 and the lower value is 
-   zero, then inflate() is currently decoding information outside of a block. 
-   If the upper value is -1 and the lower value is non-zero, then inflate is in 
-   the middle of a stored block, with the lower value equaling the number of 
-   bytes from the input remaining to copy.  If the upper value is not -1, then 
-   it is the number of bits back from the current bit position in the input of 
-   the code (literal or length/distance pair) currently being processed.  In 
-   that case the lower value is the number of bytes already emitted for that 
-   code. 
- 
-     A code is being processed if inflate is waiting for more input to complete 
-   decoding of the code, or if it has completed decoding but is waiting for 
-   more output space to write the literal or match data. 
- 
-     inflateMark() is used to mark locations in the input data for random 
-   access, which may be at bit positions, and to note those cases where the 
-   output of a code may span boundaries of random access blocks.  The current 
-   location in the input stream can be determined from avail_in and data_type 
-   as noted in the description for the Z_BLOCK flush parameter for inflate. 
- 
+
+     inflateReset2 returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent (such as zalloc or state being Z_NULL), or if
+   the windowBits parameter is invalid.
+*/
+
+ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
+                                     int bits,
+                                     int value));
+/*
+     This function inserts bits in the inflate input stream.  The intent is
+   that this function is used to start inflating at a bit position in the
+   middle of a byte.  The provided bits will be used before any bytes are used
+   from next_in.  This function should only be used with raw inflate, and
+   should be used before the first inflate() call after inflateInit2() or
+   inflateReset().  bits must be less than or equal to 16, and that many of the
+   least significant bits of value will be inserted in the input.
+
+     If bits is negative, then the input stream bit buffer is emptied.  Then
+   inflatePrime() can be called again to put bits in the buffer.  This is used
+   to clear out bits leftover after feeding inflate a block description prior
+   to feeding inflate codes.
+
+     inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+*/
+
+ZEXTERN long ZEXPORT inflateMark OF((z_streamp strm));
+/*
+     This function returns two values, one in the lower 16 bits of the return
+   value, and the other in the remaining upper bits, obtained by shifting the
+   return value down 16 bits.  If the upper value is -1 and the lower value is
+   zero, then inflate() is currently decoding information outside of a block.
+   If the upper value is -1 and the lower value is non-zero, then inflate is in
+   the middle of a stored block, with the lower value equaling the number of
+   bytes from the input remaining to copy.  If the upper value is not -1, then
+   it is the number of bits back from the current bit position in the input of
+   the code (literal or length/distance pair) currently being processed.  In
+   that case the lower value is the number of bytes already emitted for that
+   code.
+
+     A code is being processed if inflate is waiting for more input to complete
+   decoding of the code, or if it has completed decoding but is waiting for
+   more output space to write the literal or match data.
+
+     inflateMark() is used to mark locations in the input data for random
+   access, which may be at bit positions, and to note those cases where the
+   output of a code may span boundaries of random access blocks.  The current
+   location in the input stream can be determined from avail_in and data_type
+   as noted in the description for the Z_BLOCK flush parameter for inflate.
+
      inflateMark returns the value noted above, or -65536 if the provided
-   source stream state was inconsistent. 
-*/ 
- 
-ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm, 
-                                         gz_headerp head)); 
-/* 
-     inflateGetHeader() requests that gzip header information be stored in the 
-   provided gz_header structure.  inflateGetHeader() may be called after 
-   inflateInit2() or inflateReset(), and before the first call of inflate(). 
-   As inflate() processes the gzip stream, head->done is zero until the header 
-   is completed, at which time head->done is set to one.  If a zlib stream is 
-   being decoded, then head->done is set to -1 to indicate that there will be 
-   no gzip header information forthcoming.  Note that Z_BLOCK or Z_TREES can be 
-   used to force inflate() to return immediately after header processing is 
-   complete and before any actual data is decompressed. 
- 
-     The text, time, xflags, and os fields are filled in with the gzip header 
-   contents.  hcrc is set to true if there is a header CRC.  (The header CRC 
-   was valid if done is set to one.) If extra is not Z_NULL, then extra_max 
-   contains the maximum number of bytes to write to extra.  Once done is true, 
-   extra_len contains the actual extra field length, and extra contains the 
-   extra field, or that field truncated if extra_max is less than extra_len. 
-   If name is not Z_NULL, then up to name_max characters are written there, 
-   terminated with a zero unless the length is greater than name_max.  If 
-   comment is not Z_NULL, then up to comm_max characters are written there, 
-   terminated with a zero unless the length is greater than comm_max.  When any 
-   of extra, name, or comment are not Z_NULL and the respective field is not 
-   present in the header, then that field is set to Z_NULL to signal its 
-   absence.  This allows the use of deflateSetHeader() with the returned 
-   structure to duplicate the header.  However if those fields are set to 
-   allocated memory, then the application will need to save those pointers 
-   elsewhere so that they can be eventually freed. 
- 
-     If inflateGetHeader is not used, then the header information is simply 
-   discarded.  The header is always checked for validity, including the header 
-   CRC if present.  inflateReset() will reset the process to discard the header 
-   information.  The application would need to call inflateGetHeader() again to 
-   retrieve the header from the next gzip stream. 
- 
-     inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source 
-   stream state was inconsistent. 
-*/ 
- 
-/* 
-ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits, 
-                                        unsigned char FAR *window)); 
- 
-     Initialize the internal stream state for decompression using inflateBack() 
-   calls.  The fields zalloc, zfree and opaque in strm must be initialized 
-   before the call.  If zalloc and zfree are Z_NULL, then the default library- 
-   derived memory allocation routines are used.  windowBits is the base two 
-   logarithm of the window size, in the range 8..15.  window is a caller 
-   supplied buffer of that size.  Except for special applications where it is 
-   assured that deflate was used with small window sizes, windowBits must be 15 
-   and a 32K byte window must be supplied to be able to decompress general 
-   deflate streams. 
- 
-     See inflateBack() for the usage of these routines. 
- 
-     inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of 
-   the parameters are invalid, Z_MEM_ERROR if the internal state could not be 
-   allocated, or Z_VERSION_ERROR if the version of the library does not match 
-   the version of the header file. 
-*/ 
- 
-typedef unsigned (*in_func) OF((void FAR *, 
-                                z_const unsigned char FAR * FAR *)); 
-typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned)); 
- 
-ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm, 
-                                    in_func in, void FAR *in_desc, 
-                                    out_func out, void FAR *out_desc)); 
-/* 
-     inflateBack() does a raw inflate with a single call using a call-back 
-   interface for input and output.  This is potentially more efficient than 
-   inflate() for file i/o applications, in that it avoids copying between the 
-   output and the sliding window by simply making the window itself the output 
-   buffer.  inflate() can be faster on modern CPUs when used with large 
-   buffers.  inflateBack() trusts the application to not change the output 
-   buffer passed by the output function, at least until inflateBack() returns. 
- 
-     inflateBackInit() must be called first to allocate the internal state 
-   and to initialize the state with the user-provided window buffer. 
-   inflateBack() may then be used multiple times to inflate a complete, raw 
-   deflate stream with each call.  inflateBackEnd() is then called to free the 
-   allocated state. 
- 
-     A raw deflate stream is one with no zlib or gzip header or trailer. 
-   This routine would normally be used in a utility that reads zip or gzip 
-   files and writes out uncompressed files.  The utility would decode the 
-   header and process the trailer on its own, hence this routine expects only 
+   source stream state was inconsistent.
+*/
+
+ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm,
+                                         gz_headerp head));
+/*
+     inflateGetHeader() requests that gzip header information be stored in the
+   provided gz_header structure.  inflateGetHeader() may be called after
+   inflateInit2() or inflateReset(), and before the first call of inflate().
+   As inflate() processes the gzip stream, head->done is zero until the header
+   is completed, at which time head->done is set to one.  If a zlib stream is
+   being decoded, then head->done is set to -1 to indicate that there will be
+   no gzip header information forthcoming.  Note that Z_BLOCK or Z_TREES can be
+   used to force inflate() to return immediately after header processing is
+   complete and before any actual data is decompressed.
+
+     The text, time, xflags, and os fields are filled in with the gzip header
+   contents.  hcrc is set to true if there is a header CRC.  (The header CRC
+   was valid if done is set to one.) If extra is not Z_NULL, then extra_max
+   contains the maximum number of bytes to write to extra.  Once done is true,
+   extra_len contains the actual extra field length, and extra contains the
+   extra field, or that field truncated if extra_max is less than extra_len.
+   If name is not Z_NULL, then up to name_max characters are written there,
+   terminated with a zero unless the length is greater than name_max.  If
+   comment is not Z_NULL, then up to comm_max characters are written there,
+   terminated with a zero unless the length is greater than comm_max.  When any
+   of extra, name, or comment are not Z_NULL and the respective field is not
+   present in the header, then that field is set to Z_NULL to signal its
+   absence.  This allows the use of deflateSetHeader() with the returned
+   structure to duplicate the header.  However if those fields are set to
+   allocated memory, then the application will need to save those pointers
+   elsewhere so that they can be eventually freed.
+
+     If inflateGetHeader is not used, then the header information is simply
+   discarded.  The header is always checked for validity, including the header
+   CRC if present.  inflateReset() will reset the process to discard the header
+   information.  The application would need to call inflateGetHeader() again to
+   retrieve the header from the next gzip stream.
+
+     inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+*/
+
+/*
+ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
+                                        unsigned char FAR *window));
+
+     Initialize the internal stream state for decompression using inflateBack()
+   calls.  The fields zalloc, zfree and opaque in strm must be initialized
+   before the call.  If zalloc and zfree are Z_NULL, then the default library-
+   derived memory allocation routines are used.  windowBits is the base two
+   logarithm of the window size, in the range 8..15.  window is a caller
+   supplied buffer of that size.  Except for special applications where it is
+   assured that deflate was used with small window sizes, windowBits must be 15
+   and a 32K byte window must be supplied to be able to decompress general
+   deflate streams.
+
+     See inflateBack() for the usage of these routines.
+
+     inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
+   the parameters are invalid, Z_MEM_ERROR if the internal state could not be
+   allocated, or Z_VERSION_ERROR if the version of the library does not match
+   the version of the header file.
+*/
+
+typedef unsigned (*in_func) OF((void FAR *,
+                                z_const unsigned char FAR * FAR *));
+typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
+
+ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
+                                    in_func in, void FAR *in_desc,
+                                    out_func out, void FAR *out_desc));
+/*
+     inflateBack() does a raw inflate with a single call using a call-back
+   interface for input and output.  This is potentially more efficient than
+   inflate() for file i/o applications, in that it avoids copying between the
+   output and the sliding window by simply making the window itself the output
+   buffer.  inflate() can be faster on modern CPUs when used with large
+   buffers.  inflateBack() trusts the application to not change the output
+   buffer passed by the output function, at least until inflateBack() returns.
+
+     inflateBackInit() must be called first to allocate the internal state
+   and to initialize the state with the user-provided window buffer.
+   inflateBack() may then be used multiple times to inflate a complete, raw
+   deflate stream with each call.  inflateBackEnd() is then called to free the
+   allocated state.
+
+     A raw deflate stream is one with no zlib or gzip header or trailer.
+   This routine would normally be used in a utility that reads zip or gzip
+   files and writes out uncompressed files.  The utility would decode the
+   header and process the trailer on its own, hence this routine expects only
    the raw deflate stream to decompress.  This is different from the default
    behavior of inflate(), which expects a zlib header and trailer around the
    deflate stream.
- 
-     inflateBack() uses two subroutines supplied by the caller that are then 
-   called by inflateBack() for input and output.  inflateBack() calls those 
-   routines until it reads a complete deflate stream and writes out all of the 
-   uncompressed data, or until it encounters an error.  The function's 
-   parameters and return types are defined above in the in_func and out_func 
-   typedefs.  inflateBack() will call in(in_desc, &buf) which should return the 
-   number of bytes of provided input, and a pointer to that input in buf.  If 
+
+     inflateBack() uses two subroutines supplied by the caller that are then
+   called by inflateBack() for input and output.  inflateBack() calls those
+   routines until it reads a complete deflate stream and writes out all of the
+   uncompressed data, or until it encounters an error.  The function's
+   parameters and return types are defined above in the in_func and out_func
+   typedefs.  inflateBack() will call in(in_desc, &buf) which should return the
+   number of bytes of provided input, and a pointer to that input in buf.  If
    there is no input available, in() must return zero -- buf is ignored in that
    case -- and inflateBack() will return a buffer error.  inflateBack() will
    call out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].
    out() should return zero on success, or non-zero on failure.  If out()
    returns non-zero, inflateBack() will return with an error.  Neither in() nor
    out() are permitted to change the contents of the window provided to
-   inflateBackInit(), which is also the buffer that out() uses to write from. 
-   The length written by out() will be at most the window size.  Any non-zero 
-   amount of input may be provided by in(). 
- 
-     For convenience, inflateBack() can be provided input on the first call by 
-   setting strm->next_in and strm->avail_in.  If that input is exhausted, then 
-   in() will be called.  Therefore strm->next_in must be initialized before 
-   calling inflateBack().  If strm->next_in is Z_NULL, then in() will be called 
-   immediately for input.  If strm->next_in is not Z_NULL, then strm->avail_in 
-   must also be initialized, and then if strm->avail_in is not zero, input will 
-   initially be taken from strm->next_in[0 ..  strm->avail_in - 1]. 
- 
-     The in_desc and out_desc parameters of inflateBack() is passed as the 
-   first parameter of in() and out() respectively when they are called.  These 
-   descriptors can be optionally used to pass any information that the caller- 
-   supplied in() and out() functions need to do their job. 
- 
-     On return, inflateBack() will set strm->next_in and strm->avail_in to 
-   pass back any unused input that was provided by the last in() call.  The 
-   return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR 
-   if in() or out() returned an error, Z_DATA_ERROR if there was a format error 
-   in the deflate stream (in which case strm->msg is set to indicate the nature 
-   of the error), or Z_STREAM_ERROR if the stream was not properly initialized. 
-   In the case of Z_BUF_ERROR, an input or output error can be distinguished 
-   using strm->next_in which will be Z_NULL only if in() returned an error.  If 
-   strm->next_in is not Z_NULL, then the Z_BUF_ERROR was due to out() returning 
-   non-zero.  (in() will always be called before out(), so strm->next_in is 
+   inflateBackInit(), which is also the buffer that out() uses to write from.
+   The length written by out() will be at most the window size.  Any non-zero
+   amount of input may be provided by in().
+
+     For convenience, inflateBack() can be provided input on the first call by
+   setting strm->next_in and strm->avail_in.  If that input is exhausted, then
+   in() will be called.  Therefore strm->next_in must be initialized before
+   calling inflateBack().  If strm->next_in is Z_NULL, then in() will be called
+   immediately for input.  If strm->next_in is not Z_NULL, then strm->avail_in
+   must also be initialized, and then if strm->avail_in is not zero, input will
+   initially be taken from strm->next_in[0 ..  strm->avail_in - 1].
+
+     The in_desc and out_desc parameters of inflateBack() is passed as the
+   first parameter of in() and out() respectively when they are called.  These
+   descriptors can be optionally used to pass any information that the caller-
+   supplied in() and out() functions need to do their job.
+
+     On return, inflateBack() will set strm->next_in and strm->avail_in to
+   pass back any unused input that was provided by the last in() call.  The
+   return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR
+   if in() or out() returned an error, Z_DATA_ERROR if there was a format error
+   in the deflate stream (in which case strm->msg is set to indicate the nature
+   of the error), or Z_STREAM_ERROR if the stream was not properly initialized.
+   In the case of Z_BUF_ERROR, an input or output error can be distinguished
+   using strm->next_in which will be Z_NULL only if in() returned an error.  If
+   strm->next_in is not Z_NULL, then the Z_BUF_ERROR was due to out() returning
+   non-zero.  (in() will always be called before out(), so strm->next_in is
    assured to be defined if out() returns non-zero.)  Note that inflateBack()
-   cannot return Z_OK. 
-*/ 
- 
-ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm)); 
-/* 
-     All memory allocated by inflateBackInit() is freed. 
- 
-     inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream 
-   state was inconsistent. 
-*/ 
- 
-ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void)); 
-/* Return flags indicating compile-time options. 
- 
-    Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other: 
-     1.0: size of uInt 
-     3.2: size of uLong 
-     5.4: size of voidpf (pointer) 
-     7.6: size of z_off_t 
- 
-    Compiler, assembler, and debug options: 
+   cannot return Z_OK.
+*/
+
+ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm));
+/*
+     All memory allocated by inflateBackInit() is freed.
+
+     inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream
+   state was inconsistent.
+*/
+
+ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
+/* Return flags indicating compile-time options.
+
+    Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:
+     1.0: size of uInt
+     3.2: size of uLong
+     5.4: size of voidpf (pointer)
+     7.6: size of z_off_t
+
+    Compiler, assembler, and debug options:
      8: ZLIB_DEBUG
-     9: ASMV or ASMINF -- use ASM code 
-     10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention 
-     11: 0 (reserved) 
- 
-    One-time table building (smaller code, but not thread-safe if true): 
-     12: BUILDFIXED -- build static block decoding tables when needed 
-     13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed 
-     14,15: 0 (reserved) 
- 
-    Library content (indicates missing functionality): 
-     16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking 
-                          deflate code when not needed) 
-     17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect 
-                    and decode gzip streams (to avoid linking crc code) 
-     18-19: 0 (reserved) 
- 
-    Operation variations (changes in library functionality): 
-     20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate 
-     21: FASTEST -- deflate algorithm with only one, lowest compression level 
-     22,23: 0 (reserved) 
- 
-    The sprintf variant used by gzprintf (zero is best): 
-     24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format 
-     25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure! 
-     26: 0 = returns value, 1 = void -- 1 means inferred string length returned 
- 
-    Remainder: 
-     27-31: 0 (reserved) 
- */ 
- 
-#ifndef Z_SOLO 
- 
-                        /* utility functions */ 
- 
-/* 
-     The following utility functions are implemented on top of the basic 
-   stream-oriented functions.  To simplify the interface, some default options 
-   are assumed (compression level and memory usage, standard memory allocation 
-   functions).  The source code of these utility functions can be modified if 
-   you need special options. 
-*/ 
- 
-ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen, 
-                                 const Bytef *source, uLong sourceLen)); 
-/* 
-     Compresses the source buffer into the destination buffer.  sourceLen is 
-   the byte length of the source buffer.  Upon entry, destLen is the total size 
-   of the destination buffer, which must be at least the value returned by 
-   compressBound(sourceLen).  Upon exit, destLen is the actual size of the 
+     9: ASMV or ASMINF -- use ASM code
+     10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention
+     11: 0 (reserved)
+
+    One-time table building (smaller code, but not thread-safe if true):
+     12: BUILDFIXED -- build static block decoding tables when needed
+     13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed
+     14,15: 0 (reserved)
+
+    Library content (indicates missing functionality):
+     16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking
+                          deflate code when not needed)
+     17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect
+                    and decode gzip streams (to avoid linking crc code)
+     18-19: 0 (reserved)
+
+    Operation variations (changes in library functionality):
+     20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate
+     21: FASTEST -- deflate algorithm with only one, lowest compression level
+     22,23: 0 (reserved)
+
+    The sprintf variant used by gzprintf (zero is best):
+     24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format
+     25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure!
+     26: 0 = returns value, 1 = void -- 1 means inferred string length returned
+
+    Remainder:
+     27-31: 0 (reserved)
+ */
+
+#ifndef Z_SOLO
+
+                        /* utility functions */
+
+/*
+     The following utility functions are implemented on top of the basic
+   stream-oriented functions.  To simplify the interface, some default options
+   are assumed (compression level and memory usage, standard memory allocation
+   functions).  The source code of these utility functions can be modified if
+   you need special options.
+*/
+
+ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
+                                 const Bytef *source, uLong sourceLen));
+/*
+     Compresses the source buffer into the destination buffer.  sourceLen is
+   the byte length of the source buffer.  Upon entry, destLen is the total size
+   of the destination buffer, which must be at least the value returned by
+   compressBound(sourceLen).  Upon exit, destLen is the actual size of the
    compressed data.  compress() is equivalent to compress2() with a level
    parameter of Z_DEFAULT_COMPRESSION.
- 
-     compress returns Z_OK if success, Z_MEM_ERROR if there was not 
-   enough memory, Z_BUF_ERROR if there was not enough room in the output 
-   buffer. 
-*/ 
- 
-ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen, 
-                                  const Bytef *source, uLong sourceLen, 
-                                  int level)); 
-/* 
-     Compresses the source buffer into the destination buffer.  The level 
-   parameter has the same meaning as in deflateInit.  sourceLen is the byte 
-   length of the source buffer.  Upon entry, destLen is the total size of the 
-   destination buffer, which must be at least the value returned by 
-   compressBound(sourceLen).  Upon exit, destLen is the actual size of the 
+
+     compress returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_BUF_ERROR if there was not enough room in the output
+   buffer.
+*/
+
+ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
+                                  const Bytef *source, uLong sourceLen,
+                                  int level));
+/*
+     Compresses the source buffer into the destination buffer.  The level
+   parameter has the same meaning as in deflateInit.  sourceLen is the byte
+   length of the source buffer.  Upon entry, destLen is the total size of the
+   destination buffer, which must be at least the value returned by
+   compressBound(sourceLen).  Upon exit, destLen is the actual size of the
    compressed data.
- 
-     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough 
-   memory, Z_BUF_ERROR if there was not enough room in the output buffer, 
-   Z_STREAM_ERROR if the level parameter is invalid. 
-*/ 
- 
-ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen)); 
-/* 
-     compressBound() returns an upper bound on the compressed size after 
-   compress() or compress2() on sourceLen bytes.  It would be used before a 
-   compress() or compress2() call to allocate the destination buffer. 
-*/ 
- 
-ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen, 
-                                   const Bytef *source, uLong sourceLen)); 
-/* 
-     Decompresses the source buffer into the destination buffer.  sourceLen is 
-   the byte length of the source buffer.  Upon entry, destLen is the total size 
-   of the destination buffer, which must be large enough to hold the entire 
-   uncompressed data.  (The size of the uncompressed data must have been saved 
-   previously by the compressor and transmitted to the decompressor by some 
-   mechanism outside the scope of this compression library.) Upon exit, destLen 
+
+     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
+   Z_STREAM_ERROR if the level parameter is invalid.
+*/
+
+ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen));
+/*
+     compressBound() returns an upper bound on the compressed size after
+   compress() or compress2() on sourceLen bytes.  It would be used before a
+   compress() or compress2() call to allocate the destination buffer.
+*/
+
+ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
+                                   const Bytef *source, uLong sourceLen));
+/*
+     Decompresses the source buffer into the destination buffer.  sourceLen is
+   the byte length of the source buffer.  Upon entry, destLen is the total size
+   of the destination buffer, which must be large enough to hold the entire
+   uncompressed data.  (The size of the uncompressed data must have been saved
+   previously by the compressor and transmitted to the decompressor by some
+   mechanism outside the scope of this compression library.) Upon exit, destLen
    is the actual size of the uncompressed data.
- 
-     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not 
-   enough memory, Z_BUF_ERROR if there was not enough room in the output 
-   buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.  In 
-   the case where there is not enough room, uncompress() will fill the output 
-   buffer with the uncompressed data up to that point. 
-*/ 
- 
+
+     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_BUF_ERROR if there was not enough room in the output
+   buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.  In
+   the case where there is not enough room, uncompress() will fill the output
+   buffer with the uncompressed data up to that point.
+*/
+
 ZEXTERN int ZEXPORT uncompress2 OF((Bytef *dest,   uLongf *destLen,
                                     const Bytef *source, uLong *sourceLen));
 /*
@@ -1288,135 +1288,135 @@ ZEXTERN int ZEXPORT uncompress2 OF((Bytef *dest,   uLongf *destLen,
    source bytes consumed.
 */
 
-                        /* gzip file access functions */ 
- 
-/* 
-     This library supports reading and writing files in gzip (.gz) format with 
-   an interface similar to that of stdio, using the functions that start with 
-   "gz".  The gzip format is different from the zlib format.  gzip is a gzip 
-   wrapper, documented in RFC 1952, wrapped around a deflate stream. 
-*/ 
- 
-typedef struct gzFile_s *gzFile;    /* semi-opaque gzip file descriptor */ 
- 
-/* 
-ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode)); 
- 
-     Opens a gzip (.gz) file for reading or writing.  The mode parameter is as 
-   in fopen ("rb" or "wb") but can also include a compression level ("wb9") or 
-   a strategy: 'f' for filtered data as in "wb6f", 'h' for Huffman-only 
-   compression as in "wb1h", 'R' for run-length encoding as in "wb1R", or 'F' 
-   for fixed code compression as in "wb9F".  (See the description of 
-   deflateInit2 for more information about the strategy parameter.)  'T' will 
-   request transparent writing or appending with no compression and not using 
-   the gzip format. 
- 
-     "a" can be used instead of "w" to request that the gzip stream that will 
-   be written be appended to the file.  "+" will result in an error, since 
-   reading and writing to the same gzip file is not supported.  The addition of 
-   "x" when writing will create the file exclusively, which fails if the file 
-   already exists.  On systems that support it, the addition of "e" when 
-   reading or writing will set the flag to close the file on an execve() call. 
- 
-     These functions, as well as gzip, will read and decode a sequence of gzip 
-   streams in a file.  The append function of gzopen() can be used to create 
-   such a file.  (Also see gzflush() for another way to do this.)  When 
-   appending, gzopen does not test whether the file begins with a gzip stream, 
-   nor does it look for the end of the gzip streams to begin appending.  gzopen 
-   will simply append a gzip stream to the existing file. 
- 
-     gzopen can be used to read a file which is not in gzip format; in this 
-   case gzread will directly read from the file without decompression.  When 
-   reading, this will be detected automatically by looking for the magic two- 
-   byte gzip header. 
- 
-     gzopen returns NULL if the file could not be opened, if there was 
-   insufficient memory to allocate the gzFile state, or if an invalid mode was 
-   specified (an 'r', 'w', or 'a' was not provided, or '+' was provided). 
-   errno can be checked to determine if the reason gzopen failed was that the 
-   file could not be opened. 
-*/ 
- 
-ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode)); 
-/* 
-     gzdopen associates a gzFile with the file descriptor fd.  File descriptors 
-   are obtained from calls like open, dup, creat, pipe or fileno (if the file 
-   has been previously opened with fopen).  The mode parameter is as in gzopen. 
- 
-     The next call of gzclose on the returned gzFile will also close the file 
-   descriptor fd, just like fclose(fdopen(fd, mode)) closes the file descriptor 
-   fd.  If you want to keep fd open, use fd = dup(fd_keep); gz = gzdopen(fd, 
-   mode);.  The duplicated descriptor should be saved to avoid a leak, since 
-   gzdopen does not close fd if it fails.  If you are using fileno() to get the 
-   file descriptor from a FILE *, then you will have to use dup() to avoid 
-   double-close()ing the file descriptor.  Both gzclose() and fclose() will 
-   close the associated file descriptor, so they need to have different file 
-   descriptors. 
- 
-     gzdopen returns NULL if there was insufficient memory to allocate the 
-   gzFile state, if an invalid mode was specified (an 'r', 'w', or 'a' was not 
-   provided, or '+' was provided), or if fd is -1.  The file descriptor is not 
-   used until the next gz* read, write, seek, or close operation, so gzdopen 
-   will not detect if fd is invalid (unless fd is -1). 
-*/ 
- 
-ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size)); 
-/* 
-     Set the internal buffer size used by this library's functions.  The 
-   default buffer size is 8192 bytes.  This function must be called after 
-   gzopen() or gzdopen(), and before any other calls that read or write the 
-   file.  The buffer memory allocation is always deferred to the first read or 
+                        /* gzip file access functions */
+
+/*
+     This library supports reading and writing files in gzip (.gz) format with
+   an interface similar to that of stdio, using the functions that start with
+   "gz".  The gzip format is different from the zlib format.  gzip is a gzip
+   wrapper, documented in RFC 1952, wrapped around a deflate stream.
+*/
+
+typedef struct gzFile_s *gzFile;    /* semi-opaque gzip file descriptor */
+
+/*
+ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode));
+
+     Opens a gzip (.gz) file for reading or writing.  The mode parameter is as
+   in fopen ("rb" or "wb") but can also include a compression level ("wb9") or
+   a strategy: 'f' for filtered data as in "wb6f", 'h' for Huffman-only
+   compression as in "wb1h", 'R' for run-length encoding as in "wb1R", or 'F'
+   for fixed code compression as in "wb9F".  (See the description of
+   deflateInit2 for more information about the strategy parameter.)  'T' will
+   request transparent writing or appending with no compression and not using
+   the gzip format.
+
+     "a" can be used instead of "w" to request that the gzip stream that will
+   be written be appended to the file.  "+" will result in an error, since
+   reading and writing to the same gzip file is not supported.  The addition of
+   "x" when writing will create the file exclusively, which fails if the file
+   already exists.  On systems that support it, the addition of "e" when
+   reading or writing will set the flag to close the file on an execve() call.
+
+     These functions, as well as gzip, will read and decode a sequence of gzip
+   streams in a file.  The append function of gzopen() can be used to create
+   such a file.  (Also see gzflush() for another way to do this.)  When
+   appending, gzopen does not test whether the file begins with a gzip stream,
+   nor does it look for the end of the gzip streams to begin appending.  gzopen
+   will simply append a gzip stream to the existing file.
+
+     gzopen can be used to read a file which is not in gzip format; in this
+   case gzread will directly read from the file without decompression.  When
+   reading, this will be detected automatically by looking for the magic two-
+   byte gzip header.
+
+     gzopen returns NULL if the file could not be opened, if there was
+   insufficient memory to allocate the gzFile state, or if an invalid mode was
+   specified (an 'r', 'w', or 'a' was not provided, or '+' was provided).
+   errno can be checked to determine if the reason gzopen failed was that the
+   file could not be opened.
+*/
+
+ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode));
+/*
+     gzdopen associates a gzFile with the file descriptor fd.  File descriptors
+   are obtained from calls like open, dup, creat, pipe or fileno (if the file
+   has been previously opened with fopen).  The mode parameter is as in gzopen.
+
+     The next call of gzclose on the returned gzFile will also close the file
+   descriptor fd, just like fclose(fdopen(fd, mode)) closes the file descriptor
+   fd.  If you want to keep fd open, use fd = dup(fd_keep); gz = gzdopen(fd,
+   mode);.  The duplicated descriptor should be saved to avoid a leak, since
+   gzdopen does not close fd if it fails.  If you are using fileno() to get the
+   file descriptor from a FILE *, then you will have to use dup() to avoid
+   double-close()ing the file descriptor.  Both gzclose() and fclose() will
+   close the associated file descriptor, so they need to have different file
+   descriptors.
+
+     gzdopen returns NULL if there was insufficient memory to allocate the
+   gzFile state, if an invalid mode was specified (an 'r', 'w', or 'a' was not
+   provided, or '+' was provided), or if fd is -1.  The file descriptor is not
+   used until the next gz* read, write, seek, or close operation, so gzdopen
+   will not detect if fd is invalid (unless fd is -1).
+*/
+
+ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size));
+/*
+     Set the internal buffer size used by this library's functions.  The
+   default buffer size is 8192 bytes.  This function must be called after
+   gzopen() or gzdopen(), and before any other calls that read or write the
+   file.  The buffer memory allocation is always deferred to the first read or
    write.  Three times that size in buffer space is allocated.  A larger buffer
    size of, for example, 64K or 128K bytes will noticeably increase the speed
    of decompression (reading).
- 
-     The new buffer size also affects the maximum length for gzprintf(). 
- 
-     gzbuffer() returns 0 on success, or -1 on failure, such as being called 
-   too late. 
-*/ 
- 
-ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy)); 
-/* 
-     Dynamically update the compression level or strategy.  See the description 
+
+     The new buffer size also affects the maximum length for gzprintf().
+
+     gzbuffer() returns 0 on success, or -1 on failure, such as being called
+   too late.
+*/
+
+ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
+/*
+     Dynamically update the compression level or strategy.  See the description
    of deflateInit2 for the meaning of these parameters.  Previously provided
    data is flushed before the parameter change.
- 
+
      gzsetparams returns Z_OK if success, Z_STREAM_ERROR if the file was not
    opened for writing, Z_ERRNO if there is an error writing the flushed data,
    or Z_MEM_ERROR if there is a memory allocation error.
-*/ 
- 
-ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len)); 
-/* 
-     Reads the given number of uncompressed bytes from the compressed file.  If 
-   the input file is not in gzip format, gzread copies the given number of 
-   bytes into the buffer directly from the file. 
- 
-     After reaching the end of a gzip stream in the input, gzread will continue 
-   to read, looking for another gzip stream.  Any number of gzip streams may be 
-   concatenated in the input file, and will all be decompressed by gzread(). 
-   If something other than a gzip stream is encountered after a gzip stream, 
-   that remaining trailing garbage is ignored (and no error is returned). 
- 
-     gzread can be used to read a gzip file that is being concurrently written. 
-   Upon reaching the end of the input, gzread will return with the available 
-   data.  If the error code returned by gzerror is Z_OK or Z_BUF_ERROR, then 
-   gzclearerr can be used to clear the end of file indicator in order to permit 
-   gzread to be tried again.  Z_OK indicates that a gzip stream was completed 
-   on the last gzread.  Z_BUF_ERROR indicates that the input file ended in the 
-   middle of a gzip stream.  Note that gzread does not return -1 in the event 
-   of an incomplete gzip stream.  This error is deferred until gzclose(), which 
-   will return Z_BUF_ERROR if the last gzread ended in the middle of a gzip 
-   stream.  Alternatively, gzerror can be used before gzclose to detect this 
-   case. 
- 
-     gzread returns the number of uncompressed bytes actually read, less than 
+*/
+
+ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));
+/*
+     Reads the given number of uncompressed bytes from the compressed file.  If
+   the input file is not in gzip format, gzread copies the given number of
+   bytes into the buffer directly from the file.
+
+     After reaching the end of a gzip stream in the input, gzread will continue
+   to read, looking for another gzip stream.  Any number of gzip streams may be
+   concatenated in the input file, and will all be decompressed by gzread().
+   If something other than a gzip stream is encountered after a gzip stream,
+   that remaining trailing garbage is ignored (and no error is returned).
+
+     gzread can be used to read a gzip file that is being concurrently written.
+   Upon reaching the end of the input, gzread will return with the available
+   data.  If the error code returned by gzerror is Z_OK or Z_BUF_ERROR, then
+   gzclearerr can be used to clear the end of file indicator in order to permit
+   gzread to be tried again.  Z_OK indicates that a gzip stream was completed
+   on the last gzread.  Z_BUF_ERROR indicates that the input file ended in the
+   middle of a gzip stream.  Note that gzread does not return -1 in the event
+   of an incomplete gzip stream.  This error is deferred until gzclose(), which
+   will return Z_BUF_ERROR if the last gzread ended in the middle of a gzip
+   stream.  Alternatively, gzerror can be used before gzclose to detect this
+   case.
+
+     gzread returns the number of uncompressed bytes actually read, less than
    len for end of file, or -1 for error.  If len is too large to fit in an int,
    then nothing is read, -1 is returned, and the error state is set to
    Z_STREAM_ERROR.
-*/ 
- 
+*/
+
 ZEXTERN z_size_t ZEXPORT gzfread OF((voidp buf, z_size_t size, z_size_t nitems,
                                      gzFile file));
 /*
@@ -1443,14 +1443,14 @@ ZEXTERN z_size_t ZEXPORT gzfread OF((voidp buf, z_size_t size, z_size_t nitems,
    file, reseting and retrying on end-of-file, when size is not 1.
 */
 
-ZEXTERN int ZEXPORT gzwrite OF((gzFile file, 
-                                voidpc buf, unsigned len)); 
-/* 
-     Writes the given number of uncompressed bytes into the compressed file. 
-   gzwrite returns the number of uncompressed bytes written or 0 in case of 
-   error. 
-*/ 
- 
+ZEXTERN int ZEXPORT gzwrite OF((gzFile file,
+                                voidpc buf, unsigned len));
+/*
+     Writes the given number of uncompressed bytes into the compressed file.
+   gzwrite returns the number of uncompressed bytes written or 0 in case of
+   error.
+*/
+
 ZEXTERN z_size_t ZEXPORT gzfwrite OF((voidpc buf, z_size_t size,
                                       z_size_t nitems, gzFile file));
 /*
@@ -1465,10 +1465,10 @@ ZEXTERN z_size_t ZEXPORT gzfwrite OF((voidpc buf, z_size_t size,
    is returned, and the error state is set to Z_STREAM_ERROR.
 */
 
-ZEXTERN int ZEXPORTVA gzprintf Z_ARG((gzFile file, const char *format, ...)); 
-/* 
-     Converts, formats, and writes the arguments to the compressed file under 
-   control of the format string, as in fprintf.  gzprintf returns the number of 
+ZEXTERN int ZEXPORTVA gzprintf Z_ARG((gzFile file, const char *format, ...));
+/*
+     Converts, formats, and writes the arguments to the compressed file under
+   control of the format string, as in fprintf.  gzprintf returns the number of
    uncompressed bytes actually written, or a negative zlib error code in case
    of error.  The number of uncompressed bytes written is limited to 8191, or
    one less than the buffer size given to gzbuffer().  The caller should assure
@@ -1478,303 +1478,303 @@ ZEXTERN int ZEXPORTVA gzprintf Z_ARG((gzFile file, const char *format, ...));
    zlib was compiled with the insecure functions sprintf() or vsprintf()
    because the secure snprintf() or vsnprintf() functions were not available.
    This can be determined using zlibCompileFlags().
-*/ 
- 
-ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s)); 
-/* 
-     Writes the given null-terminated string to the compressed file, excluding 
-   the terminating null character. 
- 
-     gzputs returns the number of characters written, or -1 in case of error. 
-*/ 
- 
-ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len)); 
-/* 
-     Reads bytes from the compressed file until len-1 characters are read, or a 
-   newline character is read and transferred to buf, or an end-of-file 
-   condition is encountered.  If any characters are read or if len == 1, the 
-   string is terminated with a null character.  If no characters are read due 
-   to an end-of-file or len < 1, then the buffer is left untouched. 
- 
-     gzgets returns buf which is a null-terminated string, or it returns NULL 
-   for end-of-file or in case of error.  If there was an error, the contents at 
-   buf are indeterminate. 
-*/ 
- 
-ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c)); 
-/* 
-     Writes c, converted to an unsigned char, into the compressed file.  gzputc 
-   returns the value that was written, or -1 in case of error. 
-*/ 
- 
-ZEXTERN int ZEXPORT gzgetc OF((gzFile file)); 
-/* 
-     Reads one byte from the compressed file.  gzgetc returns this byte or -1 
-   in case of end of file or error.  This is implemented as a macro for speed. 
-   As such, it does not do all of the checking the other functions do.  I.e. 
-   it does not check to see if file is NULL, nor whether the structure file 
-   points to has been clobbered or not. 
-*/ 
- 
-ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file)); 
-/* 
-     Push one character back onto the stream to be read as the first character 
-   on the next read.  At least one character of push-back is allowed. 
-   gzungetc() returns the character pushed, or -1 on failure.  gzungetc() will 
-   fail if c is -1, and may fail if a character has been pushed but not read 
-   yet.  If gzungetc is used immediately after gzopen or gzdopen, at least the 
-   output buffer size of pushed characters is allowed.  (See gzbuffer above.) 
-   The pushed character will be discarded if the stream is repositioned with 
-   gzseek() or gzrewind(). 
-*/ 
- 
-ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush)); 
-/* 
-     Flushes all pending output into the compressed file.  The parameter flush 
-   is as in the deflate() function.  The return value is the zlib error number 
-   (see function gzerror below).  gzflush is only permitted when writing. 
- 
-     If the flush parameter is Z_FINISH, the remaining data is written and the 
-   gzip stream is completed in the output.  If gzwrite() is called again, a new 
-   gzip stream will be started in the output.  gzread() is able to read such 
+*/
+
+ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
+/*
+     Writes the given null-terminated string to the compressed file, excluding
+   the terminating null character.
+
+     gzputs returns the number of characters written, or -1 in case of error.
+*/
+
+ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
+/*
+     Reads bytes from the compressed file until len-1 characters are read, or a
+   newline character is read and transferred to buf, or an end-of-file
+   condition is encountered.  If any characters are read or if len == 1, the
+   string is terminated with a null character.  If no characters are read due
+   to an end-of-file or len < 1, then the buffer is left untouched.
+
+     gzgets returns buf which is a null-terminated string, or it returns NULL
+   for end-of-file or in case of error.  If there was an error, the contents at
+   buf are indeterminate.
+*/
+
+ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c));
+/*
+     Writes c, converted to an unsigned char, into the compressed file.  gzputc
+   returns the value that was written, or -1 in case of error.
+*/
+
+ZEXTERN int ZEXPORT gzgetc OF((gzFile file));
+/*
+     Reads one byte from the compressed file.  gzgetc returns this byte or -1
+   in case of end of file or error.  This is implemented as a macro for speed.
+   As such, it does not do all of the checking the other functions do.  I.e.
+   it does not check to see if file is NULL, nor whether the structure file
+   points to has been clobbered or not.
+*/
+
+ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file));
+/*
+     Push one character back onto the stream to be read as the first character
+   on the next read.  At least one character of push-back is allowed.
+   gzungetc() returns the character pushed, or -1 on failure.  gzungetc() will
+   fail if c is -1, and may fail if a character has been pushed but not read
+   yet.  If gzungetc is used immediately after gzopen or gzdopen, at least the
+   output buffer size of pushed characters is allowed.  (See gzbuffer above.)
+   The pushed character will be discarded if the stream is repositioned with
+   gzseek() or gzrewind().
+*/
+
+ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush));
+/*
+     Flushes all pending output into the compressed file.  The parameter flush
+   is as in the deflate() function.  The return value is the zlib error number
+   (see function gzerror below).  gzflush is only permitted when writing.
+
+     If the flush parameter is Z_FINISH, the remaining data is written and the
+   gzip stream is completed in the output.  If gzwrite() is called again, a new
+   gzip stream will be started in the output.  gzread() is able to read such
    concatenated gzip streams.
- 
-     gzflush should be called only when strictly necessary because it will 
-   degrade compression if called too often. 
-*/ 
- 
-/* 
-ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file, 
-                                   z_off_t offset, int whence)); 
- 
-     Sets the starting position for the next gzread or gzwrite on the given 
-   compressed file.  The offset represents a number of bytes in the 
-   uncompressed data stream.  The whence parameter is defined as in lseek(2); 
-   the value SEEK_END is not supported. 
- 
-     If the file is opened for reading, this function is emulated but can be 
-   extremely slow.  If the file is opened for writing, only forward seeks are 
-   supported; gzseek then compresses a sequence of zeroes up to the new 
-   starting position. 
- 
-     gzseek returns the resulting offset location as measured in bytes from 
-   the beginning of the uncompressed stream, or -1 in case of error, in 
-   particular if the file is opened for writing and the new starting position 
-   would be before the current position. 
-*/ 
- 
-ZEXTERN int ZEXPORT    gzrewind OF((gzFile file)); 
-/* 
-     Rewinds the given file. This function is supported only for reading. 
- 
-     gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET) 
-*/ 
- 
-/* 
-ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file)); 
- 
-     Returns the starting position for the next gzread or gzwrite on the given 
-   compressed file.  This position represents a number of bytes in the 
-   uncompressed data stream, and is zero when starting, even if appending or 
-   reading a gzip stream from the middle of a file using gzdopen(). 
- 
-     gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR) 
-*/ 
- 
-/* 
-ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile file)); 
- 
-     Returns the current offset in the file being read or written.  This offset 
-   includes the count of bytes that precede the gzip stream, for example when 
-   appending or when using gzdopen() for reading.  When reading, the offset 
-   does not include as yet unused buffered input.  This information can be used 
-   for a progress indicator.  On error, gzoffset() returns -1. 
-*/ 
- 
-ZEXTERN int ZEXPORT gzeof OF((gzFile file)); 
-/* 
-     Returns true (1) if the end-of-file indicator has been set while reading, 
-   false (0) otherwise.  Note that the end-of-file indicator is set only if the 
-   read tried to go past the end of the input, but came up short.  Therefore, 
-   just like feof(), gzeof() may return false even if there is no more data to 
-   read, in the event that the last read request was for the exact number of 
-   bytes remaining in the input file.  This will happen if the input file size 
-   is an exact multiple of the buffer size. 
- 
-     If gzeof() returns true, then the read functions will return no more data, 
-   unless the end-of-file indicator is reset by gzclearerr() and the input file 
-   has grown since the previous end of file was detected. 
-*/ 
- 
-ZEXTERN int ZEXPORT gzdirect OF((gzFile file)); 
-/* 
-     Returns true (1) if file is being copied directly while reading, or false 
-   (0) if file is a gzip stream being decompressed. 
- 
-     If the input file is empty, gzdirect() will return true, since the input 
-   does not contain a gzip stream. 
- 
-     If gzdirect() is used immediately after gzopen() or gzdopen() it will 
-   cause buffers to be allocated to allow reading the file to determine if it 
-   is a gzip file.  Therefore if gzbuffer() is used, it should be called before 
-   gzdirect(). 
- 
-     When writing, gzdirect() returns true (1) if transparent writing was 
-   requested ("wT" for the gzopen() mode), or false (0) otherwise.  (Note: 
-   gzdirect() is not needed when writing.  Transparent writing must be 
-   explicitly requested, so the application already knows the answer.  When 
-   linking statically, using gzdirect() will include all of the zlib code for 
-   gzip file reading and decompression, which may not be desired.) 
-*/ 
- 
-ZEXTERN int ZEXPORT    gzclose OF((gzFile file)); 
-/* 
-     Flushes all pending output if necessary, closes the compressed file and 
-   deallocates the (de)compression state.  Note that once file is closed, you 
-   cannot call gzerror with file, since its structures have been deallocated. 
-   gzclose must not be called more than once on the same file, just as free 
-   must not be called more than once on the same allocation. 
- 
-     gzclose will return Z_STREAM_ERROR if file is not valid, Z_ERRNO on a 
-   file operation error, Z_MEM_ERROR if out of memory, Z_BUF_ERROR if the 
-   last read ended in the middle of a gzip stream, or Z_OK on success. 
-*/ 
- 
-ZEXTERN int ZEXPORT gzclose_r OF((gzFile file)); 
-ZEXTERN int ZEXPORT gzclose_w OF((gzFile file)); 
-/* 
-     Same as gzclose(), but gzclose_r() is only for use when reading, and 
-   gzclose_w() is only for use when writing or appending.  The advantage to 
-   using these instead of gzclose() is that they avoid linking in zlib 
-   compression or decompression code that is not used when only reading or only 
-   writing respectively.  If gzclose() is used, then both compression and 
-   decompression code will be included the application when linking to a static 
-   zlib library. 
-*/ 
- 
-ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum)); 
-/* 
-     Returns the error message for the last error which occurred on the given 
-   compressed file.  errnum is set to zlib error number.  If an error occurred 
-   in the file system and not in the compression library, errnum is set to 
-   Z_ERRNO and the application may consult errno to get the exact error code. 
- 
-     The application must not modify the returned string.  Future calls to 
-   this function may invalidate the previously returned string.  If file is 
-   closed, then the string previously returned by gzerror will no longer be 
-   available. 
- 
-     gzerror() should be used to distinguish errors from end-of-file for those 
-   functions above that do not distinguish those cases in their return values. 
-*/ 
- 
-ZEXTERN void ZEXPORT gzclearerr OF((gzFile file)); 
-/* 
-     Clears the error and end-of-file flags for file.  This is analogous to the 
-   clearerr() function in stdio.  This is useful for continuing to read a gzip 
-   file that is being written concurrently. 
-*/ 
- 
-#endif /* !Z_SOLO */ 
- 
-                        /* checksum functions */ 
- 
-/* 
-     These functions are not related to compression but are exported 
-   anyway because they might be useful in applications using the compression 
-   library. 
-*/ 
- 
-ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len)); 
-/* 
-     Update a running Adler-32 checksum with the bytes buf[0..len-1] and 
-   return the updated checksum.  If buf is Z_NULL, this function returns the 
-   required initial value for the checksum. 
- 
+
+     gzflush should be called only when strictly necessary because it will
+   degrade compression if called too often.
+*/
+
+/*
+ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file,
+                                   z_off_t offset, int whence));
+
+     Sets the starting position for the next gzread or gzwrite on the given
+   compressed file.  The offset represents a number of bytes in the
+   uncompressed data stream.  The whence parameter is defined as in lseek(2);
+   the value SEEK_END is not supported.
+
+     If the file is opened for reading, this function is emulated but can be
+   extremely slow.  If the file is opened for writing, only forward seeks are
+   supported; gzseek then compresses a sequence of zeroes up to the new
+   starting position.
+
+     gzseek returns the resulting offset location as measured in bytes from
+   the beginning of the uncompressed stream, or -1 in case of error, in
+   particular if the file is opened for writing and the new starting position
+   would be before the current position.
+*/
+
+ZEXTERN int ZEXPORT    gzrewind OF((gzFile file));
+/*
+     Rewinds the given file. This function is supported only for reading.
+
+     gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
+*/
+
+/*
+ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));
+
+     Returns the starting position for the next gzread or gzwrite on the given
+   compressed file.  This position represents a number of bytes in the
+   uncompressed data stream, and is zero when starting, even if appending or
+   reading a gzip stream from the middle of a file using gzdopen().
+
+     gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
+*/
+
+/*
+ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile file));
+
+     Returns the current offset in the file being read or written.  This offset
+   includes the count of bytes that precede the gzip stream, for example when
+   appending or when using gzdopen() for reading.  When reading, the offset
+   does not include as yet unused buffered input.  This information can be used
+   for a progress indicator.  On error, gzoffset() returns -1.
+*/
+
+ZEXTERN int ZEXPORT gzeof OF((gzFile file));
+/*
+     Returns true (1) if the end-of-file indicator has been set while reading,
+   false (0) otherwise.  Note that the end-of-file indicator is set only if the
+   read tried to go past the end of the input, but came up short.  Therefore,
+   just like feof(), gzeof() may return false even if there is no more data to
+   read, in the event that the last read request was for the exact number of
+   bytes remaining in the input file.  This will happen if the input file size
+   is an exact multiple of the buffer size.
+
+     If gzeof() returns true, then the read functions will return no more data,
+   unless the end-of-file indicator is reset by gzclearerr() and the input file
+   has grown since the previous end of file was detected.
+*/
+
+ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
+/*
+     Returns true (1) if file is being copied directly while reading, or false
+   (0) if file is a gzip stream being decompressed.
+
+     If the input file is empty, gzdirect() will return true, since the input
+   does not contain a gzip stream.
+
+     If gzdirect() is used immediately after gzopen() or gzdopen() it will
+   cause buffers to be allocated to allow reading the file to determine if it
+   is a gzip file.  Therefore if gzbuffer() is used, it should be called before
+   gzdirect().
+
+     When writing, gzdirect() returns true (1) if transparent writing was
+   requested ("wT" for the gzopen() mode), or false (0) otherwise.  (Note:
+   gzdirect() is not needed when writing.  Transparent writing must be
+   explicitly requested, so the application already knows the answer.  When
+   linking statically, using gzdirect() will include all of the zlib code for
+   gzip file reading and decompression, which may not be desired.)
+*/
+
+ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
+/*
+     Flushes all pending output if necessary, closes the compressed file and
+   deallocates the (de)compression state.  Note that once file is closed, you
+   cannot call gzerror with file, since its structures have been deallocated.
+   gzclose must not be called more than once on the same file, just as free
+   must not be called more than once on the same allocation.
+
+     gzclose will return Z_STREAM_ERROR if file is not valid, Z_ERRNO on a
+   file operation error, Z_MEM_ERROR if out of memory, Z_BUF_ERROR if the
+   last read ended in the middle of a gzip stream, or Z_OK on success.
+*/
+
+ZEXTERN int ZEXPORT gzclose_r OF((gzFile file));
+ZEXTERN int ZEXPORT gzclose_w OF((gzFile file));
+/*
+     Same as gzclose(), but gzclose_r() is only for use when reading, and
+   gzclose_w() is only for use when writing or appending.  The advantage to
+   using these instead of gzclose() is that they avoid linking in zlib
+   compression or decompression code that is not used when only reading or only
+   writing respectively.  If gzclose() is used, then both compression and
+   decompression code will be included the application when linking to a static
+   zlib library.
+*/
+
+ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
+/*
+     Returns the error message for the last error which occurred on the given
+   compressed file.  errnum is set to zlib error number.  If an error occurred
+   in the file system and not in the compression library, errnum is set to
+   Z_ERRNO and the application may consult errno to get the exact error code.
+
+     The application must not modify the returned string.  Future calls to
+   this function may invalidate the previously returned string.  If file is
+   closed, then the string previously returned by gzerror will no longer be
+   available.
+
+     gzerror() should be used to distinguish errors from end-of-file for those
+   functions above that do not distinguish those cases in their return values.
+*/
+
+ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
+/*
+     Clears the error and end-of-file flags for file.  This is analogous to the
+   clearerr() function in stdio.  This is useful for continuing to read a gzip
+   file that is being written concurrently.
+*/
+
+#endif /* !Z_SOLO */
+
+                        /* checksum functions */
+
+/*
+     These functions are not related to compression but are exported
+   anyway because they might be useful in applications using the compression
+   library.
+*/
+
+ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
+/*
+     Update a running Adler-32 checksum with the bytes buf[0..len-1] and
+   return the updated checksum.  If buf is Z_NULL, this function returns the
+   required initial value for the checksum.
+
      An Adler-32 checksum is almost as reliable as a CRC-32 but can be computed
-   much faster. 
- 
-   Usage example: 
- 
-     uLong adler = adler32(0L, Z_NULL, 0); 
- 
-     while (read_buffer(buffer, length) != EOF) { 
-       adler = adler32(adler, buffer, length); 
-     } 
-     if (adler != original_adler) error(); 
-*/ 
- 
+   much faster.
+
+   Usage example:
+
+     uLong adler = adler32(0L, Z_NULL, 0);
+
+     while (read_buffer(buffer, length) != EOF) {
+       adler = adler32(adler, buffer, length);
+     }
+     if (adler != original_adler) error();
+*/
+
 ZEXTERN uLong ZEXPORT adler32_z OF((uLong adler, const Bytef *buf,
                                     z_size_t len));
-/* 
+/*
      Same as adler32(), but with a size_t length.
 */
 
 /*
-ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2, 
-                                          z_off_t len2)); 
- 
-     Combine two Adler-32 checksums into one.  For two sequences of bytes, seq1 
-   and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for 
-   each, adler1 and adler2.  adler32_combine() returns the Adler-32 checksum of 
-   seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.  Note 
-   that the z_off_t type (like off_t) is a signed integer.  If len2 is 
-   negative, the result has no meaning or utility. 
-*/ 
- 
-ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len)); 
-/* 
-     Update a running CRC-32 with the bytes buf[0..len-1] and return the 
-   updated CRC-32.  If buf is Z_NULL, this function returns the required 
-   initial value for the crc.  Pre- and post-conditioning (one's complement) is 
-   performed within this function so it shouldn't be done by the application. 
- 
-   Usage example: 
- 
-     uLong crc = crc32(0L, Z_NULL, 0); 
- 
-     while (read_buffer(buffer, length) != EOF) { 
-       crc = crc32(crc, buffer, length); 
-     } 
-     if (crc != original_crc) error(); 
-*/ 
- 
+ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
+                                          z_off_t len2));
+
+     Combine two Adler-32 checksums into one.  For two sequences of bytes, seq1
+   and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
+   each, adler1 and adler2.  adler32_combine() returns the Adler-32 checksum of
+   seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.  Note
+   that the z_off_t type (like off_t) is a signed integer.  If len2 is
+   negative, the result has no meaning or utility.
+*/
+
+ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
+/*
+     Update a running CRC-32 with the bytes buf[0..len-1] and return the
+   updated CRC-32.  If buf is Z_NULL, this function returns the required
+   initial value for the crc.  Pre- and post-conditioning (one's complement) is
+   performed within this function so it shouldn't be done by the application.
+
+   Usage example:
+
+     uLong crc = crc32(0L, Z_NULL, 0);
+
+     while (read_buffer(buffer, length) != EOF) {
+       crc = crc32(crc, buffer, length);
+     }
+     if (crc != original_crc) error();
+*/
+
 ZEXTERN uLong ZEXPORT crc32_z OF((uLong adler, const Bytef *buf,
                                   z_size_t len));
-/* 
+/*
      Same as crc32(), but with a size_t length.
 */
 
 /*
-ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2)); 
- 
-     Combine two CRC-32 check values into one.  For two sequences of bytes, 
-   seq1 and seq2 with lengths len1 and len2, CRC-32 check values were 
-   calculated for each, crc1 and crc2.  crc32_combine() returns the CRC-32 
-   check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and 
-   len2. 
-*/ 
- 
- 
-                        /* various hacks, don't look :) */ 
- 
-/* deflateInit and inflateInit are macros to allow checking the zlib version 
- * and the compiler's view of z_stream: 
- */ 
-ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level, 
-                                     const char *version, int stream_size)); 
-ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm, 
-                                     const char *version, int stream_size)); 
-ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method, 
-                                      int windowBits, int memLevel, 
-                                      int strategy, const char *version, 
-                                      int stream_size)); 
-ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits, 
-                                      const char *version, int stream_size)); 
-ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits, 
-                                         unsigned char FAR *window, 
-                                         const char *version, 
-                                         int stream_size)); 
+ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
+
+     Combine two CRC-32 check values into one.  For two sequences of bytes,
+   seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
+   calculated for each, crc1 and crc2.  crc32_combine() returns the CRC-32
+   check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and
+   len2.
+*/
+
+
+                        /* various hacks, don't look :) */
+
+/* deflateInit and inflateInit are macros to allow checking the zlib version
+ * and the compiler's view of z_stream:
+ */
+ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,
+                                     const char *version, int stream_size));
+ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,
+                                     const char *version, int stream_size));
+ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,
+                                      int windowBits, int memLevel,
+                                      int strategy, const char *version,
+                                      int stream_size));
+ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,
+                                      const char *version, int stream_size));
+ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
+                                         unsigned char FAR *window,
+                                         const char *version,
+                                         int stream_size));
 #ifdef Z_PREFIX_SET
 #  define z_deflateInit(strm, level) \
           deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
@@ -1804,109 +1804,109 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
           inflateBackInit_((strm), (windowBits), (window), \
                            ZLIB_VERSION, (int)sizeof(z_stream))
 #endif
- 
-#ifndef Z_SOLO 
- 
-/* gzgetc() macro and its supporting function and exposed data structure.  Note 
- * that the real internal state is much larger than the exposed structure. 
- * This abbreviated structure exposes just enough for the gzgetc() macro.  The 
- * user should not mess with these exposed elements, since their names or 
- * behavior could change in the future, perhaps even capriciously.  They can 
- * only be used by the gzgetc() macro.  You have been warned. 
- */ 
-struct gzFile_s { 
-    unsigned have; 
-    unsigned char *next; 
-    z_off64_t pos; 
-}; 
-ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */ 
-#ifdef Z_PREFIX_SET 
+
+#ifndef Z_SOLO
+
+/* gzgetc() macro and its supporting function and exposed data structure.  Note
+ * that the real internal state is much larger than the exposed structure.
+ * This abbreviated structure exposes just enough for the gzgetc() macro.  The
+ * user should not mess with these exposed elements, since their names or
+ * behavior could change in the future, perhaps even capriciously.  They can
+ * only be used by the gzgetc() macro.  You have been warned.
+ */
+struct gzFile_s {
+    unsigned have;
+    unsigned char *next;
+    z_off64_t pos;
+};
+ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
+#ifdef Z_PREFIX_SET
 #  undef z_gzgetc
 #  define z_gzgetc(g) \
           ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (gzgetc)(g))
-#else 
-#  define gzgetc(g) \ 
+#else
+#  define gzgetc(g) \
           ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (gzgetc)(g))
-#endif 
- 
-/* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or 
- * change the regular functions to 64 bits if _FILE_OFFSET_BITS is 64 (if 
- * both are true, the application gets the *64 functions, and the regular 
- * functions are changed to 64 bits) -- in case these are set on systems 
- * without large file support, _LFS64_LARGEFILE must also be true 
- */ 
-#ifdef Z_LARGE64 
-   ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); 
-   ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int)); 
-   ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile)); 
-   ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile)); 
-   ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off64_t)); 
-   ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t)); 
-#endif 
- 
-#if !defined(ZLIB_INTERNAL) && defined(Z_WANT64) 
-#  ifdef Z_PREFIX_SET 
+#endif
+
+/* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or
+ * change the regular functions to 64 bits if _FILE_OFFSET_BITS is 64 (if
+ * both are true, the application gets the *64 functions, and the regular
+ * functions are changed to 64 bits) -- in case these are set on systems
+ * without large file support, _LFS64_LARGEFILE must also be true
+ */
+#ifdef Z_LARGE64
+   ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
+   ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
+   ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
+   ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
+   ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off64_t));
+   ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t));
+#endif
+
+#if !defined(ZLIB_INTERNAL) && defined(Z_WANT64)
+#  ifdef Z_PREFIX_SET
 #    define z_gzopen z_gzopen64
 #    define z_gzseek z_gzseek64
 #    define z_gztell z_gztell64
 #    define z_gzoffset z_gzoffset64
 #    define z_adler32_combine z_adler32_combine64
 #    define z_crc32_combine z_crc32_combine64
-#  else 
-#    define gzopen gzopen64 
-#    define gzseek gzseek64 
-#    define gztell gztell64 
-#    define gzoffset gzoffset64 
-#    define adler32_combine adler32_combine64 
-#    define crc32_combine crc32_combine64 
-#  endif 
-#  ifndef Z_LARGE64 
-     ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); 
-     ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int)); 
-     ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile)); 
-     ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile)); 
-     ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t)); 
-     ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t)); 
-#  endif 
-#else 
-   ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *)); 
-   ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int)); 
-   ZEXTERN z_off_t ZEXPORT gztell OF((gzFile)); 
-   ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile)); 
-   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t)); 
-   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t)); 
-#endif 
- 
-#else /* Z_SOLO */ 
- 
-   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t)); 
-   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t)); 
- 
-#endif /* !Z_SOLO */ 
- 
-/* undocumented functions */ 
-ZEXTERN const char   * ZEXPORT zError           OF((int)); 
-ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp)); 
-ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table    OF((void)); 
-ZEXTERN int            ZEXPORT inflateUndermine OF((z_streamp, int)); 
+#  else
+#    define gzopen gzopen64
+#    define gzseek gzseek64
+#    define gztell gztell64
+#    define gzoffset gzoffset64
+#    define adler32_combine adler32_combine64
+#    define crc32_combine crc32_combine64
+#  endif
+#  ifndef Z_LARGE64
+     ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
+     ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
+     ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
+     ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile));
+     ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
+     ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
+#  endif
+#else
+   ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *));
+   ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int));
+   ZEXTERN z_off_t ZEXPORT gztell OF((gzFile));
+   ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile));
+   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
+   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
+#endif
+
+#else /* Z_SOLO */
+
+   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
+   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
+
+#endif /* !Z_SOLO */
+
+/* undocumented functions */
+ZEXTERN const char   * ZEXPORT zError           OF((int));
+ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp));
+ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table    OF((void));
+ZEXTERN int            ZEXPORT inflateUndermine OF((z_streamp, int));
 ZEXTERN int            ZEXPORT inflateValidate OF((z_streamp, int));
 ZEXTERN unsigned long  ZEXPORT inflateCodesUsed OF ((z_streamp));
-ZEXTERN int            ZEXPORT inflateResetKeep OF((z_streamp)); 
-ZEXTERN int            ZEXPORT deflateResetKeep OF((z_streamp)); 
+ZEXTERN int            ZEXPORT inflateResetKeep OF((z_streamp));
+ZEXTERN int            ZEXPORT deflateResetKeep OF((z_streamp));
 #if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(Z_SOLO)
-ZEXTERN gzFile         ZEXPORT gzopen_w OF((const wchar_t *path, 
-                                            const char *mode)); 
-#endif 
-#if defined(STDC) || defined(Z_HAVE_STDARG_H) 
-#  ifndef Z_SOLO 
-ZEXTERN int            ZEXPORTVA gzvprintf Z_ARG((gzFile file, 
-                                                  const char *format, 
-                                                  va_list va)); 
-#  endif 
-#endif 
- 
-#ifdef __cplusplus 
-} 
-#endif 
- 
+ZEXTERN gzFile         ZEXPORT gzopen_w OF((const wchar_t *path,
+                                            const char *mode));
+#endif
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#  ifndef Z_SOLO
+ZEXTERN int            ZEXPORTVA gzvprintf Z_ARG((gzFile file,
+                                                  const char *format,
+                                                  va_list va));
+#  endif
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* ZLIB_H */
diff --git a/contrib/libs/zlib/zutil.c b/contrib/libs/zlib/zutil.c
index 8452b18bb1..a76c6b0c7e 100644
--- a/contrib/libs/zlib/zutil.c
+++ b/contrib/libs/zlib/zutil.c
@@ -1,16 +1,16 @@
-/* zutil.c -- target dependent utility functions for the compression library 
+/* zutil.c -- target dependent utility functions for the compression library
  * Copyright (C) 1995-2017 Jean-loup Gailly
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */ 
- 
-/* @(#) $Id$ */ 
- 
-#include "zutil.h" 
-#ifndef Z_SOLO 
-#  include "gzguts.h" 
-#endif 
- 
-z_const char * const z_errmsg[10] = { 
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
+#include "zutil.h"
+#ifndef Z_SOLO
+#  include "gzguts.h"
+#endif
+
+z_const char * const z_errmsg[10] = {
     (z_const char *)"need dictionary",     /* Z_NEED_DICT       2  */
     (z_const char *)"stream end",          /* Z_STREAM_END      1  */
     (z_const char *)"",                    /* Z_OK              0  */
@@ -22,304 +22,304 @@ z_const char * const z_errmsg[10] = {
     (z_const char *)"incompatible version",/* Z_VERSION_ERROR (-6) */
     (z_const char *)""
 };
- 
- 
-const char * ZEXPORT zlibVersion() 
-{ 
-    return ZLIB_VERSION; 
-} 
- 
-uLong ZEXPORT zlibCompileFlags() 
-{ 
-    uLong flags; 
- 
-    flags = 0; 
-    switch ((int)(sizeof(uInt))) { 
-    case 2:     break; 
-    case 4:     flags += 1;     break; 
-    case 8:     flags += 2;     break; 
-    default:    flags += 3; 
-    } 
-    switch ((int)(sizeof(uLong))) { 
-    case 2:     break; 
-    case 4:     flags += 1 << 2;        break; 
-    case 8:     flags += 2 << 2;        break; 
-    default:    flags += 3 << 2; 
-    } 
-    switch ((int)(sizeof(voidpf))) { 
-    case 2:     break; 
-    case 4:     flags += 1 << 4;        break; 
-    case 8:     flags += 2 << 4;        break; 
-    default:    flags += 3 << 4; 
-    } 
-    switch ((int)(sizeof(z_off_t))) { 
-    case 2:     break; 
-    case 4:     flags += 1 << 6;        break; 
-    case 8:     flags += 2 << 6;        break; 
-    default:    flags += 3 << 6; 
-    } 
+
+
+const char * ZEXPORT zlibVersion()
+{
+    return ZLIB_VERSION;
+}
+
+uLong ZEXPORT zlibCompileFlags()
+{
+    uLong flags;
+
+    flags = 0;
+    switch ((int)(sizeof(uInt))) {
+    case 2:     break;
+    case 4:     flags += 1;     break;
+    case 8:     flags += 2;     break;
+    default:    flags += 3;
+    }
+    switch ((int)(sizeof(uLong))) {
+    case 2:     break;
+    case 4:     flags += 1 << 2;        break;
+    case 8:     flags += 2 << 2;        break;
+    default:    flags += 3 << 2;
+    }
+    switch ((int)(sizeof(voidpf))) {
+    case 2:     break;
+    case 4:     flags += 1 << 4;        break;
+    case 8:     flags += 2 << 4;        break;
+    default:    flags += 3 << 4;
+    }
+    switch ((int)(sizeof(z_off_t))) {
+    case 2:     break;
+    case 4:     flags += 1 << 6;        break;
+    case 8:     flags += 2 << 6;        break;
+    default:    flags += 3 << 6;
+    }
 #ifdef ZLIB_DEBUG
-    flags += 1 << 8; 
-#endif 
-#if defined(ASMV) || defined(ASMINF) 
-    flags += 1 << 9; 
-#endif 
-#ifdef ZLIB_WINAPI 
-    flags += 1 << 10; 
-#endif 
-#ifdef BUILDFIXED 
-    flags += 1 << 12; 
-#endif 
-#ifdef DYNAMIC_CRC_TABLE 
-    flags += 1 << 13; 
-#endif 
-#ifdef NO_GZCOMPRESS 
-    flags += 1L << 16; 
-#endif 
-#ifdef NO_GZIP 
-    flags += 1L << 17; 
-#endif 
-#ifdef PKZIP_BUG_WORKAROUND 
-    flags += 1L << 20; 
-#endif 
-#ifdef FASTEST 
-    flags += 1L << 21; 
-#endif 
-#if defined(STDC) || defined(Z_HAVE_STDARG_H) 
-#  ifdef NO_vsnprintf 
-    flags += 1L << 25; 
-#    ifdef HAS_vsprintf_void 
-    flags += 1L << 26; 
-#    endif 
-#  else 
-#    ifdef HAS_vsnprintf_void 
-    flags += 1L << 26; 
-#    endif 
-#  endif 
-#else 
-    flags += 1L << 24; 
-#  ifdef NO_snprintf 
-    flags += 1L << 25; 
-#    ifdef HAS_sprintf_void 
-    flags += 1L << 26; 
-#    endif 
-#  else 
-#    ifdef HAS_snprintf_void 
-    flags += 1L << 26; 
-#    endif 
-#  endif 
-#endif 
-    return flags; 
-} 
- 
+    flags += 1 << 8;
+#endif
+#if defined(ASMV) || defined(ASMINF)
+    flags += 1 << 9;
+#endif
+#ifdef ZLIB_WINAPI
+    flags += 1 << 10;
+#endif
+#ifdef BUILDFIXED
+    flags += 1 << 12;
+#endif
+#ifdef DYNAMIC_CRC_TABLE
+    flags += 1 << 13;
+#endif
+#ifdef NO_GZCOMPRESS
+    flags += 1L << 16;
+#endif
+#ifdef NO_GZIP
+    flags += 1L << 17;
+#endif
+#ifdef PKZIP_BUG_WORKAROUND
+    flags += 1L << 20;
+#endif
+#ifdef FASTEST
+    flags += 1L << 21;
+#endif
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#  ifdef NO_vsnprintf
+    flags += 1L << 25;
+#    ifdef HAS_vsprintf_void
+    flags += 1L << 26;
+#    endif
+#  else
+#    ifdef HAS_vsnprintf_void
+    flags += 1L << 26;
+#    endif
+#  endif
+#else
+    flags += 1L << 24;
+#  ifdef NO_snprintf
+    flags += 1L << 25;
+#    ifdef HAS_sprintf_void
+    flags += 1L << 26;
+#    endif
+#  else
+#    ifdef HAS_snprintf_void
+    flags += 1L << 26;
+#    endif
+#  endif
+#endif
+    return flags;
+}
+
 #ifdef ZLIB_DEBUG
 #include <stdlib.h>
-#  ifndef verbose 
-#    define verbose 0 
-#  endif 
-int ZLIB_INTERNAL z_verbose = verbose; 
- 
-void ZLIB_INTERNAL z_error (m) 
-    char *m; 
-{ 
-    fprintf(stderr, "%s\n", m); 
-    exit(1); 
-} 
-#endif 
- 
-/* exported to allow conversion of error code to string for compress() and 
- * uncompress() 
- */ 
-const char * ZEXPORT zError(err) 
-    int err; 
-{ 
-    return ERR_MSG(err); 
-} 
- 
-#if defined(_WIN32_WCE) 
-    /* The Microsoft C Run-Time Library for Windows CE doesn't have 
-     * errno.  We define it as a global variable to simplify porting. 
-     * Its value is always 0 and should not be used. 
-     */ 
-    int errno = 0; 
-#endif 
- 
-#ifndef HAVE_MEMCPY 
- 
-void ZLIB_INTERNAL zmemcpy(dest, source, len) 
-    Bytef* dest; 
-    const Bytef* source; 
-    uInt  len; 
-{ 
-    if (len == 0) return; 
-    do { 
-        *dest++ = *source++; /* ??? to be unrolled */ 
-    } while (--len != 0); 
-} 
- 
-int ZLIB_INTERNAL zmemcmp(s1, s2, len) 
-    const Bytef* s1; 
-    const Bytef* s2; 
-    uInt  len; 
-{ 
-    uInt j; 
- 
-    for (j = 0; j < len; j++) { 
-        if (s1[j] != s2[j]) return 2*(s1[j] > s2[j])-1; 
-    } 
-    return 0; 
-} 
- 
-void ZLIB_INTERNAL zmemzero(dest, len) 
-    Bytef* dest; 
-    uInt  len; 
-{ 
-    if (len == 0) return; 
-    do { 
-        *dest++ = 0;  /* ??? to be unrolled */ 
-    } while (--len != 0); 
-} 
-#endif 
- 
-#ifndef Z_SOLO 
- 
-#ifdef SYS16BIT 
- 
-#ifdef __TURBOC__ 
-/* Turbo C in 16-bit mode */ 
- 
-#  define MY_ZCALLOC 
- 
-/* Turbo C malloc() does not allow dynamic allocation of 64K bytes 
- * and farmalloc(64K) returns a pointer with an offset of 8, so we 
- * must fix the pointer. Warning: the pointer must be put back to its 
- * original form in order to free it, use zcfree(). 
- */ 
- 
-#define MAX_PTR 10 
-/* 10*64K = 640K */ 
- 
-local int next_ptr = 0; 
- 
-typedef struct ptr_table_s { 
-    voidpf org_ptr; 
-    voidpf new_ptr; 
-} ptr_table; 
- 
-local ptr_table table[MAX_PTR]; 
-/* This table is used to remember the original form of pointers 
- * to large buffers (64K). Such pointers are normalized with a zero offset. 
- * Since MSDOS is not a preemptive multitasking OS, this table is not 
- * protected from concurrent access. This hack doesn't work anyway on 
- * a protected system like OS/2. Use Microsoft C instead. 
- */ 
- 
-voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size) 
-{ 
+#  ifndef verbose
+#    define verbose 0
+#  endif
+int ZLIB_INTERNAL z_verbose = verbose;
+
+void ZLIB_INTERNAL z_error (m)
+    char *m;
+{
+    fprintf(stderr, "%s\n", m);
+    exit(1);
+}
+#endif
+
+/* exported to allow conversion of error code to string for compress() and
+ * uncompress()
+ */
+const char * ZEXPORT zError(err)
+    int err;
+{
+    return ERR_MSG(err);
+}
+
+#if defined(_WIN32_WCE)
+    /* The Microsoft C Run-Time Library for Windows CE doesn't have
+     * errno.  We define it as a global variable to simplify porting.
+     * Its value is always 0 and should not be used.
+     */
+    int errno = 0;
+#endif
+
+#ifndef HAVE_MEMCPY
+
+void ZLIB_INTERNAL zmemcpy(dest, source, len)
+    Bytef* dest;
+    const Bytef* source;
+    uInt  len;
+{
+    if (len == 0) return;
+    do {
+        *dest++ = *source++; /* ??? to be unrolled */
+    } while (--len != 0);
+}
+
+int ZLIB_INTERNAL zmemcmp(s1, s2, len)
+    const Bytef* s1;
+    const Bytef* s2;
+    uInt  len;
+{
+    uInt j;
+
+    for (j = 0; j < len; j++) {
+        if (s1[j] != s2[j]) return 2*(s1[j] > s2[j])-1;
+    }
+    return 0;
+}
+
+void ZLIB_INTERNAL zmemzero(dest, len)
+    Bytef* dest;
+    uInt  len;
+{
+    if (len == 0) return;
+    do {
+        *dest++ = 0;  /* ??? to be unrolled */
+    } while (--len != 0);
+}
+#endif
+
+#ifndef Z_SOLO
+
+#ifdef SYS16BIT
+
+#ifdef __TURBOC__
+/* Turbo C in 16-bit mode */
+
+#  define MY_ZCALLOC
+
+/* Turbo C malloc() does not allow dynamic allocation of 64K bytes
+ * and farmalloc(64K) returns a pointer with an offset of 8, so we
+ * must fix the pointer. Warning: the pointer must be put back to its
+ * original form in order to free it, use zcfree().
+ */
+
+#define MAX_PTR 10
+/* 10*64K = 640K */
+
+local int next_ptr = 0;
+
+typedef struct ptr_table_s {
+    voidpf org_ptr;
+    voidpf new_ptr;
+} ptr_table;
+
+local ptr_table table[MAX_PTR];
+/* This table is used to remember the original form of pointers
+ * to large buffers (64K). Such pointers are normalized with a zero offset.
+ * Since MSDOS is not a preemptive multitasking OS, this table is not
+ * protected from concurrent access. This hack doesn't work anyway on
+ * a protected system like OS/2. Use Microsoft C instead.
+ */
+
+voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size)
+{
     voidpf buf;
-    ulg bsize = (ulg)items*size; 
- 
+    ulg bsize = (ulg)items*size;
+
     (void)opaque;
 
-    /* If we allocate less than 65520 bytes, we assume that farmalloc 
-     * will return a usable pointer which doesn't have to be normalized. 
-     */ 
-    if (bsize < 65520L) { 
-        buf = farmalloc(bsize); 
-        if (*(ush*)&buf != 0) return buf; 
-    } else { 
-        buf = farmalloc(bsize + 16L); 
-    } 
-    if (buf == NULL || next_ptr >= MAX_PTR) return NULL; 
-    table[next_ptr].org_ptr = buf; 
- 
-    /* Normalize the pointer to seg:0 */ 
-    *((ush*)&buf+1) += ((ush)((uch*)buf-0) + 15) >> 4; 
-    *(ush*)&buf = 0; 
-    table[next_ptr++].new_ptr = buf; 
-    return buf; 
-} 
- 
-void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr) 
-{ 
-    int n; 
+    /* If we allocate less than 65520 bytes, we assume that farmalloc
+     * will return a usable pointer which doesn't have to be normalized.
+     */
+    if (bsize < 65520L) {
+        buf = farmalloc(bsize);
+        if (*(ush*)&buf != 0) return buf;
+    } else {
+        buf = farmalloc(bsize + 16L);
+    }
+    if (buf == NULL || next_ptr >= MAX_PTR) return NULL;
+    table[next_ptr].org_ptr = buf;
+
+    /* Normalize the pointer to seg:0 */
+    *((ush*)&buf+1) += ((ush)((uch*)buf-0) + 15) >> 4;
+    *(ush*)&buf = 0;
+    table[next_ptr++].new_ptr = buf;
+    return buf;
+}
+
+void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
+{
+    int n;
 
     (void)opaque;
 
-    if (*(ush*)&ptr != 0) { /* object < 64K */ 
-        farfree(ptr); 
-        return; 
-    } 
-    /* Find the original pointer */ 
-    for (n = 0; n < next_ptr; n++) { 
-        if (ptr != table[n].new_ptr) continue; 
- 
-        farfree(table[n].org_ptr); 
-        while (++n < next_ptr) { 
-            table[n-1] = table[n]; 
-        } 
-        next_ptr--; 
-        return; 
-    } 
-    Assert(0, "zcfree: ptr not found"); 
-} 
- 
-#endif /* __TURBOC__ */ 
- 
- 
-#ifdef M_I86 
-/* Microsoft C in 16-bit mode */ 
- 
-#  define MY_ZCALLOC 
- 
-#if (!defined(_MSC_VER) || (_MSC_VER <= 600)) 
-#  define _halloc  halloc 
-#  define _hfree   hfree 
-#endif 
- 
-voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, uInt items, uInt size) 
-{ 
+    if (*(ush*)&ptr != 0) { /* object < 64K */
+        farfree(ptr);
+        return;
+    }
+    /* Find the original pointer */
+    for (n = 0; n < next_ptr; n++) {
+        if (ptr != table[n].new_ptr) continue;
+
+        farfree(table[n].org_ptr);
+        while (++n < next_ptr) {
+            table[n-1] = table[n];
+        }
+        next_ptr--;
+        return;
+    }
+    Assert(0, "zcfree: ptr not found");
+}
+
+#endif /* __TURBOC__ */
+
+
+#ifdef M_I86
+/* Microsoft C in 16-bit mode */
+
+#  define MY_ZCALLOC
+
+#if (!defined(_MSC_VER) || (_MSC_VER <= 600))
+#  define _halloc  halloc
+#  define _hfree   hfree
+#endif
+
+voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, uInt items, uInt size)
+{
     (void)opaque;
-    return _halloc((long)items, size); 
-} 
- 
-void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr) 
-{ 
+    return _halloc((long)items, size);
+}
+
+void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
+{
     (void)opaque;
-    _hfree(ptr); 
-} 
- 
-#endif /* M_I86 */ 
- 
-#endif /* SYS16BIT */ 
- 
- 
-#ifndef MY_ZCALLOC /* Any system without a special alloc function */ 
- 
-#ifndef STDC 
-extern voidp  malloc OF((uInt size)); 
-extern voidp  calloc OF((uInt items, uInt size)); 
-extern void   free   OF((voidpf ptr)); 
-#endif 
- 
-voidpf ZLIB_INTERNAL zcalloc (opaque, items, size) 
-    voidpf opaque; 
-    unsigned items; 
-    unsigned size; 
-{ 
+    _hfree(ptr);
+}
+
+#endif /* M_I86 */
+
+#endif /* SYS16BIT */
+
+
+#ifndef MY_ZCALLOC /* Any system without a special alloc function */
+
+#ifndef STDC
+extern voidp  malloc OF((uInt size));
+extern voidp  calloc OF((uInt items, uInt size));
+extern void   free   OF((voidpf ptr));
+#endif
+
+voidpf ZLIB_INTERNAL zcalloc (opaque, items, size)
+    voidpf opaque;
+    unsigned items;
+    unsigned size;
+{
     (void)opaque;
-    return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) : 
-                              (voidpf)calloc(items, size); 
-} 
- 
-void ZLIB_INTERNAL zcfree (opaque, ptr) 
-    voidpf opaque; 
-    voidpf ptr; 
-{ 
+    return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) :
+                              (voidpf)calloc(items, size);
+}
+
+void ZLIB_INTERNAL zcfree (opaque, ptr)
+    voidpf opaque;
+    voidpf ptr;
+{
     (void)opaque;
-    free(ptr); 
-} 
- 
-#endif /* MY_ZCALLOC */ 
- 
-#endif /* !Z_SOLO */ 
+    free(ptr);
+}
+
+#endif /* MY_ZCALLOC */
+
+#endif /* !Z_SOLO */
diff --git a/contrib/libs/zlib/zutil.h b/contrib/libs/zlib/zutil.h
index 36acf35480..b079ea6a80 100644
--- a/contrib/libs/zlib/zutil.h
+++ b/contrib/libs/zlib/zutil.h
@@ -1,114 +1,114 @@
-/* zutil.h -- internal interface and configuration of the compression library 
+/* zutil.h -- internal interface and configuration of the compression library
  * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */ 
- 
-/* WARNING: this file should *not* be used by applications. It is 
-   part of the implementation of the compression library and is 
-   subject to change. Applications should only use zlib.h. 
- */ 
- 
-/* @(#) $Id$ */ 
- 
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+/* @(#) $Id$ */
+
 #ifndef ZUTIL_H
 #define ZUTIL_H
 
-#ifdef HAVE_HIDDEN 
-#  define ZLIB_INTERNAL __attribute__((visibility ("hidden"))) 
-#else 
-#  define ZLIB_INTERNAL 
-#endif 
- 
-#include "zlib.h" 
- 
-#if defined(STDC) && !defined(Z_SOLO) 
-#  if !(defined(_WIN32_WCE) && defined(_MSC_VER)) 
-#    include <stddef.h> 
-#  endif 
-#  include <string.h> 
-#  include <stdlib.h> 
-#endif 
- 
-#ifdef Z_SOLO 
-   typedef long ptrdiff_t;  /* guess -- will be caught if guess is wrong */ 
-#endif 
- 
-#ifndef local 
-#  define local static 
-#endif 
+#ifdef HAVE_HIDDEN
+#  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
+#else
+#  define ZLIB_INTERNAL
+#endif
+
+#include "zlib.h"
+
+#if defined(STDC) && !defined(Z_SOLO)
+#  if !(defined(_WIN32_WCE) && defined(_MSC_VER))
+#    include <stddef.h>
+#  endif
+#  include <string.h>
+#  include <stdlib.h>
+#endif
+
+#ifdef Z_SOLO
+   typedef long ptrdiff_t;  /* guess -- will be caught if guess is wrong */
+#endif
+
+#ifndef local
+#  define local static
+#endif
 /* since "static" is used to mean two completely different things in C, we
    define "local" for the non-static meaning of "static", for readability
    (compile with -Dlocal if your debugger can't find static symbols) */
- 
-typedef unsigned char  uch; 
-typedef uch FAR uchf; 
-typedef unsigned short ush; 
-typedef ush FAR ushf; 
-typedef unsigned long  ulg; 
- 
-extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ 
-/* (size given to avoid silly warnings with Visual C++) */ 
- 
-#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)] 
- 
-#define ERR_RETURN(strm,err) \ 
-  return (strm->msg = ERR_MSG(err), (err)) 
-/* To be used only when the state is known to be valid */ 
- 
-        /* common constants */ 
- 
-#ifndef DEF_WBITS 
-#  define DEF_WBITS MAX_WBITS 
-#endif 
-/* default windowBits for decompression. MAX_WBITS is for compression only */ 
- 
-#if MAX_MEM_LEVEL >= 8 
-#  define DEF_MEM_LEVEL 8 
-#else 
-#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL 
-#endif 
-/* default memLevel */ 
- 
-#define STORED_BLOCK 0 
-#define STATIC_TREES 1 
-#define DYN_TREES    2 
-/* The three kinds of block type */ 
- 
-#define MIN_MATCH  3 
-#define MAX_MATCH  258 
-/* The minimum and maximum match lengths */ 
- 
-#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */ 
- 
-        /* target dependencies */ 
- 
-#if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32)) 
-#  define OS_CODE  0x00 
-#  ifndef Z_SOLO 
-#    if defined(__TURBOC__) || defined(__BORLANDC__) 
-#      if (__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__)) 
-         /* Allow compilation with ANSI keywords only enabled */ 
-         void _Cdecl farfree( void *block ); 
-         void *_Cdecl farmalloc( unsigned long nbytes ); 
-#      else 
-#        include <alloc.h> 
-#      endif 
-#    else /* MSC or DJGPP */ 
-#      include <malloc.h> 
-#    endif 
-#  endif 
-#endif 
- 
-#ifdef AMIGA 
+
+typedef unsigned char  uch;
+typedef uch FAR uchf;
+typedef unsigned short ush;
+typedef ush FAR ushf;
+typedef unsigned long  ulg;
+
+extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
+/* (size given to avoid silly warnings with Visual C++) */
+
+#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
+
+#define ERR_RETURN(strm,err) \
+  return (strm->msg = ERR_MSG(err), (err))
+/* To be used only when the state is known to be valid */
+
+        /* common constants */
+
+#ifndef DEF_WBITS
+#  define DEF_WBITS MAX_WBITS
+#endif
+/* default windowBits for decompression. MAX_WBITS is for compression only */
+
+#if MAX_MEM_LEVEL >= 8
+#  define DEF_MEM_LEVEL 8
+#else
+#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
+#endif
+/* default memLevel */
+
+#define STORED_BLOCK 0
+#define STATIC_TREES 1
+#define DYN_TREES    2
+/* The three kinds of block type */
+
+#define MIN_MATCH  3
+#define MAX_MATCH  258
+/* The minimum and maximum match lengths */
+
+#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */
+
+        /* target dependencies */
+
+#if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32))
+#  define OS_CODE  0x00
+#  ifndef Z_SOLO
+#    if defined(__TURBOC__) || defined(__BORLANDC__)
+#      if (__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
+         /* Allow compilation with ANSI keywords only enabled */
+         void _Cdecl farfree( void *block );
+         void *_Cdecl farmalloc( unsigned long nbytes );
+#      else
+#        include <alloc.h>
+#      endif
+#    else /* MSC or DJGPP */
+#      include <malloc.h>
+#    endif
+#  endif
+#endif
+
+#ifdef AMIGA
 #  define OS_CODE  1
-#endif 
- 
-#if defined(VAXC) || defined(VMS) 
+#endif
+
+#if defined(VAXC) || defined(VMS)
 #  define OS_CODE  2
-#  define F_OPEN(name, mode) \ 
-     fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512") 
-#endif 
- 
+#  define F_OPEN(name, mode) \
+     fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512")
+#endif
+
 #ifdef __370__
 #  if __TARGET_LIB__ < 0x20000000
 #    define OS_CODE 4
@@ -119,42 +119,42 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #  endif
 #endif
 
-#if defined(ATARI) || defined(atarist) 
+#if defined(ATARI) || defined(atarist)
 #  define OS_CODE  5
-#endif 
- 
-#ifdef OS2 
+#endif
+
+#ifdef OS2
 #  define OS_CODE  6
-#  if defined(M_I86) && !defined(Z_SOLO) 
-#    include <malloc.h> 
-#  endif 
-#endif 
- 
-#if defined(MACOS) || defined(TARGET_OS_MAC) 
+#  if defined(M_I86) && !defined(Z_SOLO)
+#    include <malloc.h>
+#  endif
+#endif
+
+#if defined(MACOS) || defined(TARGET_OS_MAC)
 #  define OS_CODE  7
-#  ifndef Z_SOLO 
-#    if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os 
-#      include <unix.h> /* for fdopen */ 
-#    else 
-#      ifndef fdopen 
-#        define fdopen(fd,mode) NULL /* No fdopen() */ 
-#      endif 
-#    endif 
-#  endif 
-#endif 
- 
+#  ifndef Z_SOLO
+#    if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
+#      include <unix.h> /* for fdopen */
+#    else
+#      ifndef fdopen
+#        define fdopen(fd,mode) NULL /* No fdopen() */
+#      endif
+#    endif
+#  endif
+#endif
+
 #ifdef __acorn
 #  define OS_CODE 13
-#endif 
- 
+#endif
+
 #if defined(WIN32) && !defined(__CYGWIN__)
 #  define OS_CODE  10
-#endif 
- 
+#endif
+
 #ifdef _BEOS_
 #  define OS_CODE  16
-#endif 
- 
+#endif
+
 #ifdef __TOS_OS400__
 #  define OS_CODE 18
 #endif
@@ -163,109 +163,109 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #  define OS_CODE 19
 #endif
 
-#if defined(_BEOS_) || defined(RISCOS) 
-#  define fdopen(fd,mode) NULL /* No fdopen() */ 
-#endif 
- 
-#if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX 
-#  if defined(_WIN32_WCE) 
-#    define fdopen(fd,mode) NULL /* No fdopen() */ 
-#    ifndef _PTRDIFF_T_DEFINED 
-       typedef int ptrdiff_t; 
-#      define _PTRDIFF_T_DEFINED 
-#    endif 
-#  else 
-#    define fdopen(fd,type)  _fdopen(fd,type) 
-#  endif 
-#endif 
- 
-#if defined(__BORLANDC__) && !defined(MSDOS) 
-  #pragma warn -8004 
-  #pragma warn -8008 
-  #pragma warn -8066 
-#endif 
- 
-/* provide prototypes for these when building zlib without LFS */ 
-#if !defined(_WIN32) && \ 
-    (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0) 
-    ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t)); 
-    ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t)); 
-#endif 
- 
-        /* common defaults */ 
- 
-#ifndef OS_CODE 
+#if defined(_BEOS_) || defined(RISCOS)
+#  define fdopen(fd,mode) NULL /* No fdopen() */
+#endif
+
+#if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX
+#  if defined(_WIN32_WCE)
+#    define fdopen(fd,mode) NULL /* No fdopen() */
+#    ifndef _PTRDIFF_T_DEFINED
+       typedef int ptrdiff_t;
+#      define _PTRDIFF_T_DEFINED
+#    endif
+#  else
+#    define fdopen(fd,type)  _fdopen(fd,type)
+#  endif
+#endif
+
+#if defined(__BORLANDC__) && !defined(MSDOS)
+  #pragma warn -8004
+  #pragma warn -8008
+  #pragma warn -8066
+#endif
+
+/* provide prototypes for these when building zlib without LFS */
+#if !defined(_WIN32) && \
+    (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)
+    ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
+    ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
+#endif
+
+        /* common defaults */
+
+#ifndef OS_CODE
 #  define OS_CODE  3     /* assume Unix */
-#endif 
- 
-#ifndef F_OPEN 
-#  define F_OPEN(name, mode) fopen((name), (mode)) 
-#endif 
- 
-         /* functions */ 
- 
-#if defined(pyr) || defined(Z_SOLO) 
-#  define NO_MEMCPY 
-#endif 
-#if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__) 
- /* Use our own functions for small and medium model with MSC <= 5.0. 
-  * You may have to use the same strategy for Borland C (untested). 
-  * The __SC__ check is for Symantec. 
-  */ 
-#  define NO_MEMCPY 
-#endif 
-#if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY) 
-#  define HAVE_MEMCPY 
-#endif 
-#ifdef HAVE_MEMCPY 
-#  ifdef SMALL_MEDIUM /* MSDOS small or medium model */ 
-#    define zmemcpy _fmemcpy 
-#    define zmemcmp _fmemcmp 
-#    define zmemzero(dest, len) _fmemset(dest, 0, len) 
-#  else 
-#    define zmemcpy memcpy 
-#    define zmemcmp memcmp 
-#    define zmemzero(dest, len) memset(dest, 0, len) 
-#  endif 
-#else 
-   void ZLIB_INTERNAL zmemcpy OF((Bytef* dest, const Bytef* source, uInt len)); 
-   int ZLIB_INTERNAL zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len)); 
-   void ZLIB_INTERNAL zmemzero OF((Bytef* dest, uInt len)); 
-#endif 
- 
-/* Diagnostic functions */ 
+#endif
+
+#ifndef F_OPEN
+#  define F_OPEN(name, mode) fopen((name), (mode))
+#endif
+
+         /* functions */
+
+#if defined(pyr) || defined(Z_SOLO)
+#  define NO_MEMCPY
+#endif
+#if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__)
+ /* Use our own functions for small and medium model with MSC <= 5.0.
+  * You may have to use the same strategy for Borland C (untested).
+  * The __SC__ check is for Symantec.
+  */
+#  define NO_MEMCPY
+#endif
+#if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY)
+#  define HAVE_MEMCPY
+#endif
+#ifdef HAVE_MEMCPY
+#  ifdef SMALL_MEDIUM /* MSDOS small or medium model */
+#    define zmemcpy _fmemcpy
+#    define zmemcmp _fmemcmp
+#    define zmemzero(dest, len) _fmemset(dest, 0, len)
+#  else
+#    define zmemcpy memcpy
+#    define zmemcmp memcmp
+#    define zmemzero(dest, len) memset(dest, 0, len)
+#  endif
+#else
+   void ZLIB_INTERNAL zmemcpy OF((Bytef* dest, const Bytef* source, uInt len));
+   int ZLIB_INTERNAL zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len));
+   void ZLIB_INTERNAL zmemzero OF((Bytef* dest, uInt len));
+#endif
+
+/* Diagnostic functions */
 #ifdef ZLIB_DEBUG
-#  include <stdio.h> 
-   extern int ZLIB_INTERNAL z_verbose; 
-   extern void ZLIB_INTERNAL z_error OF((char *m)); 
-#  define Assert(cond,msg) {if(!(cond)) z_error(msg);} 
-#  define Trace(x) {if (z_verbose>=0) fprintf x ;} 
-#  define Tracev(x) {if (z_verbose>0) fprintf x ;} 
-#  define Tracevv(x) {if (z_verbose>1) fprintf x ;} 
-#  define Tracec(c,x) {if (z_verbose>0 && (c)) fprintf x ;} 
-#  define Tracecv(c,x) {if (z_verbose>1 && (c)) fprintf x ;} 
-#else 
-#  define Assert(cond,msg) 
-#  define Trace(x) 
-#  define Tracev(x) 
-#  define Tracevv(x) 
-#  define Tracec(c,x) 
-#  define Tracecv(c,x) 
-#endif 
- 
-#ifndef Z_SOLO 
-   voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items, 
-                                    unsigned size)); 
-   void ZLIB_INTERNAL zcfree  OF((voidpf opaque, voidpf ptr)); 
-#endif 
- 
-#define ZALLOC(strm, items, size) \ 
-           (*((strm)->zalloc))((strm)->opaque, (items), (size)) 
-#define ZFREE(strm, addr)  (*((strm)->zfree))((strm)->opaque, (voidpf)(addr)) 
-#define TRY_FREE(s, p) {if (p) ZFREE(s, p);} 
- 
-/* Reverse the bytes in a 32-bit value */ 
-#define ZSWAP32(q) ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \ 
-                    (((q) & 0xff00) << 8) + (((q) & 0xff) << 24)) 
+#  include <stdio.h>
+   extern int ZLIB_INTERNAL z_verbose;
+   extern void ZLIB_INTERNAL z_error OF((char *m));
+#  define Assert(cond,msg) {if(!(cond)) z_error(msg);}
+#  define Trace(x) {if (z_verbose>=0) fprintf x ;}
+#  define Tracev(x) {if (z_verbose>0) fprintf x ;}
+#  define Tracevv(x) {if (z_verbose>1) fprintf x ;}
+#  define Tracec(c,x) {if (z_verbose>0 && (c)) fprintf x ;}
+#  define Tracecv(c,x) {if (z_verbose>1 && (c)) fprintf x ;}
+#else
+#  define Assert(cond,msg)
+#  define Trace(x)
+#  define Tracev(x)
+#  define Tracevv(x)
+#  define Tracec(c,x)
+#  define Tracecv(c,x)
+#endif
+
+#ifndef Z_SOLO
+   voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items,
+                                    unsigned size));
+   void ZLIB_INTERNAL zcfree  OF((voidpf opaque, voidpf ptr));
+#endif
+
+#define ZALLOC(strm, items, size) \
+           (*((strm)->zalloc))((strm)->opaque, (items), (size))
+#define ZFREE(strm, addr)  (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))
+#define TRY_FREE(s, p) {if (p) ZFREE(s, p);}
+
+/* Reverse the bytes in a 32-bit value */
+#define ZSWAP32(q) ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \
+                    (((q) & 0xff00) << 8) + (((q) & 0xff) << 24))
 
 #endif /* ZUTIL_H */