diff options
author | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:22:37 -0700 |
---|---|---|
committer | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:22:37 -0700 |
commit | 4b5a43a219d51066c01ff2ab86af18b967f2d0dd (patch) | |
tree | 4dcaf0cd18751d04cf638a9a6ec521990d4f2e90 /infback.c | |
parent | 086e982175da84b3db958191031380794315f95f (diff) | |
download | zlib-4b5a43a219d51066c01ff2ab86af18b967f2d0dd.tar.gz zlib-4b5a43a219d51066c01ff2ab86af18b967f2d0dd.tar.bz2 zlib-4b5a43a219d51066c01ff2ab86af18b967f2d0dd.zip |
zlib 1.2.0.5v1.2.0.5
Diffstat (limited to 'infback.c')
-rw-r--r-- | infback.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -41,11 +41,11 @@ int stream_size; | |||
41 | windowBits < 8 || windowBits > 15) | 41 | windowBits < 8 || windowBits > 15) |
42 | return Z_STREAM_ERROR; | 42 | return Z_STREAM_ERROR; |
43 | strm->msg = Z_NULL; /* in case we return an error */ | 43 | strm->msg = Z_NULL; /* in case we return an error */ |
44 | if (strm->zalloc == Z_NULL) { | 44 | if (strm->zalloc == (alloc_func)0) { |
45 | strm->zalloc = zcalloc; | 45 | strm->zalloc = zcalloc; |
46 | strm->opaque = (voidpf)0; | 46 | strm->opaque = (voidpf)0; |
47 | } | 47 | } |
48 | if (strm->zfree == Z_NULL) strm->zfree = zcfree; | 48 | if (strm->zfree == (free_func)0) strm->zfree = zcfree; |
49 | state = (struct inflate_state FAR *)ZALLOC(strm, 1, | 49 | state = (struct inflate_state FAR *)ZALLOC(strm, 1, |
50 | sizeof(struct inflate_state)); | 50 | sizeof(struct inflate_state)); |
51 | if (state == Z_NULL) return Z_MEM_ERROR; | 51 | if (state == Z_NULL) return Z_MEM_ERROR; |
@@ -610,7 +610,7 @@ void FAR *out_desc; | |||
610 | int ZEXPORT inflateBackEnd(strm) | 610 | int ZEXPORT inflateBackEnd(strm) |
611 | z_stream FAR *strm; | 611 | z_stream FAR *strm; |
612 | { | 612 | { |
613 | if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == Z_NULL) | 613 | if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0) |
614 | return Z_STREAM_ERROR; | 614 | return Z_STREAM_ERROR; |
615 | ZFREE(strm, strm->state); | 615 | ZFREE(strm, strm->state); |
616 | strm->state = Z_NULL; | 616 | strm->state = Z_NULL; |