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

1 files changed, 516 insertions, 516 deletions

diff --git a/contrib/libs/zlib/deflate.c b/contrib/libs/zlib/deflate.c
index 39688e9e15..7318b1e2fb 100644
--- a/contrib/libs/zlib/deflate.c
+++ b/contrib/libs/zlib/deflate.c
@@ -1,5 +1,5 @@
 /* deflate.c -- compress data using the deflation algorithm
- * Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler 
+ * Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -50,10 +50,10 @@
 /* @(#) $Id$ */
 
 #include "deflate.h"
-#include <util/system/compiler.h> 
+#include <util/system/compiler.h>
 
 const char deflate_copyright[] =
-   " deflate 1.2.11 Copyright 1995-2017 Jean-loup Gailly and Mark Adler "; 
+   " 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
@@ -74,8 +74,8 @@ typedef enum {
 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 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));
@@ -87,16 +87,16 @@ 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)); 
+local unsigned read_buf   OF((z_streamp strm, Bytef *buf, unsigned size));
 #ifdef ASMV
-#  pragma message("Assembler code may have bugs -- use at your own risk") 
+#  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
 
-#ifdef ZLIB_DEBUG 
+#ifdef ZLIB_DEBUG
 local  void check_match OF((deflate_state *s, IPos start, IPos match,
                             int length));
 #endif
@@ -157,9 +157,9 @@ local const config configuration_table[10] = {
 
 /* ===========================================================================
  * 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. 
+ * 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)
 
@@ -170,9 +170,9 @@ local const config configuration_table[10] = {
  * 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). 
+ * 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) \
@@ -194,37 +194,37 @@ local const config configuration_table[10] = {
     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 
- * keep the hash table consistent if we switch back to level > 0 later. 
- */ 
-local void slide_hash(s) 
-    deflate_state *s; 
-{ 
-    unsigned n, m; 
-    Posf *p; 
-    uInt wsize = s->w_size; 
- 
-    n = s->hash_size; 
-    p = &s->head[n]; 
-    do { 
-        m = *--p; 
-        *p = (Pos)(m >= wsize ? m - wsize : NIL); 
-    } while (--n); 
-    n = wsize; 
-#ifndef FASTEST 
-    p = &s->prev[n]; 
-    do { 
-        m = *--p; 
-        *p = (Pos)(m >= wsize ? m - wsize : NIL); 
-        /* If n is not on any hash chain, prev[n] is garbage but 
-         * its value will never be used. 
-         */ 
-    } while (--n); 
-#endif 
-} 
- 
+/* ===========================================================================
+ * 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
+ * keep the hash table consistent if we switch back to level > 0 later.
+ */
+local void slide_hash(s)
+    deflate_state *s;
+{
+    unsigned n, m;
+    Posf *p;
+    uInt wsize = s->w_size;
+
+    n = s->hash_size;
+    p = &s->head[n];
+    do {
+        m = *--p;
+        *p = (Pos)(m >= wsize ? m - wsize : NIL);
+    } while (--n);
+    n = wsize;
+#ifndef FASTEST
+    p = &s->prev[n];
+    do {
+        m = *--p;
+        *p = (Pos)(m >= wsize ? m - wsize : NIL);
+        /* If n is not on any hash chain, prev[n] is garbage but
+         * its value will never be used.
+         */
+    } while (--n);
+#endif
+}
+
 /* ========================================================================= */
 int ZEXPORT deflateInit_(strm, level, version, stream_size)
     z_streamp strm;
@@ -298,7 +298,7 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
 #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)) { 
+        strategy < 0 || strategy > Z_FIXED || (windowBits == 8 && wrap != 1)) {
         return Z_STREAM_ERROR;
     }
     if (windowBits == 8) windowBits = 9;  /* until 256-byte window bug fixed */
@@ -306,15 +306,15 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
     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->status = INIT_STATE;     /* to pass state test in deflateReset() */
 
     s->wrap = wrap;
     s->gzhead = Z_NULL;
-    s->w_bits = (uInt)windowBits; 
+    s->w_bits = (uInt)windowBits;
     s->w_size = 1 << s->w_bits;
     s->w_mask = s->w_size - 1;
 
-    s->hash_bits = (uInt)memLevel + 7; 
+    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);
@@ -350,31 +350,31 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
     return deflateReset(strm);
 }
 
