diff options
author | steve <steve@FreeBSD.org> | 1998-02-28 06:08:17 +0000 |
---|---|---|
committer | steve <steve@FreeBSD.org> | 1998-02-28 06:08:17 +0000 |
commit | 237ff31c6d598cfde1da4334ec1a86b35f19571c (patch) | |
tree | 6427e9261e25aa42e2def462b2cc2b1a1b674e9a /lib/libz/compress.c | |
parent | 8514318799bade2eb145aee36f8731edc4053a78 (diff) | |
download | FreeBSD-src-237ff31c6d598cfde1da4334ec1a86b35f19571c.zip FreeBSD-src-237ff31c6d598cfde1da4334ec1a86b35f19571c.tar.gz |
Merge conflicts.
Diffstat (limited to 'lib/libz/compress.c')
-rw-r--r-- | lib/libz/compress.c | 37 |
1 files changed, 24 insertions, 13 deletions
diff --git a/lib/libz/compress.c b/lib/libz/compress.c index 686f365..31c51e6 100644 --- a/lib/libz/compress.c +++ b/lib/libz/compress.c @@ -1,5 +1,5 @@ /* compress.c -- compress a memory buffer - * Copyright (C) 1995-1996 Jean-loup Gailly. + * Copyright (C) 1995-1998 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -8,22 +8,22 @@ #include "zlib.h" /* =========================================================================== - Compresses the source buffer into the destination buffer. sourceLen is - the byte length of the source buffer. Upon entry, destLen is the total - size of the destination buffer, which must be at least 0.1% larger than - sourceLen plus 8 bytes. Upon exit, destLen is the actual size of the - compressed buffer. - This function can be used to compress a whole file at once if the - input file is mmap'ed. - compress returns Z_OK if success, Z_MEM_ERROR if there was not - enough memory, Z_BUF_ERROR if there was not enough room in the output - buffer. + Compresses the source buffer into the destination buffer. The level + parameter has the same meaning as in deflateInit. sourceLen is the byte + length of the source buffer. Upon entry, destLen is the total size of the + destination buffer, which must be at least 0.1% larger than sourceLen plus + 12 bytes. Upon exit, destLen is the actual size of the compressed buffer. + + compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough + memory, Z_BUF_ERROR if there was not enough room in the output buffer, + Z_STREAM_ERROR if the level parameter is invalid. */ -int compress (dest, destLen, source, sourceLen) +int ZEXPORT compress2 (dest, destLen, source, sourceLen, level) Bytef *dest; uLongf *destLen; const Bytef *source; uLong sourceLen; + int level; { z_stream stream; int err; @@ -42,7 +42,7 @@ int compress (dest, destLen, source, sourceLen) stream.zfree = (free_func)0; stream.opaque = (voidpf)0; - err = deflateInit(&stream, Z_DEFAULT_COMPRESSION); + err = deflateInit(&stream, level); if (err != Z_OK) return err; err = deflate(&stream, Z_FINISH); @@ -55,3 +55,14 @@ int compress (dest, destLen, source, sourceLen) err = deflateEnd(&stream); return err; } + +/* =========================================================================== + */ +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); +} |