"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "zlib/zlib/deflate.c" between
muscle7.61.zip and muscle7.62.zip

About: MUSCLE (Multi User Server Client Linking Environment) is a messaging server and networking API. The included server program ("muscled") lets its clients message each other, and/or store information in its serverside hierarchical database.

deflate.c  (muscle7.61):deflate.c  (muscle7.62)
/* deflate.c -- compress data using the deflation algorithm /* deflate.c -- compress data using the deflation algorithm
* Copyright (C) 1995-2013 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 * For conditions of distribution and use, see copyright notice in zlib.h
*/ */
/* /*
* ALGORITHM * ALGORITHM
* *
* The "deflation" process depends on being able to identify portions * The "deflation" process depends on being able to identify portions
* of the input text which are identical to earlier input (within a * of the input text which are identical to earlier input (within a
* sliding window trailing behind the input currently being processed). * sliding window trailing behind the input currently being processed).
* *
skipping to change at line 55 skipping to change at line 55
* Fiala,E.R., and Greene,D.H. * Fiala,E.R., and Greene,D.H.
* Data Compression with Finite Windows, Comm.ACM, 32,4 (1989) 490-595 * Data Compression with Finite Windows, Comm.ACM, 32,4 (1989) 490-595
* *
*/ */
/* @(#) $Id$ */ /* @(#) $Id$ */
#include "deflate.h" #include "deflate.h"
const char deflate_copyright[] = const char deflate_copyright[] =
" deflate 1.2.8 Copyright 1995-2013 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 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 in the documentation of your product. If for some reason you cannot
include such an acknowledgment, I would appreciate that you keep this include such an acknowledgment, I would appreciate that you keep this
copyright string in the executable of your product. copyright string in the executable of your product.
*/ */
/* =========================================================================== /* ===========================================================================
* Function prototypes. * Function prototypes.
*/ */
typedef enum { typedef enum {
need_more, /* block not completed, need more input or more output */ need_more, /* block not completed, need more input or more output */
block_done, /* block flush performed */ block_done, /* block flush performed */
finish_started, /* finish started, need only more output at next deflate */ finish_started, /* finish started, need only more output at next deflate */
finish_done /* finish done, accept no more input or output */ finish_done /* finish done, accept no more input or output */
} block_state; } block_state;
typedef block_state (*compress_func) OF((deflate_state *s, int flush)); typedef block_state (*compress_func) OF((deflate_state *s, int flush));
/* Compression function. Returns the block state after the call. */ /* 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 void fill_window OF((deflate_state *s));
local block_state deflate_stored OF((deflate_state *s, int flush)); local block_state deflate_stored OF((deflate_state *s, int flush));
local block_state deflate_fast OF((deflate_state *s, int flush)); local block_state deflate_fast OF((deflate_state *s, int flush));
#ifndef FASTEST #ifndef FASTEST
local block_state deflate_slow OF((deflate_state *s, int flush)); local block_state deflate_slow OF((deflate_state *s, int flush));
#endif #endif
local block_state deflate_rle OF((deflate_state *s, int flush)); local block_state deflate_rle OF((deflate_state *s, int flush));
local block_state deflate_huff 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 lm_init OF((deflate_state *s));
local void putShortMSB OF((deflate_state *s, uInt b)); local void putShortMSB OF((deflate_state *s, uInt b));
local void flush_pending OF((z_streamp strm)); local void flush_pending OF((z_streamp strm));
local int read_buf OF((z_streamp strm, Bytef *buf, unsigned size)); 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 */ void match_init OF((void)); /* asm code initialization */
uInt longest_match OF((deflate_state *s, IPos cur_match)); uInt longest_match OF((deflate_state *s, IPos cur_match));
#else #else
local uInt longest_match OF((deflate_state *s, IPos cur_match)); local uInt longest_match OF((deflate_state *s, IPos cur_match));
#endif #endif
#ifdef DEBUG #ifdef ZLIB_DEBUG
local void check_match OF((deflate_state *s, IPos start, IPos match, local void check_match OF((deflate_state *s, IPos start, IPos match,
int length)); int length));
#endif #endif
/* =========================================================================== /* ===========================================================================
* Local data * Local data
*/ */
#define NIL 0 #define NIL 0
/* Tail of hash chains */ /* Tail of hash chains */
skipping to change at line 151 skipping to change at line 154
/* 7 */ {8, 32, 128, 256, deflate_slow}, /* 7 */ {8, 32, 128, 256, deflate_slow},
/* 8 */ {32, 128, 258, 1024, deflate_slow}, /* 8 */ {32, 128, 258, 1024, deflate_slow},
/* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* max compression */ /* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* max compression */
#endif #endif
/* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4 /* 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 * For deflate_fast() (levels <= 3) good is ignored and lazy has a different
* meaning. * meaning.
*/ */
#define EQUAL 0
/* result of memcmp for equal strings */
#ifndef NO_DUMMY_DECL
struct static_tree_desc_s {int dummy;}; /* for buggy compilers */
#endif
/* rank Z_BLOCK between Z_NO_FLUSH and Z_PARTIAL_FLUSH */ /* rank Z_BLOCK between Z_NO_FLUSH and Z_PARTIAL_FLUSH */
#define RANK(f) (((f) << 1) - ((f) > 4 ? 9 : 0)) #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 to UPDATE_HASH are made with consecutive * IN assertion: all calls to UPDATE_HASH are made with consecutive input
* input characters, so that a running hash key can be computed from the * characters, so that a running hash key can be computed from the previous
* previous key instead of complete recalculation each time. * key instead of complete recalculation each time.
*/ */
#define UPDATE_HASH(s,h,c) (h = (((h)<<s->hash_shift) ^ (c)) & s->hash_mask) #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 * 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 * of the hash chain (the most recent string with same hash key). Return
* the previous length of the hash chain. * the previous length of the hash chain.
* If this file is compiled with -DFASTEST, the compression level is forced * If this file is compiled with -DFASTEST, the compression level is forced
* to 1, and no hash chains are maintained. * to 1, and no hash chains are maintained.
* IN assertion: all calls to to INSERT_STRING are made with consecutive * IN assertion: all calls to INSERT_STRING are made with consecutive input
* input characters and the first MIN_MATCH bytes of str are valid * characters and the first MIN_MATCH bytes of str are valid (except for
* (except for the last MIN_MATCH-1 bytes of the input file). * the last MIN_MATCH-1 bytes of the input file).
*/ */
#ifdef FASTEST #ifdef FASTEST
#define INSERT_STRING(s, str, match_head) \ #define INSERT_STRING(s, str, match_head) \
(UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \ (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
match_head = s->head[s->ins_h], \ match_head = s->head[s->ins_h], \
s->head[s->ins_h] = (Pos)(str)) s->head[s->ins_h] = (Pos)(str))
#else #else
#define INSERT_STRING(s, str, match_head) \ #define INSERT_STRING(s, str, match_head) \
(UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \ (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], \ match_head = s->prev[(str) & s->w_mask] = s->head[s->ins_h], \
skipping to change at line 199 skipping to change at line 195
#endif #endif
/* =========================================================================== /* ===========================================================================
* Initialize the hash table (avoiding 64K overflow for 16 bit systems). * Initialize the hash table (avoiding 64K overflow for 16 bit systems).
* prev[] will be initialized on the fly. * prev[] will be initialized on the fly.
*/ */
#define CLEAR_HASH(s) \ #define CLEAR_HASH(s) \
s->head[s->hash_size-1] = NIL; \ s->head[s->hash_size-1] = NIL; \
zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head)); 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
}
/* ========================================================================= */ /* ========================================================================= */
int ZEXPORT deflateInit_(strm, level, version, stream_size) int ZEXPORT deflateInit_(strm, level, version, stream_size)
z_streamp strm; z_streamp strm;
int level; int level;
const char *version; const char *version;
int stream_size; int stream_size;
{ {
return deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL, return deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL,
Z_DEFAULT_STRATEGY, version, stream_size); Z_DEFAULT_STRATEGY, version, stream_size);
/* To do: ignore strm->next_in if we use it as window */ /* To do: ignore strm->next_in if we use it as window */
skipping to change at line 272 skipping to change at line 299
windowBits = -windowBits; windowBits = -windowBits;
} }
#ifdef GZIP #ifdef GZIP
else if (windowBits > 15) { else if (windowBits > 15) {
wrap = 2; /* write gzip wrapper instead */ wrap = 2; /* write gzip wrapper instead */
windowBits -= 16; windowBits -= 16;
} }
#endif #endif
if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED || if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED ||
windowBits < 8 || windowBits > 15 || level < 0 || level > 9 || windowBits < 8 || windowBits > 15 || level < 0 || level > 9 ||
strategy < 0 || strategy > Z_FIXED) { strategy < 0 || strategy > Z_FIXED || (windowBits == 8 && wrap != 1)) {
return Z_STREAM_ERROR; return Z_STREAM_ERROR;
} }
if (windowBits == 8) windowBits = 9; /* until 256-byte window bug fixed */ if (windowBits == 8) windowBits = 9; /* until 256-byte window bug fixed */
s = (deflate_state *) ZALLOC(strm, 1, sizeof(deflate_state)); s = (deflate_state *) ZALLOC(strm, 1, sizeof(deflate_state));
if (s == Z_NULL) return Z_MEM_ERROR; if (s == Z_NULL) return Z_MEM_ERROR;
strm->state = (struct internal_state FAR *)s; strm->state = (struct internal_state FAR *)s;
s->strm = strm; s->strm = strm;
s->status = INIT_STATE; /* to pass state test in deflateReset() */
s->wrap = wrap; s->wrap = wrap;
s->gzhead = Z_NULL; s->gzhead = Z_NULL;
s->w_bits = windowBits; s->w_bits = (uInt)windowBits;
s->w_size = 1 << s->w_bits; s->w_size = 1 << s->w_bits;
s->w_mask = s->w_size - 1; s->w_mask = s->w_size - 1;
s->hash_bits = memLevel + 7; s->hash_bits = (uInt)memLevel + 7;
s->hash_size = 1 << s->hash_bits; s->hash_size = 1 << s->hash_bits;
s->hash_mask = s->hash_size - 1; s->hash_mask = s->hash_size - 1;
s->hash_shift = ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH); s->hash_shift = ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH);
s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte)); s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte));
s->prev = (Posf *) ZALLOC(strm, s->w_size, sizeof(Pos)); s->prev = (Posf *) ZALLOC(strm, s->w_size, sizeof(Pos));
s->head = (Posf *) ZALLOC(strm, s->hash_size, sizeof(Pos)); s->head = (Posf *) ZALLOC(strm, s->hash_size, sizeof(Pos));
s->high_water = 0; /* nothing written to s->window yet */ s->high_water = 0; /* nothing written to s->window yet */
skipping to change at line 321 skipping to change at line 349
s->d_buf = overlay + s->lit_bufsize/sizeof(ush); s->d_buf = overlay + s->lit_bufsize/sizeof(ush);
s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize; s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize;
s->level = level; s->level = level;
s->strategy = strategy; s->strategy = strategy;
s->method = (Byte)method; s->method = (Byte)method;
return deflateReset(strm); 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;
}
/* ========================================================================= */ /* ========================================================================= */
int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength) int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
z_streamp strm; z_streamp strm;
const Bytef *dictionary; const Bytef *dictionary;
uInt dictLength; uInt dictLength;
{ {
deflate_state *s; deflate_state *s;
uInt str, n; uInt str, n;
int wrap; int wrap;
unsigned avail; unsigned avail;
z_const unsigned char *next; z_const unsigned char *next;
if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL) if (deflateStateCheck(strm) || dictionary == Z_NULL)
return Z_STREAM_ERROR; return Z_STREAM_ERROR;
s = strm->state; s = strm->state;
wrap = s->wrap; wrap = s->wrap;
if (wrap == 2 || (wrap == 1 && s->status != INIT_STATE) || s->lookahead) if (wrap == 2 || (wrap == 1 && s->status != INIT_STATE) || s->lookahead)
return Z_STREAM_ERROR; return Z_STREAM_ERROR;
/* when using zlib wrappers, compute Adler-32 for provided dictionary */ /* when using zlib wrappers, compute Adler-32 for provided dictionary */
if (wrap == 1) if (wrap == 1)
strm->adler = adler32(strm->adler, dictionary, dictLength); strm->adler = adler32(strm->adler, dictionary, dictLength);
s->wrap = 0; /* avoid computing Adler-32 in read_buf */ s->wrap = 0; /* avoid computing Adler-32 in read_buf */
skipping to change at line 391 skipping to change at line 444
s->lookahead = 0; s->lookahead = 0;
s->match_length = s->prev_length = MIN_MATCH-1; s->match_length = s->prev_length = MIN_MATCH-1;
s->match_available = 0; s->match_available = 0;
strm->next_in = next; strm->next_in = next;
strm->avail_in = avail; strm->avail_in = avail;
s->wrap = wrap; s->wrap = wrap;
return Z_OK; 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) int ZEXPORT deflateResetKeep (strm)
z_streamp strm; z_streamp strm;
{ {
deflate_state *s; deflate_state *s;
if (strm == Z_NULL || strm->state == Z_NULL || if (deflateStateCheck(strm)) {
strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0) {
return Z_STREAM_ERROR; return Z_STREAM_ERROR;
} }
strm->total_in = strm->total_out = 0; strm->total_in = strm->total_out = 0;
strm->msg = Z_NULL; /* use zfree if we ever allocate msg dynamically */ strm->msg = Z_NULL; /* use zfree if we ever allocate msg dynamically */
strm->data_type = Z_UNKNOWN; strm->data_type = Z_UNKNOWN;
s = (deflate_state *)strm->state; s = (deflate_state *)strm->state;
s->pending = 0; s->pending = 0;
s->pending_out = s->pending_buf; s->pending_out = s->pending_buf;
if (s->wrap < 0) { if (s->wrap < 0) {
s->wrap = -s->wrap; /* was made negative by deflate(..., Z_FINISH); */ s->wrap = -s->wrap; /* was made negative by deflate(..., Z_FINISH); */
} }
s->status = s->wrap ? INIT_STATE : BUSY_STATE; s->status =
#ifdef GZIP
s->wrap == 2 ? GZIP_STATE :
#endif
s->wrap ? INIT_STATE : BUSY_STATE;
strm->adler = strm->adler =
#ifdef GZIP #ifdef GZIP
s->wrap == 2 ? crc32(0L, Z_NULL, 0) : s->wrap == 2 ? crc32(0L, Z_NULL, 0) :
#endif #endif
adler32(0L, Z_NULL, 0); adler32(0L, Z_NULL, 0);
s->last_flush = Z_NO_FLUSH; s->last_flush = Z_NO_FLUSH;
_tr_init(s); _tr_init(s);
return Z_OK; return Z_OK;
skipping to change at line 442 skipping to change at line 520
if (ret == Z_OK) if (ret == Z_OK)
lm_init(strm->state); lm_init(strm->state);
return ret; return ret;
} }
/* ========================================================================= */ /* ========================================================================= */
int ZEXPORT deflateSetHeader (strm, head) int ZEXPORT deflateSetHeader (strm, head)
z_streamp strm; z_streamp strm;
gz_headerp head; gz_headerp head;
{ {
if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; if (deflateStateCheck(strm) || strm->state->wrap != 2)
if (strm->state->wrap != 2) return Z_STREAM_ERROR; return Z_STREAM_ERROR;
strm->state->gzhead = head; strm->state->gzhead = head;
return Z_OK; return Z_OK;
} }
/* ========================================================================= */ /* ========================================================================= */
int ZEXPORT deflatePending (strm, pending, bits) int ZEXPORT deflatePending (strm, pending, bits)
unsigned *pending; unsigned *pending;
int *bits; int *bits;
z_streamp strm; z_streamp strm;
{ {
if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
if (pending != Z_NULL) if (pending != Z_NULL)
*pending = strm->state->pending; *pending = strm->state->pending;
if (bits != Z_NULL) if (bits != Z_NULL)
*bits = strm->state->bi_valid; *bits = strm->state->bi_valid;
return Z_OK; return Z_OK;
} }
/* ========================================================================= */ /* ========================================================================= */
int ZEXPORT deflatePrime (strm, bits, value) int ZEXPORT deflatePrime (strm, bits, value)
z_streamp strm; z_streamp strm;
int bits; int bits;
int value; int value;
{ {
deflate_state *s; deflate_state *s;
int put; int put;
if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
s = strm->state; s = strm->state;
if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3)) if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3))
return Z_BUF_ERROR; return Z_BUF_ERROR;
do { do {
put = Buf_size - s->bi_valid; put = Buf_size - s->bi_valid;
if (put > bits) if (put > bits)
put = bits; put = bits;
s->bi_buf |= (ush)((value & ((1 << put) - 1)) << s->bi_valid); s->bi_buf |= (ush)((value & ((1 << put) - 1)) << s->bi_valid);
s->bi_valid += put; s->bi_valid += put;
_tr_flush_bits(s); _tr_flush_bits(s);
skipping to change at line 496 skipping to change at line 574
} }
/* ========================================================================= */ /* ========================================================================= */
int ZEXPORT deflateParams(strm, level, strategy) int ZEXPORT deflateParams(strm, level, strategy)
z_streamp strm; z_streamp strm;
int level; int level;
int strategy; int strategy;
{ {
deflate_state *s; deflate_state *s;
compress_func func; compress_func func;
int err = Z_OK;
if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
s = strm->state; s = strm->state;
#ifdef FASTEST #ifdef FASTEST
if (level != 0) level = 1; if (level != 0) level = 1;
#else #else
if (level == Z_DEFAULT_COMPRESSION) level = 6; if (level == Z_DEFAULT_COMPRESSION) level = 6;
#endif #endif
if (level < 0 || level > 9 || strategy < 0 || strategy > Z_FIXED) { if (level < 0 || level > 9 || strategy < 0 || strategy > Z_FIXED) {
return Z_STREAM_ERROR; return Z_STREAM_ERROR;
} }
func = configuration_table[s->level].func; func = configuration_table[s->level].func;
if ((strategy != s->strategy || func != configuration_table[level].func) && if ((strategy != s->strategy || func != configuration_table[level].func) &&
strm->total_in != 0) { s->high_water) {
/* Flush the last buffer: */ /* Flush the last buffer: */
err = deflate(strm, Z_BLOCK); int err = deflate(strm, Z_BLOCK);
if (err == Z_BUF_ERROR && s->pending == 0) if (err == Z_STREAM_ERROR)
err = Z_OK; 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);
else
CLEAR_HASH(s);
s->matches = 0;
}
s->level = level; s->level = level;
s->max_lazy_match = configuration_table[level].max_lazy; s->max_lazy_match = configuration_table[level].max_lazy;
s->good_match = configuration_table[level].good_length; s->good_match = configuration_table[level].good_length;
s->nice_match = configuration_table[level].nice_length; s->nice_match = configuration_table[level].nice_length;
s->max_chain_length = configuration_table[level].max_chain; s->max_chain_length = configuration_table[level].max_chain;
} }
s->strategy = strategy; s->strategy = strategy;
return err; return Z_OK;
} }
/* ========================================================================= */ /* ========================================================================= */
int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain) int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain)
z_streamp strm; z_streamp strm;
int good_length; int good_length;
int max_lazy; int max_lazy;
int nice_length; int nice_length;
int max_chain; int max_chain;
{ {
deflate_state *s; deflate_state *s;
if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
s = strm->state; s = strm->state;
s->good_match = good_length; s->good_match = (uInt)good_length;
s->max_lazy_match = max_lazy; s->max_lazy_match = (uInt)max_lazy;
s->nice_match = nice_length; s->nice_match = nice_length;
s->max_chain_length = max_chain; s->max_chain_length = (uInt)max_chain;
return Z_OK; return Z_OK;
} }
/* ========================================================================= /* =========================================================================
* For the default windowBits of 15 and memLevel of 8, this function returns * 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. * 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 * 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 * changed, then this function needs to be changed as well. The return
* value for 15 and 8 only works for those exact settings. * value for 15 and 8 only works for those exact settings.
* *
skipping to change at line 571 skipping to change at line 657
* every combination of windowBits and memLevel. But even the conservative * every combination of windowBits and memLevel. But even the conservative
* upper bound of about 14% expansion does not seem onerous for output buffer * upper bound of about 14% expansion does not seem onerous for output buffer
* allocation. * allocation.
*/ */
uLong ZEXPORT deflateBound(strm, sourceLen) uLong ZEXPORT deflateBound(strm, sourceLen)
z_streamp strm; z_streamp strm;
uLong sourceLen; uLong sourceLen;
{ {
deflate_state *s; deflate_state *s;
uLong complen, wraplen; uLong complen, wraplen;
Bytef *str;
/* conservative upper bound for compressed data */ /* conservative upper bound for compressed data */
complen = sourceLen + complen = sourceLen +
((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 5; ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 5;
/* if can't get parameters, return conservative bound plus zlib wrapper */ /* if can't get parameters, return conservative bound plus zlib wrapper */
if (strm == Z_NULL || strm->state == Z_NULL) if (deflateStateCheck(strm))
return complen + 6; return complen + 6;
/* compute wrapper length */ /* compute wrapper length */
s = strm->state; s = strm->state;
switch (s->wrap) { switch (s->wrap) {
case 0: /* raw deflate */ case 0: /* raw deflate */
wraplen = 0; wraplen = 0;
break; break;
case 1: /* zlib wrapper */ case 1: /* zlib wrapper */
wraplen = 6 + (s->strstart ? 4 : 0); wraplen = 6 + (s->strstart ? 4 : 0);
break; break;
#ifdef GZIP
case 2: /* gzip wrapper */ case 2: /* gzip wrapper */
wraplen = 18; wraplen = 18;
if (s->gzhead != Z_NULL) { /* user-supplied gzip header */ if (s->gzhead != Z_NULL) { /* user-supplied gzip header */
Bytef *str;
if (s->gzhead->extra != Z_NULL) if (s->gzhead->extra != Z_NULL)
wraplen += 2 + s->gzhead->extra_len; wraplen += 2 + s->gzhead->extra_len;
str = s->gzhead->name; str = s->gzhead->name;
if (str != Z_NULL) if (str != Z_NULL)
do { do {
wraplen++; wraplen++;
} while (*str++); } while (*str++);
str = s->gzhead->comment; str = s->gzhead->comment;
if (str != Z_NULL) if (str != Z_NULL)
do { do {
wraplen++; wraplen++;
} while (*str++); } while (*str++);
if (s->gzhead->hcrc) if (s->gzhead->hcrc)
wraplen += 2; wraplen += 2;
} }
break; break;
#endif
default: /* for compiler happiness */ default: /* for compiler happiness */
wraplen = 6; wraplen = 6;
} }
/* if not default parameters, return conservative bound */ /* if not default parameters, return conservative bound */
if (s->w_bits != 15 || s->hash_bits != 8 + 7) if (s->w_bits != 15 || s->hash_bits != 8 + 7)
return complen + wraplen; return complen + wraplen;
/* default settings: return tight bound for that case */ /* default settings: return tight bound for that case */
return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
skipping to change at line 636 skipping to change at line 724
*/ */
local void putShortMSB (s, b) local void putShortMSB (s, b)
deflate_state *s; deflate_state *s;
uInt b; uInt b;
{ {
put_byte(s, (Byte)(b >> 8)); put_byte(s, (Byte)(b >> 8));
put_byte(s, (Byte)(b & 0xff)); put_byte(s, (Byte)(b & 0xff));
} }
/* ========================================================================= /* =========================================================================
* Flush as much pending output as possible. All deflate() output goes * Flush as much pending output as possible. All deflate() output, except for
* through this function so some applications may wish to modify it * some deflate_stored() output, goes through this function so some
* to avoid allocating a large strm->next_out buffer and copying into it. * applications may wish to modify it to avoid allocating a large
* (See also read_buf()). * strm->next_out buffer and copying into it. (See also read_buf()).
*/ */
local void flush_pending(strm) local void flush_pending(strm)
z_streamp strm; z_streamp strm;
{ {
unsigned len; unsigned len;
deflate_state *s = strm->state; deflate_state *s = strm->state;
_tr_flush_bits(s); _tr_flush_bits(s);
len = s->pending; len = s->pending;
if (len > strm->avail_out) len = strm->avail_out; if (len > strm->avail_out) len = strm->avail_out;
if (len == 0) return; if (len == 0) return;
zmemcpy(strm->next_out, s->pending_out, len); zmemcpy(strm->next_out, s->pending_out, len);
strm->next_out += len; strm->next_out += len;
s->pending_out += len; s->pending_out += len;
strm->total_out += len; strm->total_out += len;
strm->avail_out -= len; strm->avail_out -= len;
s->pending -= len; s->pending -= len;
if (s->pending == 0) { if (s->pending == 0) {
s->pending_out = s->pending_buf; 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)
/* ========================================================================= */ /* ========================================================================= */
int ZEXPORT deflate (strm, flush) int ZEXPORT deflate (strm, flush)
z_streamp strm; z_streamp strm;
int flush; int flush;
{ {
int old_flush; /* value of flush param for previous deflate call */ int old_flush; /* value of flush param for previous deflate call */
deflate_state *s; deflate_state *s;
if (strm == Z_NULL || strm->state == Z_NULL || if (deflateStateCheck(strm) || flush > Z_BLOCK || flush < 0) {
flush > Z_BLOCK || flush < 0) {
return Z_STREAM_ERROR; return Z_STREAM_ERROR;
} }
s = strm->state; s = strm->state;
if (strm->next_out == Z_NULL || if (strm->next_out == Z_NULL ||
(strm->next_in == Z_NULL && strm->avail_in != 0) || (strm->avail_in != 0 && strm->next_in == Z_NULL) ||
(s->status == FINISH_STATE && flush != Z_FINISH)) { (s->status == FINISH_STATE && flush != Z_FINISH)) {
ERR_RETURN(strm, Z_STREAM_ERROR); ERR_RETURN(strm, Z_STREAM_ERROR);
} }
if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR); if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR);
s->strm = strm; /* just in case */
old_flush = s->last_flush; old_flush = s->last_flush;
s->last_flush = 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);
}
/* Write the header */ /* Write the header */
if (s->status == INIT_STATE) { if (s->status == INIT_STATE) {
#ifdef GZIP /* zlib header */
if (s->wrap == 2) { uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8;
strm->adler = crc32(0L, Z_NULL, 0); uInt level_flags;
put_byte(s, 31);
put_byte(s, 139); if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2)
put_byte(s, 8); level_flags = 0;
if (s->gzhead == Z_NULL) { else if (s->level < 6)
put_byte(s, 0); level_flags = 1;
put_byte(s, 0); else if (s->level == 6)
put_byte(s, 0); level_flags = 2;
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;
}
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 else
#endif level_flags = 3;
{ header |= (level_flags << 6);
uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8; if (s->strstart != 0) header |= PRESET_DICT;
uInt level_flags; header += 31 - (header % 31);
if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2) putShortMSB(s, header);
level_flags = 0;
else if (s->level < 6) /* Save the adler32 of the preset dictionary: */
level_flags = 1; if (s->strstart != 0) {
else if (s->level == 6) putShortMSB(s, (uInt)(strm->adler >> 16));
level_flags = 2; putShortMSB(s, (uInt)(strm->adler & 0xffff));
else }
level_flags = 3; strm->adler = adler32(0L, Z_NULL, 0);
header |= (level_flags << 6); s->status = BUSY_STATE;
if (s->strstart != 0) header |= PRESET_DICT;
header += 31 - (header % 31);
/* 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; s->status = BUSY_STATE;
putShortMSB(s, header);
/* Save the adler32 of the preset dictionary: */ /* Compression must start with an empty pending buffer */
if (s->strstart != 0) { flush_pending(strm);
putShortMSB(s, (uInt)(strm->adler >> 16)); if (s->pending != 0) {
putShortMSB(s, (uInt)(strm->adler & 0xffff)); s->last_flush = -1;
return Z_OK;
} }
strm->adler = adler32(0L, Z_NULL, 0); }
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;
} }
} }
#ifdef GZIP
if (s->status == EXTRA_STATE) { if (s->status == EXTRA_STATE) {
if (s->gzhead->extra != Z_NULL) { if (s->gzhead->extra != Z_NULL) {
uInt beg = s->pending; /* start of bytes to update crc */ ulg beg = s->pending; /* start of bytes to update crc */
uInt left = (s->gzhead->extra_len & 0xffff) - s->gzindex;
while (s->gzindex < (s->gzhead->extra_len & 0xffff)) { while (s->pending + left > s->pending_buf_size) {
if (s->pending == s->pending_buf_size) { uInt copy = s->pending_buf_size - s->pending;
if (s->gzhead->hcrc && s->pending > beg) zmemcpy(s->pending_buf + s->pending,
strm->adler = crc32(strm->adler, s->pending_buf + beg, s->gzhead->extra + s->gzindex, copy);
s->pending - beg); s->pending = s->pending_buf_size;
flush_pending(strm); HCRC_UPDATE(beg);
beg = s->pending; s->gzindex += copy;
if (s->pending == s->pending_buf_size) flush_pending(strm);
break; if (s->pending != 0) {
s->last_flush = -1;
return Z_OK;
} }
put_byte(s, s->gzhead->extra[s->gzindex]); beg = 0;
s->gzindex++; left -= copy;
}
if (s->gzhead->hcrc && s->pending > beg)
strm->adler = crc32(strm->adler, s->pending_buf + beg,
s->pending - beg);
if (s->gzindex == s->gzhead->extra_len) {
s->gzindex = 0;
s->status = NAME_STATE;
} }
zmemcpy(s->pending_buf + s->pending,
s->gzhead->extra + s->gzindex, left);
s->pending += left;
HCRC_UPDATE(beg);
s->gzindex = 0;
} }
else s->status = NAME_STATE;
s->status = NAME_STATE;
} }
if (s->status == NAME_STATE) { if (s->status == NAME_STATE) {
if (s->gzhead->name != Z_NULL) { if (s->gzhead->name != Z_NULL) {
uInt beg = s->pending; /* start of bytes to update crc */ ulg beg = s->pending; /* start of bytes to update crc */
int val; int val;
do { do {
if (s->pending == s->pending_buf_size) { if (s->pending == s->pending_buf_size) {
if (s->gzhead->hcrc && s->pending > beg) HCRC_UPDATE(beg);
strm->adler = crc32(strm->adler, s->pending_buf + beg,
s->pending - beg);
flush_pending(strm); flush_pending(strm);
beg = s->pending; if (s->pending != 0) {
if (s->pending == s->pending_buf_size) { s->last_flush = -1;
val = 1; return Z_OK;
break;
} }
beg = 0;
} }
val = s->gzhead->name[s->gzindex++]; val = s->gzhead->name[s->gzindex++];
put_byte(s, val); put_byte(s, val);
} while (val != 0); } while (val != 0);
if (s->gzhead->hcrc && s->pending > beg) HCRC_UPDATE(beg);
strm->adler = crc32(strm->adler, s->pending_buf + beg, s->gzindex = 0;
s->pending - beg);
if (val == 0) {
s->gzindex = 0;
s->status = COMMENT_STATE;
}
} }
else s->status = COMMENT_STATE;
s->status = COMMENT_STATE;
} }
if (s->status == COMMENT_STATE) { if (s->status == COMMENT_STATE) {
if (s->gzhead->comment != Z_NULL) { if (s->gzhead->comment != Z_NULL) {
uInt beg = s->pending; /* start of bytes to update crc */ ulg beg = s->pending; /* start of bytes to update crc */
int val; int val;
do { do {
if (s->pending == s->pending_buf_size) { if (s->pending == s->pending_buf_size) {
if (s->gzhead->hcrc && s->pending > beg) HCRC_UPDATE(beg);
strm->adler = crc32(strm->adler, s->pending_buf + beg,
s->pending - beg);
flush_pending(strm); flush_pending(strm);
beg = s->pending; if (s->pending != 0) {
if (s->pending == s->pending_buf_size) { s->last_flush = -1;
val = 1; return Z_OK;
break;
} }
beg = 0;
} }
val = s->gzhead->comment[s->gzindex++]; val = s->gzhead->comment[s->gzindex++];
put_byte(s, val); put_byte(s, val);
} while (val != 0); } while (val != 0);
if (s->gzhead->hcrc && s->pending > beg) HCRC_UPDATE(beg);
strm->adler = crc32(strm->adler, s->pending_buf + beg,
s->pending - beg);
if (val == 0)
s->status = HCRC_STATE;
} }
else s->status = HCRC_STATE;
s->status = HCRC_STATE;
} }
if (s->status == HCRC_STATE) { if (s->status == HCRC_STATE) {
if (s->gzhead->hcrc) { if (s->gzhead->hcrc) {
if (s->pending + 2 > s->pending_buf_size) if (s->pending + 2 > s->pending_buf_size) {
flush_pending(strm); flush_pending(strm);
if (s->pending + 2 <= s->pending_buf_size) { if (s->pending != 0) {
put_byte(s, (Byte)(strm->adler & 0xff)); s->last_flush = -1;
put_byte(s, (Byte)((strm->adler >> 8) & 0xff)); return Z_OK;
strm->adler = crc32(0L, Z_NULL, 0); }
s->status = BUSY_STATE;
} }
put_byte(s, (Byte)(strm->adler & 0xff));
put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
strm->adler = crc32(0L, Z_NULL, 0);
} }
else s->status = BUSY_STATE;
s->status = BUSY_STATE;
}
#endif
/* Flush as much pending output as possible */ /* Compression must start with an empty pending buffer */
if (s->pending != 0) {
flush_pending(strm); flush_pending(strm);
if (strm->avail_out == 0) { if (s->pending != 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; s->last_flush = -1;
return Z_OK; 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);
} }
#endif
/* Start a new block or continue the current one. /* Start a new block or continue the current one.
*/ */
if (strm->avail_in != 0 || s->lookahead != 0 || if (strm->avail_in != 0 || s->lookahead != 0 ||
(flush != Z_NO_FLUSH && s->status != FINISH_STATE)) { (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) {
block_state bstate; block_state bstate;
bstate = s->strategy == Z_HUFFMAN_ONLY ? deflate_huff(s, flush) : bstate = s->level == 0 ? deflate_stored(s, flush) :
(s->strategy == Z_RLE ? deflate_rle(s, flush) : s->strategy == Z_HUFFMAN_ONLY ? deflate_huff(s, flush) :
(*(configuration_table[s->level].func))(s, flush)); s->strategy == Z_RLE ? deflate_rle(s, flush) :
(*(configuration_table[s->level].func))(s, flush);
if (bstate == finish_started || bstate == finish_done) { if (bstate == finish_started || bstate == finish_done) {
s->status = FINISH_STATE; s->status = FINISH_STATE;
} }
if (bstate == need_more || bstate == finish_started) { if (bstate == need_more || bstate == finish_started) {
if (strm->avail_out == 0) { if (strm->avail_out == 0) {
s->last_flush = -1; /* avoid BUF_ERROR next call, see above */ s->last_flush = -1; /* avoid BUF_ERROR next call, see above */
} }
return Z_OK; return Z_OK;
/* If flush != Z_NO_FLUSH && avail_out == 0, the next call /* If flush != Z_NO_FLUSH && avail_out == 0, the next call
skipping to change at line 946 skipping to change at line 1044
} }
} }
} }
flush_pending(strm); flush_pending(strm);
if (strm->avail_out == 0) { if (strm->avail_out == 0) {
s->last_flush = -1; /* avoid BUF_ERROR at next call, see above */ s->last_flush = -1; /* avoid BUF_ERROR at next call, see above */
return Z_OK; return Z_OK;
} }
} }
} }
Assert(strm->avail_out > 0, "bug2");
if (flush != Z_FINISH) return Z_OK; if (flush != Z_FINISH) return Z_OK;
if (s->wrap <= 0) return Z_STREAM_END; if (s->wrap <= 0) return Z_STREAM_END;
/* Write the trailer */ /* Write the trailer */
#ifdef GZIP #ifdef GZIP
if (s->wrap == 2) { if (s->wrap == 2) {
put_byte(s, (Byte)(strm->adler & 0xff)); put_byte(s, (Byte)(strm->adler & 0xff));
put_byte(s, (Byte)((strm->adler >> 8) & 0xff)); put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
put_byte(s, (Byte)((strm->adler >> 16) & 0xff)); put_byte(s, (Byte)((strm->adler >> 16) & 0xff));
skipping to change at line 983 skipping to change at line 1080
if (s->wrap > 0) s->wrap = -s->wrap; /* write the trailer only once! */ if (s->wrap > 0) s->wrap = -s->wrap; /* write the trailer only once! */
return s->pending != 0 ? Z_OK : Z_STREAM_END; return s->pending != 0 ? Z_OK : Z_STREAM_END;
} }
/* ========================================================================= */ /* ========================================================================= */
int ZEXPORT deflateEnd (strm) int ZEXPORT deflateEnd (strm)
z_streamp strm; z_streamp strm;
{ {
int status; int status;
if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
status = strm->state->status; status = strm->state->status;
if (status != INIT_STATE &&
status != EXTRA_STATE &&
status != NAME_STATE &&
status != COMMENT_STATE &&
status != HCRC_STATE &&
status != BUSY_STATE &&
status != FINISH_STATE) {
return Z_STREAM_ERROR;
}
/* Deallocate in reverse order of allocations: */ /* Deallocate in reverse order of allocations: */
TRY_FREE(strm, strm->state->pending_buf); TRY_FREE(strm, strm->state->pending_buf);
TRY_FREE(strm, strm->state->head); TRY_FREE(strm, strm->state->head);
TRY_FREE(strm, strm->state->prev); TRY_FREE(strm, strm->state->prev);
TRY_FREE(strm, strm->state->window); TRY_FREE(strm, strm->state->window);
ZFREE(strm, strm->state); ZFREE(strm, strm->state);
strm->state = Z_NULL; strm->state = Z_NULL;
skipping to change at line 1024 skipping to change at line 1112
z_streamp dest; z_streamp dest;
z_streamp source; z_streamp source;
{ {
#ifdef MAXSEG_64K #ifdef MAXSEG_64K
return Z_STREAM_ERROR; return Z_STREAM_ERROR;
#else #else
deflate_state *ds; deflate_state *ds;
deflate_state *ss; deflate_state *ss;
ushf *overlay; ushf *overlay;
if (source == Z_NULL || dest == Z_NULL || source->state == Z_NULL) { if (deflateStateCheck(source) || dest == Z_NULL) {
return Z_STREAM_ERROR; return Z_STREAM_ERROR;
} }
ss = source->state; ss = source->state;
zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream)); zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream));
ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state)); ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state));
if (ds == Z_NULL) return Z_MEM_ERROR; if (ds == Z_NULL) return Z_MEM_ERROR;
dest->state = (struct internal_state FAR *) ds; dest->state = (struct internal_state FAR *) ds;
skipping to change at line 1074 skipping to change at line 1162
#endif /* MAXSEG_64K */ #endif /* MAXSEG_64K */
} }
/* =========================================================================== /* ===========================================================================
* Read a new buffer from the current input stream, update the adler32 * Read a new buffer from the current input stream, update the adler32
* and total number of bytes read. All deflate() input goes through * and total number of bytes read. All deflate() input goes through
* this function so some applications may wish to modify it to avoid * this function so some applications may wish to modify it to avoid
* allocating a large strm->next_in buffer and copying from it. * allocating a large strm->next_in buffer and copying from it.
* (See also flush_pending()). * (See also flush_pending()).
*/ */
local int read_buf(strm, buf, size) local unsigned read_buf(strm, buf, size)
z_streamp strm; z_streamp strm;
Bytef *buf; Bytef *buf;
unsigned size; unsigned size;
{ {
unsigned len = strm->avail_in; unsigned len = strm->avail_in;
if (len > size) len = size; if (len > size) len = size;
if (len == 0) return 0; if (len == 0) return 0;
strm->avail_in -= len; strm->avail_in -= len;
skipping to change at line 1098 skipping to change at line 1186
strm->adler = adler32(strm->adler, buf, len); strm->adler = adler32(strm->adler, buf, len);
} }
#ifdef GZIP #ifdef GZIP
else if (strm->state->wrap == 2) { else if (strm->state->wrap == 2) {
strm->adler = crc32(strm->adler, buf, len); strm->adler = crc32(strm->adler, buf, len);
} }
#endif #endif
strm->next_in += len; strm->next_in += len;
strm->total_in += len; strm->total_in += len;
return (int)len; return len;
} }
/* =========================================================================== /* ===========================================================================
* Initialize the "longest match" routines for a new zlib stream * Initialize the "longest match" routines for a new zlib stream
*/ */
local void lm_init (s) local void lm_init (s)
deflate_state *s; deflate_state *s;
{ {
s->window_size = (ulg)2L*s->w_size; s->window_size = (ulg)2L*s->w_size;
skipping to change at line 1152 skipping to change at line 1240
#ifndef ASMV #ifndef ASMV
/* For 80x86 and 680x0, an optimized version will be provided in match.asm or /* For 80x86 and 680x0, an optimized version will be provided in match.asm or
* match.S. The code will be functionally equivalent. * match.S. The code will be functionally equivalent.
*/ */
local uInt longest_match(s, cur_match) local uInt longest_match(s, cur_match)
deflate_state *s; deflate_state *s;
IPos cur_match; /* current match */ IPos cur_match; /* current match */
{ {
unsigned chain_length = s->max_chain_length;/* max hash chain length */ unsigned chain_length = s->max_chain_length;/* max hash chain length */
register Bytef *scan = s->window + s->strstart; /* current string */ register Bytef *scan = s->window + s->strstart; /* current string */
register Bytef *match; /* matched string */ register Bytef *match; /* matched string */
register int len; /* length of current match */ register int len; /* length of current match */
int best_len = s->prev_length; /* best match length so far */ int best_len = (int)s->prev_length; /* best match length so far */
int nice_match = s->nice_match; /* stop if match long enough */ int nice_match = s->nice_match; /* stop if match long enough */
IPos limit = s->strstart > (IPos)MAX_DIST(s) ? IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
s->strstart - (IPos)MAX_DIST(s) : NIL; s->strstart - (IPos)MAX_DIST(s) : NIL;
/* Stop when cur_match becomes <= limit. To simplify the code, /* Stop when cur_match becomes <= limit. To simplify the code,
* we prevent matches with the string of window index 0. * we prevent matches with the string of window index 0.
*/ */
Posf *prev = s->prev; Posf *prev = s->prev;
uInt wmask = s->w_mask; uInt wmask = s->w_mask;
#ifdef UNALIGNED_OK #ifdef UNALIGNED_OK
skipping to change at line 1189 skipping to change at line 1277
*/ */
Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever"); Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
/* Do not waste too much time if we already have a good match: */ /* Do not waste too much time if we already have a good match: */
if (s->prev_length >= s->good_match) { if (s->prev_length >= s->good_match) {
chain_length >>= 2; chain_length >>= 2;
} }
/* Do not look for matches beyond the end of the input. This is necessary /* Do not look for matches beyond the end of the input. This is necessary
* to make deflate deterministic. * to make deflate deterministic.
*/ */
if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead; if ((uInt)nice_match > s->lookahead) nice_match = (int)s->lookahead;
Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead"); Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
do { do {
Assert(cur_match < s->strstart, "no future"); Assert(cur_match < s->strstart, "no future");
match = s->window + cur_match; match = s->window + cur_match;
/* Skip to next match if the match length cannot increase /* Skip to next match if the match length cannot increase
* or if the match length is less than 2. Note that the checks below * or if the match length is less than 2. Note that the checks below
* for insufficient lookahead only occur occasionally for performance * for insufficient lookahead only occur occasionally for performance
skipping to change at line 1350 skipping to change at line 1438
len = MAX_MATCH - (int)(strend - scan); len = MAX_MATCH - (int)(strend - scan);
if (len < MIN_MATCH) return MIN_MATCH - 1; if (len < MIN_MATCH) return MIN_MATCH - 1;
s->match_start = cur_match; s->match_start = cur_match;
return (uInt)len <= s->lookahead ? (uInt)len : s->lookahead; return (uInt)len <= s->lookahead ? (uInt)len : s->lookahead;
} }
#endif /* FASTEST */ #endif /* FASTEST */
#ifdef DEBUG #ifdef ZLIB_DEBUG
#define EQUAL 0
/* result of memcmp for equal strings */
/* =========================================================================== /* ===========================================================================
* Check that the match at match_start is indeed a match. * Check that the match at match_start is indeed a match.
*/ */
local void check_match(s, start, match, length) local void check_match(s, start, match, length)
deflate_state *s; deflate_state *s;
IPos start, match; IPos start, match;
int length; int length;
{ {
/* check that the match is indeed a match */ /* check that the match is indeed a match */
if (zmemcmp(s->window + match, if (zmemcmp(s->window + match,
skipping to change at line 1376 skipping to change at line 1468
} while (--length != 0); } while (--length != 0);
z_error("invalid match"); z_error("invalid match");
} }
if (z_verbose > 1) { if (z_verbose > 1) {
fprintf(stderr,"\\[%d,%d]", start-match, length); fprintf(stderr,"\\[%d,%d]", start-match, length);
do { putc(s->window[start++], stderr); } while (--length != 0); do { putc(s->window[start++], stderr); } while (--length != 0);
} }
} }
#else #else
# define check_match(s, start, match, length) # define check_match(s, start, match, length)
#endif /* DEBUG */ #endif /* ZLIB_DEBUG */
/* =========================================================================== /* ===========================================================================
* Fill the window when the lookahead becomes insufficient. * Fill the window when the lookahead becomes insufficient.
* Updates strstart and lookahead. * Updates strstart and lookahead.
* *
* IN assertion: lookahead < MIN_LOOKAHEAD * IN assertion: lookahead < MIN_LOOKAHEAD
* OUT assertions: strstart <= window_size-MIN_LOOKAHEAD * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD
* At least one byte has been read, or avail_in == 0; reads are * 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 * performed for at least two bytes (required for the zip translate_eol
* option -- not supported here). * option -- not supported here).
*/ */
local void fill_window(s) local void fill_window(s)
deflate_state *s; deflate_state *s;
{ {
register unsigned n, m; unsigned n;
register Posf *p;
unsigned more; /* Amount of free space at the end of the window. */ unsigned more; /* Amount of free space at the end of the window. */
uInt wsize = s->w_size; uInt wsize = s->w_size;
Assert(s->lookahead < MIN_LOOKAHEAD, "already enough lookahead"); Assert(s->lookahead < MIN_LOOKAHEAD, "already enough lookahead");
do { do {
more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart); more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);
/* Deal with !@#$% 64K limit: */ /* Deal with !@#$% 64K limit: */
if (sizeof(int) <= 2) { if (sizeof(int) <= 2) {
skipping to change at line 1419 skipping to change at line 1510
*/ */
more--; more--;
} }
} }
/* If the window is almost full and there is insufficient lookahead, /* 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. * move the upper half to the lower one to make room in the upper half.
*/ */
if (s->strstart >= wsize+MAX_DIST(s)) { if (s->strstart >= wsize+MAX_DIST(s)) {
zmemcpy(s->window, s->window+wsize, (unsigned)wsize); zmemcpy(s->window, s->window+wsize, (unsigned)wsize - more);
s->match_start -= wsize; s->match_start -= wsize;
s->strstart -= wsize; /* we now have strstart >= MAX_DIST */ s->strstart -= wsize; /* we now have strstart >= MAX_DIST */
s->block_start -= (long) wsize; s->block_start -= (long) wsize;
slide_hash(s);
/* Slide the hash table (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. (Using level 0 permanently is not an optimal usage of
zlib, so we don't care about this pathological case.)
*/
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
more += wsize; more += wsize;
} }
if (s->strm->avail_in == 0) break; if (s->strm->avail_in == 0) break;
/* If there was no sliding: /* If there was no sliding:
* strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 && * strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&
* more == window_size - lookahead - strstart * more == window_size - lookahead - strstart
* => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1) * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1)
* => more >= window_size - 2*WSIZE + 2 * => more >= window_size - 2*WSIZE + 2
* In the BIG_MEM or MMAP case (not yet supported), * In the BIG_MEM or MMAP case (not yet supported),
skipping to change at line 1553 skipping to change at line 1620
flush_pending(s->strm); \ flush_pending(s->strm); \
Tracev((stderr,"[FLUSH]")); \ Tracev((stderr,"[FLUSH]")); \
} }
/* Same but force premature exit if necessary. */ /* Same but force premature exit if necessary. */
#define FLUSH_BLOCK(s, last) { \ #define FLUSH_BLOCK(s, last) { \
FLUSH_BLOCK_ONLY(s, last); \ FLUSH_BLOCK_ONLY(s, last); \
if (s->strm->avail_out == 0) return (last) ? finish_started : need_more; \ 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 * Copy without compression as much as possible from the input stream, return
* the current block state. * the current block state.
* This function does not insert new strings in the dictionary since *
* uncompressible data is probably not useful. This function is used * In case deflateParams() is used to later switch to a non-zero compression
* only for the level=0 compression option. * level, s->matches (otherwise unused when storing) keeps track of the number
* NOTE: this function should be optimized to avoid extra copying from * of hash table slides to perform. If s->matches is 1, then one hash table
* window to pending_buf. * 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) local block_state deflate_stored(s, flush)
deflate_state *s; deflate_state *s;
int flush; int flush;
{ {
/* Stored blocks are limited to 0xffff bytes, pending_buf is limited /* Smallest worthy block size when not flushing or finishing. By default
* to pending_buf_size, and each stored block has a 5 byte header: * 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.
*/ */
ulg max_block_size = 0xffff; unsigned min_block = MIN(s->pending_buf_size - 5, s->w_size);
ulg max_start;
if (max_block_size > s->pending_buf_size - 5) { /* Copy as many min_block or larger stored blocks directly to next_out as
max_block_size = s->pending_buf_size - 5; * possible. If flushing, copy the remaining available input to next_out as
} * stored blocks, if there is enough space.
*/
/* Copy as much as possible from input to output: */ unsigned len, left, have, last = 0;
for (;;) { unsigned used = s->strm->avail_in;
/* Fill the window as much as possible: */ do {
if (s->lookahead <= 1) { /* 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
Assert(s->strstart < s->w_size+MAX_DIST(s) || * would be copied from what's left in the window.
s->block_start >= (long)s->w_size, "slide too late"); */
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;
fill_window(s); /* Make a dummy stored block in pending to get the header bytes,
if (s->lookahead == 0 && flush == Z_NO_FLUSH) return need_more; * 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);
if (s->lookahead == 0) break; /* flush the current block */ /* 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;
} }
Assert(s->block_start >= 0L, "block gone");
s->strstart += s->lookahead;
s->lookahead = 0;
/* Emit a stored block if pending_buf will be full: */ /* Copy uncompressed bytes directly from next_in to next_out, updating
max_start = s->block_start + max_block_size; * the check value.
if (s->strstart == 0 || (ulg)s->strstart >= max_start) { */
/* strstart == 0 is possible when wraparound on 16-bit machine */ if (len) {
s->lookahead = (uInt)(s->strstart - max_start); read_buf(s->strm, s->strm->next_out, len);
s->strstart = (uInt)max_start; s->strm->next_out += len;
FLUSH_BLOCK(s, 0); s->strm->avail_out -= len;
} s->strm->total_out += len;
/* Flush if we may have to slide, otherwise block_start may become }
* negative and the data will be gone: } 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 (s->strstart - (uInt)s->block_start >= MAX_DIST(s)) { if (used >= s->w_size) { /* supplant the previous history */
FLUSH_BLOCK(s, 0); 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);
} }
s->insert = 0; if (s->high_water < s->strstart)
if (flush == Z_FINISH) { s->high_water = s->strstart;
FLUSH_BLOCK(s, 1);
/* 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 &&
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 ((long)s->strstart > s->block_start)
FLUSH_BLOCK(s, 0); /* We've done all we can with the available input and output. */
return block_done; return last ? finish_started : need_more;
} }
/* =========================================================================== /* ===========================================================================
* Compress as much as possible from the input stream, return the current * Compress as much as possible from the input stream, return the current
* block state. * block state.
* This function does not perform lazy evaluation of matches and inserts * This function does not perform lazy evaluation of matches and inserts
* new strings in the dictionary only for unmatched strings or for short * new strings in the dictionary only for unmatched strings or for short
* matches. It is used only for the fast compression options. * matches. It is used only for the fast compression options.
*/ */
local block_state deflate_fast(s, flush) local block_state deflate_fast(s, flush)
skipping to change at line 1893 skipping to change at line 2089
scan = s->window + s->strstart - 1; scan = s->window + s->strstart - 1;
prev = *scan; prev = *scan;
if (prev == *++scan && prev == *++scan && prev == *++scan) { if (prev == *++scan && prev == *++scan && prev == *++scan) {
strend = s->window + s->strstart + MAX_MATCH; strend = s->window + s->strstart + MAX_MATCH;
do { do {
} while (prev == *++scan && prev == *++scan && } while (prev == *++scan && prev == *++scan &&
prev == *++scan && prev == *++scan && prev == *++scan && prev == *++scan &&
prev == *++scan && prev == *++scan && prev == *++scan && prev == *++scan &&
prev == *++scan && prev == *++scan && prev == *++scan && prev == *++scan &&
scan < strend); scan < strend);
s->match_length = MAX_MATCH - (int)(strend - scan); s->match_length = MAX_MATCH - (uInt)(strend - scan);
if (s->match_length > s->lookahead) if (s->match_length > s->lookahead)
s->match_length = s->lookahead; s->match_length = s->lookahead;
} }
Assert(scan <= s->window+(uInt)(s->window_size-1), "wild scan"); Assert(scan <= s->window+(uInt)(s->window_size-1), "wild scan");
} }
/* Emit match if have run of MIN_MATCH or longer, else emit literal */ /* Emit match if have run of MIN_MATCH or longer, else emit literal */
if (s->match_length >= MIN_MATCH) { if (s->match_length >= MIN_MATCH) {
check_match(s, s->strstart, s->strstart - 1, s->match_length); check_match(s, s->strstart, s->strstart - 1, s->match_length);
 End of changes. 107 change blocks. 
303 lines changed or deleted 499 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)