-/* ========================================================================= 
- * Check for a valid deflate stream state. Return 0 if ok, 1 if not. 
- */ 
-local int deflateStateCheck (strm) 
-    z_streamp strm; 
-{ 
-    deflate_state *s; 
-    if (strm == Z_NULL || 
-        strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0) 
-        return 1; 
-    s = strm->state; 
-    if (s == Z_NULL || s->strm != strm || (s->status != INIT_STATE && 
-#ifdef GZIP 
-                                           s->status != GZIP_STATE && 
-#endif 
-                                           s->status != EXTRA_STATE && 
-                                           s->status != NAME_STATE && 
-                                           s->status != COMMENT_STATE && 
-                                           s->status != HCRC_STATE && 
-                                           s->status != BUSY_STATE && 
-                                           s->status != FINISH_STATE)) 
-        return 1; 
-    return 0; 
-} 
- 
+/* =========================================================================
+ * Check for a valid deflate stream state. Return 0 if ok, 1 if not.
+ */
+local int deflateStateCheck (strm)
+    z_streamp strm;
+{
+    deflate_state *s;
+    if (strm == Z_NULL ||
+        strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0)
+        return 1;
+    s = strm->state;
+    if (s == Z_NULL || s->strm != strm || (s->status != INIT_STATE &&
+#ifdef GZIP
+                                           s->status != GZIP_STATE &&
+#endif
+                                           s->status != EXTRA_STATE &&
+                                           s->status != NAME_STATE &&
+                                           s->status != COMMENT_STATE &&
+                                           s->status != HCRC_STATE &&
+                                           s->status != BUSY_STATE &&
+                                           s->status != FINISH_STATE))
+        return 1;
+    return 0;
+}
+
 /* ========================================================================= */
 int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
     z_streamp strm;
@@ -387,7 +387,7 @@ int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
     unsigned avail;
     z_const unsigned char *next;
 
-    if (deflateStateCheck(strm) || dictionary == Z_NULL) 
+    if (deflateStateCheck(strm) || dictionary == Z_NULL)
         return Z_STREAM_ERROR;
     s = strm->state;
     wrap = s->wrap;
@@ -445,34 +445,34 @@ int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
 }
 
 /* ========================================================================= */
