diff options
author | Mark Adler <madler@alumni.caltech.edu> | 2016-12-31 08:49:17 -0800 |
---|---|---|
committer | Mark Adler <madler@alumni.caltech.edu> | 2016-12-31 08:49:17 -0800 |
commit | b7fbee215674c3399212dffba1e71323056931d9 (patch) | |
tree | 4bbc5237bdd56b65dc4fb3f49bac359cec26f9cc | |
parent | f3fcb92cf6c81b3ecd04b3ceb9243548b80c0cd9 (diff) | |
download | zlib-b7fbee215674c3399212dffba1e71323056931d9.tar.gz zlib-b7fbee215674c3399212dffba1e71323056931d9.tar.bz2 zlib-b7fbee215674c3399212dffba1e71323056931d9.zip |
Use a uniform approach for the largest value of an unsigned type.
-rw-r--r-- | compress.c | 2 | ||||
-rw-r--r-- | inflate.c | 2 | ||||
-rw-r--r-- | uncompr.c | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -28,7 +28,7 @@ int ZEXPORT compress2 (dest, destLen, source, sourceLen, level) | |||
28 | { | 28 | { |
29 | z_stream stream; | 29 | z_stream stream; |
30 | int err; | 30 | int err; |
31 | const uInt max = (uInt)0 - 1; | 31 | const uInt max = (uInt)-1; |
32 | uLong left; | 32 | uLong left; |
33 | 33 | ||
34 | left = *destLen; | 34 | left = *destLen; |
@@ -1555,7 +1555,7 @@ unsigned long ZEXPORT inflateCodesUsed(strm) | |||
1555 | z_streamp strm; | 1555 | z_streamp strm; |
1556 | { | 1556 | { |
1557 | struct inflate_state FAR *state; | 1557 | struct inflate_state FAR *state; |
1558 | if (inflateStateCheck(strm)) return (unsigned long)0 - 1; | 1558 | if (inflateStateCheck(strm)) return (unsigned long)-1; |
1559 | state = (struct inflate_state FAR *)strm->state; | 1559 | state = (struct inflate_state FAR *)strm->state; |
1560 | return (unsigned long)(state->next - state->codes); | 1560 | return (unsigned long)(state->next - state->codes); |
1561 | } | 1561 | } |
@@ -32,7 +32,7 @@ int ZEXPORT uncompress2 (dest, destLen, source, sourceLen) | |||
32 | { | 32 | { |
33 | z_stream stream; | 33 | z_stream stream; |
34 | int err; | 34 | int err; |
35 | const uInt max = (uInt)0 - 1; | 35 | const uInt max = (uInt)-1; |
36 | uLong len, left; | 36 | uLong len, left; |
37 | Byte buf[1]; /* for detection of incomplete stream when *destLen == 0 */ | 37 | Byte buf[1]; /* for detection of incomplete stream when *destLen == 0 */ |
38 | 38 | ||