diff options
| author | Ricardo M. Correia <[email protected]> | 2009-02-22 03:35:51 +0000 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2009-02-23 11:45:59 -0800 |
| commit | 4327ac3ff93b7aa47d20c184d34fb1f2202b7ab5 (patch) | |
| tree | 6013c36e0160dce7b9cf5e43ee20e80c4534e5ed /include | |
| parent | a1cf80b493137b00d9111d4d15405a12237ea9bd (diff) | |
Changed z_compress_level() and z_uncompress() prototypes to match the ones in Solaris.
Fixes compilation warning.
Diffstat (limited to 'include')
| -rw-r--r-- | include/sys/zmod.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/sys/zmod.h b/include/sys/zmod.h index 428904ea7..bc901b346 100644 --- a/include/sys/zmod.h +++ b/include/sys/zmod.h @@ -48,8 +48,8 @@ * Z_STREAM_ERROR if the level parameter is invalid. */ static __inline__ int -z_compress_level(Byte *dest, uLong *destLen, const Byte *source, - uLong sourceLen, int level) +z_compress_level(void *dest, size_t *destLen, const void *source, + size_t sourceLen, int level) { z_stream stream; int err; @@ -58,13 +58,13 @@ z_compress_level(Byte *dest, uLong *destLen, const Byte *source, stream.avail_in = (uInt)sourceLen; #ifdef MAXSEG_64K /* Check for source > 64K on 16-bit machine: */ - if ((uLong)stream.avail_in != sourceLen) + if ((size_t)stream.avail_in != sourceLen) return Z_BUF_ERROR; #endif stream.next_out = dest; stream.avail_out = (uInt)*destLen; - if ((uLong)stream.avail_out != *destLen) + if ((size_t)stream.avail_out != *destLen) return Z_BUF_ERROR; err = zlib_deflateInit(&stream, level); @@ -98,7 +98,7 @@ z_compress_level(Byte *dest, uLong *destLen, const Byte *source, * buffer, or Z_DATA_ERROR if the input data was corrupted. */ static __inline__ int -z_uncompress(Byte *dest, uLong *destLen, const Byte *source, uLong sourceLen) +z_uncompress(void *dest, size_t *destLen, const void *source, size_t sourceLen) { z_stream stream; int err; @@ -106,13 +106,13 @@ z_uncompress(Byte *dest, uLong *destLen, const Byte *source, uLong sourceLen) stream.next_in = (Byte *)source; stream.avail_in = (uInt)sourceLen; /* Check for source > 64K on 16-bit machine: */ - if ((uLong)stream.avail_in != sourceLen) + if ((size_t)stream.avail_in != sourceLen) return Z_BUF_ERROR; stream.next_out = dest; stream.avail_out = (uInt)*destLen; - if ((uLong)stream.avail_out != *destLen) + if ((size_t)stream.avail_out != *destLen) return Z_BUF_ERROR; err = zlib_inflateInit(&stream); |