diff options
author | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:24:24 -0700 |
---|---|---|
committer | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:24:24 -0700 |
commit | 9811b53dd9e8f67015c7199fff12b5bfc6965330 (patch) | |
tree | bfa72ee22967fb56833203dfcd31c473c86b1bf1 /inflate.h | |
parent | 79fbcdc939b5d515218187a0d5f2526fb632075a (diff) | |
download | zlib-9811b53dd9e8f67015c7199fff12b5bfc6965330.tar.gz zlib-9811b53dd9e8f67015c7199fff12b5bfc6965330.tar.bz2 zlib-9811b53dd9e8f67015c7199fff12b5bfc6965330.zip |
zlib 1.2.2.1v1.2.2.1
Diffstat (limited to 'inflate.h')
-rw-r--r-- | inflate.h | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -1,5 +1,5 @@ | |||
1 | /* inflate.h -- internal inflate state definition | 1 | /* inflate.h -- internal inflate state definition |
2 | * Copyright (C) 1995-2003 Mark Adler | 2 | * Copyright (C) 1995-2004 Mark Adler |
3 | * For conditions of distribution and use, see copyright notice in zlib.h | 3 | * For conditions of distribution and use, see copyright notice in zlib.h |
4 | */ | 4 | */ |
5 | 5 | ||
@@ -19,7 +19,6 @@ | |||
19 | /* Possible inflate modes between inflate() calls */ | 19 | /* Possible inflate modes between inflate() calls */ |
20 | typedef enum { | 20 | typedef enum { |
21 | HEAD, /* i: waiting for magic header */ | 21 | HEAD, /* i: waiting for magic header */ |
22 | #ifdef GUNZIP | ||
23 | FLAGS, /* i: waiting for method and flags (gzip) */ | 22 | FLAGS, /* i: waiting for method and flags (gzip) */ |
24 | TIME, /* i: waiting for modification time (gzip) */ | 23 | TIME, /* i: waiting for modification time (gzip) */ |
25 | OS, /* i: waiting for extra flags and operating system (gzip) */ | 24 | OS, /* i: waiting for extra flags and operating system (gzip) */ |
@@ -28,7 +27,6 @@ typedef enum { | |||
28 | NAME, /* i: waiting for end of file name (gzip) */ | 27 | NAME, /* i: waiting for end of file name (gzip) */ |
29 | COMMENT, /* i: waiting for end of comment (gzip) */ | 28 | COMMENT, /* i: waiting for end of comment (gzip) */ |
30 | HCRC, /* i: waiting for header crc (gzip) */ | 29 | HCRC, /* i: waiting for header crc (gzip) */ |
31 | #endif | ||
32 | DICTID, /* i: waiting for dictionary check value */ | 30 | DICTID, /* i: waiting for dictionary check value */ |
33 | DICT, /* waiting for inflateSetDictionary() call */ | 31 | DICT, /* waiting for inflateSetDictionary() call */ |
34 | TYPE, /* i: waiting for type bits, including last-flag bit */ | 32 | TYPE, /* i: waiting for type bits, including last-flag bit */ |
@@ -45,9 +43,7 @@ typedef enum { | |||
45 | MATCH, /* o: waiting for output space to copy string */ | 43 | MATCH, /* o: waiting for output space to copy string */ |
46 | LIT, /* o: waiting for output space to write literal */ | 44 | LIT, /* o: waiting for output space to write literal */ |
47 | CHECK, /* i: waiting for 32-bit check value */ | 45 | CHECK, /* i: waiting for 32-bit check value */ |
48 | #ifdef GUNZIP | ||
49 | LENGTH, /* i: waiting for 32-bit length (gzip) */ | 46 | LENGTH, /* i: waiting for 32-bit length (gzip) */ |
50 | #endif | ||
51 | DONE, /* finished check, done -- remain here until reset */ | 47 | DONE, /* finished check, done -- remain here until reset */ |
52 | BAD, /* got a data error -- remain here until reset */ | 48 | BAD, /* got a data error -- remain here until reset */ |
53 | MEM, /* got an inflate() memory error -- remain here until reset */ | 49 | MEM, /* got an inflate() memory error -- remain here until reset */ |
@@ -86,6 +82,7 @@ struct inflate_state { | |||
86 | int flags; /* gzip header method and flags (0 if zlib) */ | 82 | int flags; /* gzip header method and flags (0 if zlib) */ |
87 | unsigned long check; /* protected copy of check value */ | 83 | unsigned long check; /* protected copy of check value */ |
88 | unsigned long total; /* protected copy of output count */ | 84 | unsigned long total; /* protected copy of output count */ |
85 | gz_headerp head; /* where to save gzip header information */ | ||
89 | /* sliding window */ | 86 | /* sliding window */ |
90 | unsigned wbits; /* log base 2 of requested window size */ | 87 | unsigned wbits; /* log base 2 of requested window size */ |
91 | unsigned wsize; /* window size or zero if not using window */ | 88 | unsigned wsize; /* window size or zero if not using window */ |