-int ZEXPORT deflateGetDictionary (strm, dictionary, dictLength) 
-    z_streamp strm; 
-    Bytef *dictionary; 
-    uInt  *dictLength; 
-{ 
-    deflate_state *s; 
-    uInt len; 
- 
-    if (deflateStateCheck(strm)) 
-        return Z_STREAM_ERROR; 
-    s = strm->state; 
-    len = s->strstart + s->lookahead; 
-    if (len > s->w_size) 
-        len = s->w_size; 
-    if (dictionary != Z_NULL && len) 
-        zmemcpy(dictionary, s->window + s->strstart + s->lookahead - len, len); 
-    if (dictLength != Z_NULL) 
-        *dictLength = len; 
-    return Z_OK; 
-} 
- 
-/* ========================================================================= */ 
+int ZEXPORT deflateGetDictionary (strm, dictionary, dictLength)
+    z_streamp strm;
+    Bytef *dictionary;
+    uInt  *dictLength;
+{
+    deflate_state *s;
+    uInt len;
+
+    if (deflateStateCheck(strm))
+        return Z_STREAM_ERROR;
+    s = strm->state;
+    len = s->strstart + s->lookahead;
+    if (len > s->w_size)
+        len = s->w_size;
+    if (dictionary != Z_NULL && len)
+        zmemcpy(dictionary, s->window + s->strstart + s->lookahead - len, len);
+    if (dictLength != Z_NULL)
+        *dictLength = len;
+    return Z_OK;
+}
+
+/* ========================================================================= */
 int ZEXPORT deflateResetKeep (strm)
     z_streamp strm;
 {
     deflate_state *s;
 
-    if (deflateStateCheck(strm)) { 
+    if (deflateStateCheck(strm)) {
         return Z_STREAM_ERROR;
     }
 
@@ -487,11 +487,11 @@ int ZEXPORT deflateResetKeep (strm)
     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; 
+    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) :
@@ -521,8 +521,8 @@ int ZEXPORT deflateSetHeader (strm, head)
     z_streamp strm;
     gz_headerp head;
 {
-    if (deflateStateCheck(strm) || strm->state->wrap != 2) 
-        return Z_STREAM_ERROR; 
+    if (deflateStateCheck(strm) || strm->state->wrap != 2)
+        return Z_STREAM_ERROR;
     strm->state->gzhead = head;
     return Z_OK;
 }
@@ -533,7 +533,7 @@ int ZEXPORT deflatePending (strm, pending, bits)
     int *bits;
     z_streamp strm;
 {
-    if (deflateStateCheck(strm)) return Z_STREAM_ERROR; 
+    if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
     if (pending != Z_NULL)
         *pending = strm->state->pending;
     if (bits != Z_NULL)
@@ -550,7 +550,7 @@ int ZEXPORT deflatePrime (strm, bits, value)
     deflate_state *s;
     int put;
 
-    if (deflateStateCheck(strm)) return Z_STREAM_ERROR; 
+    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;
@@ -576,7 +576,7 @@ int ZEXPORT deflateParams(strm, level, strategy)
     deflate_state *s;
     compress_func func;
 
-    if (deflateStateCheck(strm)) return Z_STREAM_ERROR; 
+    if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
     s = strm->state;
 
 #ifdef FASTEST
@@ -590,22 +590,22 @@ int ZEXPORT deflateParams(strm, level, strategy)
     func = configuration_table[s->level].func;
 
     if ((strategy != s->strategy || func != configuration_table[level].func) &&
-        s->high_water) { 
+        s->high_water) {
         /* 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; 
+        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 == 0 && s->matches != 0) { 
-            if (s->matches == 1) 
-                slide_hash(s); 
-            else 
-                CLEAR_HASH(s); 
-            s->matches = 0; 
-        } 
+        if (s->level == 0 && s->matches != 0) {
+            if (s->matches == 1)
+                slide_hash(s);
+            else
+                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;
@@ -613,7 +613,7 @@ int ZEXPORT deflateParams(strm, level, strategy)
         s->max_chain_length = configuration_table[level].max_chain;
     }
     s->strategy = strategy;
-    return Z_OK; 
+    return Z_OK;
 }
 
 /* ========================================================================= */
@@ -626,12 +626,12 @@ int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain)
 {
     deflate_state *s;
 
-    if (deflateStateCheck(strm)) return Z_STREAM_ERROR; 
+    if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
     s = strm->state;
-    s->good_match = (uInt)good_length; 
-    s->max_lazy_match = (uInt)max_lazy; 
+    s->good_match = (uInt)good_length;
+    s->max_lazy_match = (uInt)max_lazy;
     s->nice_match = nice_length;
-    s->max_chain_length = (uInt)max_chain; 
+    s->max_chain_length = (uInt)max_chain;
     return Z_OK;
 }
 
@@ -664,7 +664,7 @@ uLong ZEXPORT deflateBound(strm, sourceLen)
               ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 5;
 
     /* if can't get parameters, return conservative bound plus zlib wrapper */
-    if (deflateStateCheck(strm)) 
+    if (deflateStateCheck(strm))
         return complen + 6;
 
     /* compute wrapper length */
@@ -676,11 +676,11 @@ uLong ZEXPORT deflateBound(strm, sourceLen)
     case 1:                                 /* zlib wrapper */
         wraplen = 6 + (s->strstart ? 4 : 0);
         break;
-#ifdef GZIP 
+#ifdef GZIP
     case 2:                                 /* gzip wrapper */
         wraplen = 18;
         if (s->gzhead != Z_NULL) {          /* user-supplied gzip header */
-            Bytef *str; 
+            Bytef *str;
             if (s->gzhead->extra != Z_NULL)
                 wraplen += 2 + s->gzhead->extra_len;
             str = s->gzhead->name;
@@ -697,7 +697,7 @@ uLong ZEXPORT deflateBound(strm, sourceLen)
                 wraplen += 2;
         }
         break;
-#endif 
+#endif
     default:                                /* for compiler happiness */
         wraplen = 6;
     }
@@ -725,10 +725,10 @@ local void putShortMSB (s, b)
 }
 
 /* =========================================================================
- * 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()). 
+ * 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;
@@ -745,23 +745,23 @@ local void flush_pending(strm)
     strm->next_out  += len;
     s->pending_out  += len;
     strm->total_out += len;
-    strm->avail_out -= len; 
-    s->pending      -= len; 
+    strm->avail_out -= len;
+    s->pending      -= len;
     if (s->pending == 0) {
         s->pending_out = s->pending_buf;
     }
 }
 
-/* =========================================================================== 
- * Update the header CRC with the bytes s->pending_buf[beg..s->pending - 1]. 
- */ 
-#define HCRC_UPDATE(beg) \ 
-    do { \ 
-        if (s->gzhead->hcrc && s->pending > (beg)) \ 
-            strm->adler = crc32(strm->adler, s->pending_buf + (beg), \ 
-                                s->pending - (beg)); \ 
-    } while (0) 
- 
+/* ===========================================================================
+ * Update the header CRC with the bytes s->pending_buf[beg..s->pending - 1].
+ */
+#define HCRC_UPDATE(beg) \
+    do { \
+        if (s->gzhead->hcrc && s->pending > (beg)) \
+            strm->adler = crc32(strm->adler, s->pending_buf + (beg), \
+                                s->pending - (beg)); \
+    } while (0)
+
 /* ========================================================================= */
 int ZEXPORT deflate (strm, flush)
     z_streamp strm;
@@ -770,13 +770,13 @@ int ZEXPORT deflate (strm, flush)
     int old_flush; /* value of flush param for previous deflate call */
     deflate_state *s;
 
