diff options
author | Mark Adler <madler@alumni.caltech.edu> | 2016-12-31 16:57:26 -0800 |
---|---|---|
committer | Mark Adler <madler@alumni.caltech.edu> | 2016-12-31 17:50:52 -0800 |
commit | b9ae6f0079099c1b2e26abbb434725c4cf62d6b2 (patch) | |
tree | 894db968ac4744e42b8b74213cd5f6bbed45f04a /crc32.c | |
parent | 61b91f27f87f03d67ee5ecfa5fc66b16dd5e3019 (diff) | |
download | zlib-b9ae6f0079099c1b2e26abbb434725c4cf62d6b2.tar.gz zlib-b9ae6f0079099c1b2e26abbb434725c4cf62d6b2.tar.bz2 zlib-b9ae6f0079099c1b2e26abbb434725c4cf62d6b2.zip |
Add crc32_z() and adler32_z() functions with size_t lengths.
Diffstat (limited to 'crc32.c')
-rw-r--r-- | crc32.c | 21 |
1 files changed, 15 insertions, 6 deletions
@@ -36,9 +36,9 @@ | |||
36 | #endif | 36 | #endif |
37 | #ifdef BYFOUR | 37 | #ifdef BYFOUR |
38 | local unsigned long crc32_little OF((unsigned long, | 38 | local unsigned long crc32_little OF((unsigned long, |
39 | const unsigned char FAR *, unsigned)); | 39 | const unsigned char FAR *, z_size_t)); |
40 | local unsigned long crc32_big OF((unsigned long, | 40 | local unsigned long crc32_big OF((unsigned long, |
41 | const unsigned char FAR *, unsigned)); | 41 | const unsigned char FAR *, z_size_t)); |
42 | # define TBLS 8 | 42 | # define TBLS 8 |
43 | #else | 43 | #else |
44 | # define TBLS 1 | 44 | # define TBLS 1 |
@@ -199,10 +199,10 @@ const z_crc_t FAR * ZEXPORT get_crc_table() | |||
199 | #define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1 | 199 | #define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1 |
200 | 200 | ||
201 | /* ========================================================================= */ | 201 | /* ========================================================================= */ |
202 | unsigned long ZEXPORT crc32(crc, buf, len) | 202 | unsigned long ZEXPORT crc32_z(crc, buf, len) |
203 | unsigned long crc; | 203 | unsigned long crc; |
204 | const unsigned char FAR *buf; | 204 | const unsigned char FAR *buf; |
205 | uInt len; | 205 | z_size_t len; |
206 | { | 206 | { |
207 | if (buf == Z_NULL) return 0UL; | 207 | if (buf == Z_NULL) return 0UL; |
208 | 208 | ||
@@ -233,6 +233,15 @@ unsigned long ZEXPORT crc32(crc, buf, len) | |||
233 | return crc ^ 0xffffffffUL; | 233 | return crc ^ 0xffffffffUL; |
234 | } | 234 | } |
235 | 235 | ||
236 | /* ========================================================================= */ | ||
237 | unsigned long ZEXPORT crc32(crc, buf, len) | ||
238 | unsigned long crc; | ||
239 | const unsigned char FAR *buf; | ||
240 | uInt len; | ||
241 | { | ||
242 | return crc32_z(crc, buf, len); | ||
243 | } | ||
244 | |||
236 | #ifdef BYFOUR | 245 | #ifdef BYFOUR |
237 | 246 | ||
238 | /* | 247 | /* |
@@ -257,7 +266,7 @@ unsigned long ZEXPORT crc32(crc, buf, len) | |||
257 | local unsigned long crc32_little(crc, buf, len) | 266 | local unsigned long crc32_little(crc, buf, len) |
258 | unsigned long crc; | 267 | unsigned long crc; |
259 | const unsigned char FAR *buf; | 268 | const unsigned char FAR *buf; |
260 | unsigned len; | 269 | z_size_t len; |
261 | { | 270 | { |
262 | register z_crc_t c; | 271 | register z_crc_t c; |
263 | register const z_crc_t FAR *buf4; | 272 | register const z_crc_t FAR *buf4; |
@@ -297,7 +306,7 @@ local unsigned long crc32_little(crc, buf, len) | |||
297 | local unsigned long crc32_big(crc, buf, len) | 306 | local unsigned long crc32_big(crc, buf, len) |
298 | unsigned long crc; | 307 | unsigned long crc; |
299 | const unsigned char FAR *buf; | 308 | const unsigned char FAR *buf; |
300 | unsigned len; | 309 | z_size_t len; |
301 | { | 310 | { |
302 | register z_crc_t c; | 311 | register z_crc_t c; |
303 | register const z_crc_t FAR *buf4; | 312 | register const z_crc_t FAR *buf4; |