diff options
author | George Hazan <george.hazan@gmail.com> | 2015-08-16 14:09:56 +0000 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2015-08-16 14:09:56 +0000 |
commit | 0e9b3d2bca89aaf1a365b6dbecff60c1b41aa28d (patch) | |
tree | 5f3347f6cb09ad0b9fd46881013de682f60bc98d /libs/zlib/src/compress.c | |
parent | 44107dd903dd04d00ed3003049f098a24624151f (diff) |
minus 3 warnings
git-svn-id: http://svn.miranda-ng.org/main/trunk@14964 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'libs/zlib/src/compress.c')
-rw-r--r-- | libs/zlib/src/compress.c | 84 |
1 files changed, 42 insertions, 42 deletions
diff --git a/libs/zlib/src/compress.c b/libs/zlib/src/compress.c index 6e9762676a..1541edf08d 100644 --- a/libs/zlib/src/compress.c +++ b/libs/zlib/src/compress.c @@ -19,62 +19,62 @@ memory, Z_BUF_ERROR if there was not enough room in the output buffer, Z_STREAM_ERROR if the level parameter is invalid. */ -int ZEXPORT compress2 (dest, destLen, source, sourceLen, level) - Bytef *dest; - uLongf *destLen; - const Bytef *source; - uLong sourceLen; - int level; +int ZEXPORT compress2(dest, destLen, source, sourceLen, level) +Bytef *dest; +uLongf *destLen; +const Bytef *source; +uLong sourceLen; +int level; { - z_stream stream; - int err; + z_stream stream; + int err; - stream.next_in = (z_const Bytef *)source; - stream.avail_in = (uInt)sourceLen; -#ifdef MAXSEG_64K - /* Check for source > 64K on 16-bit machine: */ - if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR; -#endif - stream.next_out = dest; - stream.avail_out = (uInt)*destLen; - if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR; + stream.next_in = (z_const Bytef *)source; + stream.avail_in = (uInt)sourceLen; + #ifdef MAXSEG_64K + /* Check for source > 64K on 16-bit machine: */ + if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR; + #endif + stream.next_out = dest; + stream.avail_out = (uInt)*destLen; + if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR; - stream.zalloc = (alloc_func)0; - stream.zfree = (free_func)0; - stream.opaque = (voidpf)0; + stream.zalloc = (alloc_func)0; + stream.zfree = (free_func)0; + stream.opaque = (voidpf)0; - err = deflateInit(&stream, level); - if (err != Z_OK) return err; + err = deflateInit(&stream, level); + if (err != Z_OK) return err; - err = deflate(&stream, Z_FINISH); - if (err != Z_STREAM_END) { - deflateEnd(&stream); - return err == Z_OK ? Z_BUF_ERROR : err; - } - *destLen = stream.total_out; + err = deflate(&stream, Z_FINISH); + if (err != Z_STREAM_END) { + deflateEnd(&stream); + return err == Z_OK ? Z_BUF_ERROR : err; + } + *destLen = stream.total_out; - err = deflateEnd(&stream); - return err; + err = deflateEnd(&stream); + return err; } /* =========================================================================== */ -int ZEXPORT compress (dest, destLen, source, sourceLen) - Bytef *dest; - uLongf *destLen; - const Bytef *source; - uLong sourceLen; +int ZEXPORT compress(dest, destLen, source, sourceLen) +Bytef *dest; +uLongf *destLen; +const Bytef *source; +uLong sourceLen; { - return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION); + return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION); } /* =========================================================================== - If the default memLevel or windowBits for deflateInit() is changed, then - this function needs to be updated. + If the default memLevel or windowBits for deflateInit() is changed, then + this function needs to be updated. */ -uLong ZEXPORT compressBound (sourceLen) - uLong sourceLen; +uLong ZEXPORT compressBound(sourceLen) +uLong sourceLen; { - return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + - (sourceLen >> 25) + 13; + return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + + (sourceLen >> 25) + 13; } |