diff options
author | John Högberg <[email protected]> | 2018-10-16 14:08:33 +0200 |
---|---|---|
committer | John Högberg <[email protected]> | 2018-10-16 14:31:08 +0200 |
commit | 4636269001b110548f4a8f35f48eefe7f9bed86f (patch) | |
tree | 398fe1c626a649052b61d0d405d4e6a4ec39f6bb /erts/emulator/zlib/inflate.h | |
parent | c89305463ac916767cceae9c01f6b627ab03c323 (diff) | |
download | otp-4636269001b110548f4a8f35f48eefe7f9bed86f.tar.gz otp-4636269001b110548f4a8f35f48eefe7f9bed86f.tar.bz2 otp-4636269001b110548f4a8f35f48eefe7f9bed86f.zip |
Update zlib to 1.2.11
Diffstat (limited to 'erts/emulator/zlib/inflate.h')
-rw-r--r-- | erts/emulator/zlib/inflate.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/erts/emulator/zlib/inflate.h b/erts/emulator/zlib/inflate.h index 95f4986d40..a46cce6b6d 100644 --- a/erts/emulator/zlib/inflate.h +++ b/erts/emulator/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) */ |