diff options
| author | Shigeki Ohtsu <ohtsu@iij.ad.jp> | 2014-12-02 15:28:24 -0800 |
|---|---|---|
| committer | Bert Belder <bertbelder@gmail.com> | 2015-01-08 23:59:53 +0100 |
| commit | 50f12f6c8a5870bf6bddc715326251f2475f327f (patch) | |
| tree | 424cc18a085518dcab045dad66a2d80fb46dd63f /deps/zlib/compress.c | |
| parent | e79ccee1685393e4ec73746bac93835cbcf3a809 (diff) | |
| download | node-new-50f12f6c8a5870bf6bddc715326251f2475f327f.tar.gz | |
deps: upgrade zlib to 1.2.8
Reviewed-By: Bert Belder <bertbelder@gmail.com>
Diffstat (limited to 'deps/zlib/compress.c')
| -rw-r--r-- | deps/zlib/compress.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/deps/zlib/compress.c b/deps/zlib/compress.c index 825cbbcf5d..6e9762676a 100644 --- a/deps/zlib/compress.c +++ b/deps/zlib/compress.c @@ -1,9 +1,9 @@ /* compress.c -- compress a memory buffer - * Copyright (C) 1995-2003 Jean-loup Gailly. + * Copyright (C) 1995-2005 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ -/* @(#) $Id: compress.c,v 3.6 2005/08/04 19:14:14 tor%cs.brown.edu Exp $ */ +/* @(#) $Id$ */ #define ZLIB_INTERNAL #include "zlib.h" @@ -29,7 +29,7 @@ int ZEXPORT compress2 (dest, destLen, source, sourceLen, level) z_stream stream; int err; - stream.next_in = (Bytef*)source; + stream.next_in = (z_const Bytef *)source; stream.avail_in = (uInt)sourceLen; #ifdef MAXSEG_64K /* Check for source > 64K on 16-bit machine: */ @@ -75,5 +75,6 @@ int ZEXPORT compress (dest, destLen, source, sourceLen) uLong ZEXPORT compressBound (sourceLen) uLong sourceLen; { - return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + 11; + return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + + (sourceLen >> 25) + 13; } |