-    if (deflateStateCheck(strm) || flush > Z_BLOCK || flush < 0) { 
+    if (deflateStateCheck(strm) || flush > Z_BLOCK || flush < 0) {
         return Z_STREAM_ERROR;
     }
     s = strm->state;
 
     if (strm->next_out == Z_NULL ||
-        (strm->avail_in != 0 && strm->next_in == Z_NULL) || 
+        (strm->avail_in != 0 && strm->next_in == Z_NULL) ||
         (s->status == FINISH_STATE && flush != Z_FINISH)) {
         ERR_RETURN(strm, Z_STREAM_ERROR);
     }
@@ -785,214 +785,214 @@ int ZEXPORT deflate (strm, flush)
     old_flush = s->last_flush;
     s->last_flush = flush;
 
-    /* Flush as much pending output as possible */ 
-    if (s->pending != 0) { 
-        flush_pending(strm); 
-        if (strm->avail_out == 0) { 
-            /* Since avail_out is 0, deflate will be called again with 
-             * more output space, but possibly with both pending and 
-             * avail_in equal to zero. There won't be anything to do, 
-             * but this is not an error situation so make sure we 
-             * return OK instead of BUF_ERROR at next call of deflate: 
-             */ 
-            s->last_flush = -1; 
-            return Z_OK; 
-        } 
- 
-    /* Make sure there is something to do and avoid duplicate consecutive 
-     * flushes. For repeated and useless calls with Z_FINISH, we keep 
-     * returning Z_STREAM_END instead of Z_BUF_ERROR. 
-     */ 
-    } else if (strm->avail_in == 0 && RANK(flush) <= RANK(old_flush) && 
-               flush != Z_FINISH) { 
-        ERR_RETURN(strm, Z_BUF_ERROR); 
-    } 
- 
-    /* User must not provide more input after the first FINISH: */ 
-    if (s->status == FINISH_STATE && strm->avail_in != 0) { 
-        ERR_RETURN(strm, Z_BUF_ERROR); 
-    } 
- 
+    /* Flush as much pending output as possible */
+    if (s->pending != 0) {
+        flush_pending(strm);
+        if (strm->avail_out == 0) {
+            /* Since avail_out is 0, deflate will be called again with
+             * more output space, but possibly with both pending and
+             * avail_in equal to zero. There won't be anything to do,
+             * but this is not an error situation so make sure we
+             * return OK instead of BUF_ERROR at next call of deflate:
+             */
+            s->last_flush = -1;
+            return Z_OK;
+        }
+
+    /* Make sure there is something to do and avoid duplicate consecutive
+     * flushes. For repeated and useless calls with Z_FINISH, we keep
+     * returning Z_STREAM_END instead of Z_BUF_ERROR.
+     */
+    } else if (strm->avail_in == 0 && RANK(flush) <= RANK(old_flush) &&
+               flush != Z_FINISH) {
+        ERR_RETURN(strm, Z_BUF_ERROR);
+    }
+
+    /* User must not provide more input after the first FINISH: */
+    if (s->status == FINISH_STATE && strm->avail_in != 0) {
+        ERR_RETURN(strm, Z_BUF_ERROR);
+    }
+
     /* Write the header */
     if (s->status == INIT_STATE) {
-        /* zlib header */ 
-        uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8; 
-        uInt level_flags; 
- 
-        if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2) 
-            level_flags = 0; 
-        else if (s->level < 6) 
-            level_flags = 1; 
-        else if (s->level == 6) 
-            level_flags = 2; 
+        /* zlib header */
+        uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8;
+        uInt level_flags;
+
+        if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2)
+            level_flags = 0;
+        else if (s->level < 6)
+            level_flags = 1;
+        else if (s->level == 6)
+            level_flags = 2;
         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)); 
