summaryrefslogtreecommitdiffstats
path: root/compat/zlib/inflate.h
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2017-01-01 19:10:32 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2017-01-01 19:10:32 (GMT)
commitd2cdeda593457c08bfa561d317374933f9fcf925 (patch)
tree77c302923d88e96f0b6fbb399719fc25530be29c /compat/zlib/inflate.h
parenta04ce08575e6013ffee3376c7d045a6709dee314 (diff)
downloadtcl-d2cdeda593457c08bfa561d317374933f9fcf925.zip
tcl-d2cdeda593457c08bfa561d317374933f9fcf925.tar.gz
tcl-d2cdeda593457c08bfa561d317374933f9fcf925.tar.bz2
Update zlib to version 1.2.9. Dll's and *.lib files not updated yet
Diffstat (limited to 'compat/zlib/inflate.h')
-rw-r--r--compat/zlib/inflate.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/compat/zlib/inflate.h b/compat/zlib/inflate.h
index 95f4986..a46cce6 100644
--- a/compat/zlib/inflate.h
+++ b/compat/zlib/inflate.h
@@ -1,5 +1,5 @@
/* inflate.h -- internal inflate state definition
- * Copyright (C) 1995-2009 Mark Adler
+ * Copyright (C) 1995-2016 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -18,7 +18,7 @@
/* Possible inflate modes between inflate() calls */
typedef enum {
- HEAD, /* i: waiting for magic header */
+ HEAD = 16180, /* i: waiting for magic header */
FLAGS, /* i: waiting for method and flags (gzip) */
TIME, /* i: waiting for modification time (gzip) */
OS, /* i: waiting for extra flags and operating system (gzip) */
@@ -77,11 +77,14 @@ typedef enum {
CHECK -> LENGTH -> DONE
*/
-/* state maintained between inflate() calls. Approximately 10K bytes. */
+/* State maintained between inflate() calls -- approximately 7K bytes, not
+ including the allocated sliding window, which is up to 32K bytes. */
struct inflate_state {
+ z_streamp strm; /* pointer back to this zlib stream */
inflate_mode mode; /* current inflate mode */
int last; /* true if processing last block */
- int wrap; /* bit 0 true for zlib, bit 1 true for gzip */
+ int wrap; /* bit 0 true for zlib, bit 1 true for gzip,
+ bit 2 true to validate check value */
int havedict; /* true if dictionary provided */
int flags; /* gzip header method and flags (0 if zlib) */
unsigned dmax; /* zlib header max distance (INFLATE_STRICT) */