diff options
Diffstat (limited to 'infutil.h')
-rw-r--r-- | infutil.h | 19 |
1 files changed, 10 insertions, 9 deletions
@@ -31,14 +31,14 @@ struct inflate_blocks_state { | |||
31 | struct { | 31 | struct { |
32 | uInt table; /* table lengths (14 bits) */ | 32 | uInt table; /* table lengths (14 bits) */ |
33 | uInt index; /* index into blens (or border) */ | 33 | uInt index; /* index into blens (or border) */ |
34 | uInt *blens; /* bit lengths of codes */ | 34 | uIntf *blens; /* bit lengths of codes */ |
35 | uInt bb; /* bit length tree depth */ | 35 | uInt bb; /* bit length tree depth */ |
36 | inflate_huft *tb; /* bit length decoding tree */ | 36 | inflate_huft *tb; /* bit length decoding tree */ |
37 | } trees; /* if DTREE, decoding info for trees */ | 37 | } trees; /* if DTREE, decoding info for trees */ |
38 | struct { | 38 | struct { |
39 | inflate_huft *tl, *td; /* trees to free */ | 39 | inflate_huft *tl, *td; /* trees to free */ |
40 | struct inflate_codes_state | 40 | inflate_codes_statef |
41 | *codes; | 41 | *codes; |
42 | } decode; /* if CODES, current state */ | 42 | } decode; /* if CODES, current state */ |
43 | } sub; /* submode */ | 43 | } sub; /* submode */ |
44 | uInt last; /* true if this block is the last block */ | 44 | uInt last; /* true if this block is the last block */ |
@@ -46,15 +46,16 @@ struct inflate_blocks_state { | |||
46 | /* mode independent information */ | 46 | /* mode independent information */ |
47 | uInt bitk; /* bits in bit buffer */ | 47 | uInt bitk; /* bits in bit buffer */ |
48 | uLong bitb; /* bit buffer */ | 48 | uLong bitb; /* bit buffer */ |
49 | Byte *window; /* sliding window */ | 49 | Bytef *window; /* sliding window */ |
50 | Byte *end; /* one byte after sliding window */ | 50 | Bytef *end; /* one byte after sliding window */ |
51 | Byte *read; /* window read pointer */ | 51 | Bytef *read; /* window read pointer */ |
52 | Byte *write; /* window write pointer */ | 52 | Bytef *write; /* window write pointer */ |
53 | check_func checkfn; /* check function */ | 53 | check_func checkfn; /* check function */ |
54 | uLong check; /* check on output */ | 54 | uLong check; /* check on output */ |
55 | 55 | ||
56 | }; | 56 | }; |
57 | 57 | ||
58 | |||
58 | /* defines for inflate input/output */ | 59 | /* defines for inflate input/output */ |
59 | /* update pointers and return */ | 60 | /* update pointers and return */ |
60 | #define UPDBITS {s->bitb=b;s->bitk=k;} | 61 | #define UPDBITS {s->bitb=b;s->bitk=k;} |
@@ -82,8 +83,8 @@ struct inflate_blocks_state { | |||
82 | extern uInt inflate_mask[]; | 83 | extern uInt inflate_mask[]; |
83 | 84 | ||
84 | /* copy as much as possible from the sliding window to the output area */ | 85 | /* copy as much as possible from the sliding window to the output area */ |
85 | extern int inflate_flush __P(( | 86 | extern int inflate_flush OF(( |
86 | struct inflate_blocks_state *, | 87 | inflate_blocks_statef *, |
87 | z_stream *, | 88 | z_stream *, |
88 | int)); | 89 | int)); |
89 | 90 | ||