-            putShortMSB(s, (uInt)(strm->adler & 0xffff)); 
-        } 
-        strm->adler = adler32(0L, Z_NULL, 0); 
-        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; 
-        } 
-    } 
-#ifdef GZIP 
-    if (s->status == GZIP_STATE) { 
-        /* gzip header */ 
-        strm->adler = crc32(0L, Z_NULL, 0); 
-        put_byte(s, 31); 
-        put_byte(s, 139); 
-        put_byte(s, 8); 
-        if (s->gzhead == Z_NULL) { 
-            put_byte(s, 0); 
-            put_byte(s, 0); 
-            put_byte(s, 0); 
-            put_byte(s, 0); 
-            put_byte(s, 0); 
-            put_byte(s, s->level == 9 ? 2 : 
-                     (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ? 
-                      4 : 0)); 
-            put_byte(s, OS_CODE); 
+            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));
+            putShortMSB(s, (uInt)(strm->adler & 0xffff));
+        }
+        strm->adler = adler32(0L, Z_NULL, 0);
+        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;
+        }
+    }
+#ifdef GZIP
+    if (s->status == GZIP_STATE) {
+        /* gzip header */
+        strm->adler = crc32(0L, Z_NULL, 0);
+        put_byte(s, 31);
+        put_byte(s, 139);
+        put_byte(s, 8);
+        if (s->gzhead == Z_NULL) {
+            put_byte(s, 0);
+            put_byte(s, 0);
+            put_byte(s, 0);
+            put_byte(s, 0);
+            put_byte(s, 0);
+            put_byte(s, s->level == 9 ? 2 :
+                     (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
+                      4 : 0));
+            put_byte(s, OS_CODE);
             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; 
+            /* 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) +
+                     (s->gzhead->extra == Z_NULL ? 0 : 4) +
+                     (s->gzhead->name == Z_NULL ? 0 : 8) +
+                     (s->gzhead->comment == Z_NULL ? 0 : 16)
+                     );
+            put_byte(s, (Byte)(s->gzhead->time & 0xff));
+            put_byte(s, (Byte)((s->gzhead->time >> 8) & 0xff));
+            put_byte(s, (Byte)((s->gzhead->time >> 16) & 0xff));
+            put_byte(s, (Byte)((s->gzhead->time >> 24) & 0xff));
+            put_byte(s, s->level == 9 ? 2 :
+                     (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
+                      4 : 0));
+            put_byte(s, s->gzhead->os & 0xff);
+            if (s->gzhead->extra != Z_NULL) {
+                put_byte(s, s->gzhead->extra_len & 0xff);
+                put_byte(s, (s->gzhead->extra_len >> 8) & 0xff);
             }
+            if (s->gzhead->hcrc)
+                strm->adler = crc32(strm->adler, s->pending_buf,
+                                    s->pending);
+            s->gzindex = 0;
+            s->status = EXTRA_STATE;
         }
-        else { 
-            put_byte(s, (s->gzhead->text ? 1 : 0) + 
-                     (s->gzhead->hcrc ? 2 : 0) + 
-                     (s->gzhead->extra == Z_NULL ? 0 : 4) + 
-                     (s->gzhead->name == Z_NULL ? 0 : 8) + 
-                     (s->gzhead->comment == Z_NULL ? 0 : 16) 
-                     ); 
-            put_byte(s, (Byte)(s->gzhead->time & 0xff)); 
-            put_byte(s, (Byte)((s->gzhead->time >> 8) & 0xff)); 
-            put_byte(s, (Byte)((s->gzhead->time >> 16) & 0xff)); 
-            put_byte(s, (Byte)((s->gzhead->time >> 24) & 0xff)); 
-            put_byte(s, s->level == 9 ? 2 : 
-                     (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ? 
-                      4 : 0)); 
-            put_byte(s, s->gzhead->os & 0xff); 
-            if (s->gzhead->extra != Z_NULL) { 
-                put_byte(s, s->gzhead->extra_len & 0xff); 
-                put_byte(s, (s->gzhead->extra_len >> 8) & 0xff); 
-            } 
-            if (s->gzhead->hcrc) 
-                strm->adler = crc32(strm->adler, s->pending_buf, 
-                                    s->pending); 
-            s->gzindex = 0; 
-            s->status = EXTRA_STATE; 
-        } 
     }
     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) { 
-                uInt copy = s->pending_buf_size - s->pending; 
-                zmemcpy(s->pending_buf + s->pending, 
-                        s->gzhead->extra + s->gzindex, copy); 
-                s->pending = s->pending_buf_size; 
-                HCRC_UPDATE(beg); 
-                s->gzindex += copy; 
-                flush_pending(strm); 
-                if (s->pending != 0) { 
-                    s->last_flush = -1; 
-                    return Z_OK; 
+            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) {
+                uInt copy = s->pending_buf_size - s->pending;
+                zmemcpy(s->pending_buf + s->pending,
+                        s->gzhead->extra + s->gzindex, copy);
+                s->pending = s->pending_buf_size;
+                HCRC_UPDATE(beg);
+                s->gzindex += copy;
+                flush_pending(strm);
+                if (s->pending != 0) {
+                    s->last_flush = -1;
+                    return Z_OK;
                 }
-                beg = 0; 
-                left -= copy; 
+                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; 
+            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; 
+        s->status = NAME_STATE;
     }
     if (s->status == NAME_STATE) {
         if (s->gzhead->name != Z_NULL) {
-            ulg beg = s->pending;   /* start of bytes to update crc */ 
+            ulg beg = s->pending;   /* start of bytes to update crc */
             int val;
             do {
                 if (s->pending == s->pending_buf_size) {
-                    HCRC_UPDATE(beg); 
+                    HCRC_UPDATE(beg);
                     flush_pending(strm);
-                    if (s->pending != 0) { 
-                        s->last_flush = -1; 
-                        return Z_OK; 
+                    if (s->pending != 0) {
+                        s->last_flush = -1;
+                        return Z_OK;
                     }
-                    beg = 0; 
+                    beg = 0;
                 }
                 val = s->gzhead->name[s->gzindex++];
                 put_byte(s, val);
             } while (val != 0);
-            HCRC_UPDATE(beg); 
-            s->gzindex = 0; 
+            HCRC_UPDATE(beg);
+            s->gzindex = 0;
         }
-        s->status = COMMENT_STATE; 
+        s->status = COMMENT_STATE;
     }
     if (s->status == COMMENT_STATE) {
         if (s->gzhead->comment != Z_NULL) {
-            ulg beg = s->pending;   /* start of bytes to update crc */ 
+            ulg beg = s->pending;   /* start of bytes to update crc */
             int val;
             do {
                 if (s->pending == s->pending_buf_size) {
-                    HCRC_UPDATE(beg); 
+                    HCRC_UPDATE(beg);
                     flush_pending(strm);
-                    if (s->pending != 0) { 
-                        s->last_flush = -1; 
-                        return Z_OK; 
+                    if (s->pending != 0) {
+                        s->last_flush = -1;
+                        return Z_OK;
                     }
-                    beg = 0; 
+                    beg = 0;
                 }
                 val = s->gzhead->comment[s->gzindex++];
                 put_byte(s, val);
             } while (val != 0);
-            HCRC_UPDATE(beg); 
+            HCRC_UPDATE(beg);
         }
-        s->status = HCRC_STATE; 
+        s->status = HCRC_STATE;
     }
     if (s->status == HCRC_STATE) {
         if (s->gzhead->hcrc) {
-            if (s->pending + 2 > s->pending_buf_size) { 
+            if (s->pending + 2 > s->pending_buf_size) {
                 flush_pending(strm);
-                if (s->pending != 0) { 
-                    s->last_flush = -1; 
-                    return Z_OK; 
-                } 
+                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); 
+            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; 
+        s->status = BUSY_STATE;
 
-        /* Compression must start with an empty pending buffer */ 
+        /* Compression must start with an empty pending buffer */
         flush_pending(strm);
-        if (s->pending != 0) { 
+        if (s->pending != 0) {
             s->last_flush = -1;
             return Z_OK;
         }
     }
-#endif 
+#endif
 
     /* Start a new block or continue the current one.
      */
@@ -1000,10 +1000,10 @@ int ZEXPORT deflate (strm, flush)
         (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); 
+        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;
@@ -1081,7 +1081,7 @@ int ZEXPORT deflateEnd (strm)
 {
     int status;
 
-    if (deflateStateCheck(strm)) return Z_STREAM_ERROR; 
+    if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
 
     status = strm->state->status;
 
@@ -1114,7 +1114,7 @@ int ZEXPORT deflateCopy (dest, source)
     ushf *overlay;
 
 
-    if (deflateStateCheck(source) || dest == Z_NULL) { 
+    if (deflateStateCheck(source) || dest == Z_NULL) {
         return Z_STREAM_ERROR;
     }
 
@@ -1164,7 +1164,7 @@ int ZEXPORT deflateCopy (dest, source)
  * allocating a large strm->next_in buffer and copying from it.
  * (See also flush_pending()).
  */
-local unsigned read_buf(strm, buf, size) 
+local unsigned read_buf(strm, buf, size)
     z_streamp strm;
     Bytef *buf;
     unsigned size;
@@ -1188,7 +1188,7 @@ local unsigned read_buf(strm, buf, size)
     strm->next_in  += len;
     strm->total_in += len;
 
-    return len; 
+    return len;
 }
 
 /* ===========================================================================
@@ -1241,10 +1241,10 @@ Y_NO_SANITIZE("undefined") local uInt longest_match(s, cur_match)
     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 */ 
+    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;
@@ -1258,13 +1258,13 @@ Y_NO_SANITIZE("undefined") local uInt longest_match(s, cur_match)
     /* 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); 
+    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
-    register Bytef *strend = s->window + s->strstart + MAX_MATCH; 
-    register Byte scan_end1  = scan[best_len-1]; 
-    register Byte scan_end   = scan[best_len]; 
+    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.
@@ -1279,7 +1279,7 @@ Y_NO_SANITIZE("undefined") local uInt longest_match(s, cur_match)
     /* 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; 
+    if ((uInt)nice_match > s->lookahead) nice_match = (int)s->lookahead;
 
     Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
 
@@ -1389,10 +1389,10 @@ 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; 
+    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.
@@ -1440,11 +1440,11 @@ local uInt longest_match(s, cur_match)
 
 #endif /* FASTEST */
 
-#ifdef ZLIB_DEBUG 
- 
-#define EQUAL 0 
-/* result of memcmp for equal strings */ 
- 
+#ifdef ZLIB_DEBUG
+
+#define EQUAL 0
+/* result of memcmp for equal strings */
+
 /* ===========================================================================
  * Check that the match at match_start is indeed a match.
  */
@@ -1470,7 +1470,7 @@ local void check_match(s, start, match, length)
 }
 #else
 #  define check_match(s, start, match, length)
-#endif /* ZLIB_DEBUG */ 
+#endif /* ZLIB_DEBUG */
 
 /* ===========================================================================
  * Fill the window when the lookahead becomes insufficient.
@@ -1485,7 +1485,7 @@ local void check_match(s, start, match, length)
 local void fill_window(s)
     deflate_state *s;
 {
-    unsigned n; 
+    unsigned n;
     unsigned more;    /* Amount of free space at the end of the window. */
     uInt wsize = s->w_size;
 
@@ -1512,11 +1512,11 @@ local void fill_window(s)
          */
         if (s->strstart >= wsize+MAX_DIST(s)) {
 
-            zmemcpy(s->window, s->window+wsize, (unsigned)wsize - more); 
+            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;
-            slide_hash(s); 
+            slide_hash(s);
             more += wsize;
         }
         if (s->strm->avail_in == 0) break;
@@ -1622,199 +1622,199 @@ local void fill_window(s)
    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)) 
- 
+/* 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.
- * 
- * 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 
- * of hash table slides to perform. If s->matches is 1, then one hash table 
- * slide will be done when switching. If s->matches is 2, the maximum value 
- * allowed here, then the hash table will be cleared, since two or more slides 
- * is the same as a clear. 
- * 
- * 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. 
+ *
+ * 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
+ * of hash table slides to perform. If s->matches is 1, then one hash table
+ * slide will be done when switching. If s->matches is 2, the maximum value
+ * allowed here, then the hash table will be cleared, since two or more slides
+ * is the same as a clear.
+ *
+ * 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;
 {
-    /* 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. 
+    /* 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.
      */
-    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. 
-     */ 
-    unsigned len, left, have, last = 0; 
-    unsigned used = s->strm->avail_in; 
-    do { 
-        /* Set len to the maximum size block that we can copy directly with the 
-         * available input data and output space. Set left to how much of that 
-         * would be copied from what's left in the window. 
-         */ 
-        len = MAX_STORED;       /* maximum deflate stored block length */ 
-        have = (s->bi_valid + 42) >> 3;         /* number of header bytes */ 
-        if (s->strm->avail_out < have)          /* need room for header */ 
-            break; 
-            /* maximum stored block length that will fit in avail_out: */ 
-        have = s->strm->avail_out - have; 
-        left = s->strstart - s->block_start;    /* bytes left in window */ 
-        if (len > (ulg)left + s->strm->avail_in) 
-            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 
-         * write an empty block when flushing -- deflate() does that. 
-         */ 
-        if (len < min_block && ((len == 0 && flush != Z_FINISH) || 
-                                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) 
-                left = len; 
-            zmemcpy(s->strm->next_out, s->window + s->block_start, left); 
-            s->strm->next_out += left; 
-            s->strm->avail_out -= left; 
-            s->strm->total_out += left; 
-            s->block_start += left; 
-            len -= left; 
+    unsigned len, left, have, last = 0;
+    unsigned used = s->strm->avail_in;
+    do {
+        /* Set len to the maximum size block that we can copy directly with the
+         * available input data and output space. Set left to how much of that
+         * would be copied from what's left in the window.
+         */
+        len = MAX_STORED;       /* maximum deflate stored block length */
+        have = (s->bi_valid + 42) >> 3;         /* number of header bytes */
+        if (s->strm->avail_out < have)          /* need room for header */
+            break;
+            /* maximum stored block length that will fit in avail_out: */
+        have = s->strm->avail_out - have;
+        left = s->strstart - s->block_start;    /* bytes left in window */
+        if (len > (ulg)left + s->strm->avail_in)
+            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
+         * write an empty block when flushing -- deflate() does that.
+         */
+        if (len < min_block && ((len == 0 && flush != Z_FINISH) ||
+                                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)
+                left = len;
+            zmemcpy(s->strm->next_out, s->window + s->block_start, left);
+            s->strm->next_out += left;
+            s->strm->avail_out -= left;
+            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. 
+
+        /* 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; 
+        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 
-     * data, or append all of the copied data to the existing window if less 
-     * than s->w_size bytes were copied. Also update the number of bytes to 
-     * insert in the hash tables, in the event that deflateParams() switches to 
-     * a non-zero compression level. 
-     */ 
-    used -= s->strm->avail_in;      /* number of input bytes directly copied */ 
-    if (used) { 
-        /* If any input was used, then no unused input remains in the window, 
-         * therefore s->block_start == s->strstart. 
-         */ 
-        if (used >= s->w_size) {    /* supplant the previous history */ 
-            s->matches = 2;         /* clear hash */ 
-            zmemcpy(s->window, s->strm->next_in - s->w_size, s->w_size); 
-            s->strstart = s->w_size; 
-        } 
-        else { 
-            if (s->window_size - s->strstart <= used) { 
-                /* Slide the window down. */ 
-                s->strstart -= s->w_size; 
-                zmemcpy(s->window, s->window + s->w_size, s->strstart); 
-                if (s->matches < 2) 
-                    s->matches++;   /* add a pending slide_hash() */ 
-            } 
-            zmemcpy(s->window + s->strstart, s->strm->next_in - used, used); 
-            s->strstart += used; 
-        } 
-        s->block_start = s->strstart; 
-        s->insert += MIN(used, s->w_size - s->insert); 
+    } while (last == 0);
+
+    /* Update the sliding window with the last s->w_size bytes of the copied
+     * data, or append all of the copied data to the existing window if less
+     * than s->w_size bytes were copied. Also update the number of bytes to
+     * insert in the hash tables, in the event that deflateParams() switches to
+     * a non-zero compression level.
+     */
+    used -= s->strm->avail_in;      /* number of input bytes directly copied */
+    if (used) {
+        /* If any input was used, then no unused input remains in the window,
+         * therefore s->block_start == s->strstart.
+         */
+        if (used >= s->w_size) {    /* supplant the previous history */
+            s->matches = 2;         /* clear hash */
+            zmemcpy(s->window, s->strm->next_in - s->w_size, s->w_size);
+            s->strstart = s->w_size;
+        }
+        else {
+            if (s->window_size - s->strstart <= used) {
+                /* Slide the window down. */
+                s->strstart -= s->w_size;
+                zmemcpy(s->window, s->window + s->w_size, s->strstart);
+                if (s->matches < 2)
+                    s->matches++;   /* add a pending slide_hash() */
+            }
+            zmemcpy(s->window + s->strstart, s->strm->next_in - used, used);
+            s->strstart += used;
+        }
+        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) 
+    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;
- 
-    /* If flushing and all input has been consumed, then done. */ 
-    if (flush != Z_NO_FLUSH && flush != Z_FINISH && 
-        s->strm->avail_in == 0 && (long)s->strstart == s->block_start) 
-        return block_done; 
- 
-    /* Fill the window with any remaining input. */ 
-    have = s->window_size - s->strstart - 1; 
-    if (s->strm->avail_in > have && s->block_start >= (long)s->w_size) { 
-        /* Slide the window down. */ 
-        s->block_start -= s->w_size; 
-        s->strstart -= s->w_size; 
-        zmemcpy(s->window, s->window + s->w_size, s->strstart); 
-        if (s->matches < 2) 
-            s->matches++;           /* add a pending slide_hash() */ 
-        have += s->w_size;          /* more space now */ 
+
+    /* If flushing and all input has been consumed, then done. */
+    if (flush != Z_NO_FLUSH && flush != Z_FINISH &&
+        s->strm->avail_in == 0 && (long)s->strstart == s->block_start)
+        return block_done;
+
+    /* Fill the window with any remaining input. */
+    have = s->window_size - s->strstart - 1;
+    if (s->strm->avail_in > have && s->block_start >= (long)s->w_size) {
+        /* Slide the window down. */
+        s->block_start -= s->w_size;
+        s->strstart -= s->w_size;
+        zmemcpy(s->window, s->window + s->w_size, s->strstart);
+        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) {
+        read_buf(s->strm, s->window + s->strstart, have);
+        s->strstart += have;
+    }
+    if (s->high_water < s->strstart)
+        s->high_water = s->strstart;
+
+    /* There was not enough avail_out to write a complete worthy or flushed
+     * stored block to next_out. Write a stored block to pending instead, if we
+     * have enough input for a worthy block, or if flushing and there is enough
+     * room for the remaining input as a stored block in the pending buffer.
+     */
+    have = (s->bi_valid + 42) >> 3;         /* number of header bytes */
+        /* maximum stored block length that will fit in pending: */
+    have = MIN(s->pending_buf_size - have, MAX_STORED);
+    min_block = MIN(have, s->w_size);
+    left = s->strstart - s->block_start;
+    if (left >= min_block ||
+        ((left || flush == Z_FINISH) && flush != Z_NO_FLUSH &&
+         s->strm->avail_in == 0 && left <= have)) {
+        len = MIN(left, have);
+        last = flush == Z_FINISH && s->strm->avail_in == 0 &&
+               len == left ? 1 : 0;
+        _tr_stored_block(s, (charf *)s->window + s->block_start, len, last);
+        s->block_start += len;
+        flush_pending(s->strm);
     }
-    if (have > s->strm->avail_in) 
-        have = s->strm->avail_in; 
-    if (have) { 
-        read_buf(s->strm, s->window + s->strstart, have); 
-        s->strstart += have; 
-    } 
-    if (s->high_water < s->strstart) 
-        s->high_water = s->strstart; 
- 
-    /* There was not enough avail_out to write a complete worthy or flushed 
-     * stored block to next_out. Write a stored block to pending instead, if we 
-     * have enough input for a worthy block, or if flushing and there is enough 
-     * room for the remaining input as a stored block in the pending buffer. 
-     */ 
-    have = (s->bi_valid + 42) >> 3;         /* number of header bytes */ 
-        /* maximum stored block length that will fit in pending: */ 
-    have = MIN(s->pending_buf_size - have, MAX_STORED); 
-    min_block = MIN(have, s->w_size); 
-    left = s->strstart - s->block_start; 
-    if (left >= min_block || 
-        ((left || flush == Z_FINISH) && flush != Z_NO_FLUSH && 
-         s->strm->avail_in == 0 && left <= have)) { 
-        len = MIN(left, have); 
-        last = flush == Z_FINISH && s->strm->avail_in == 0 && 
-               len == left ? 1 : 0; 
-        _tr_stored_block(s, (charf *)s->window + s->block_start, len, last); 
-        s->block_start += len; 
-        flush_pending(s->strm); 
-    } 
- 
-    /* We've done all we can with the available input and output. */ 
-    return last ? finish_started : need_more; 
+
+    /* We've done all we can with the available input and output. */
+    return last ? finish_started : need_more;
 }
 
 /* ===========================================================================
@@ -2091,7 +2091,7 @@ local block_state deflate_rle(s, flush)
                          prev == *++scan && prev == *++scan &&
                          prev == *++scan && prev == *++scan &&
                          scan < strend);
-                s->match_length = MAX_MATCH - (uInt)(strend - scan); 
+                s->match_length = MAX_MATCH - (uInt)(strend - scan);
                 if (s->match_length > s->lookahead)
                     s->match_length = s->lookahead;
             }