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/uncompr.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/uncompr.c')
| -rw-r--r-- | deps/zlib/uncompr.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/deps/zlib/uncompr.c b/deps/zlib/uncompr.c index c3d7716bd1..242e9493df 100644 --- a/deps/zlib/uncompr.c +++ b/deps/zlib/uncompr.c @@ -1,9 +1,9 @@ /* uncompr.c -- decompress a memory buffer - * Copyright (C) 1995-2003 Jean-loup Gailly. + * Copyright (C) 1995-2003, 2010 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ -/* @(#) $Id: uncompr.c,v 3.6 2005/08/04 19:14:14 tor%cs.brown.edu Exp $ */ +/* @(#) $Id$ */ #define ZLIB_INTERNAL #include "zlib.h" @@ -16,8 +16,6 @@ been saved previously by the compressor and transmitted to the decompressor by some mechanism outside the scope of this compression library.) Upon exit, destLen is the actual size of the compressed buffer. - This function can be used to decompress a whole file at once if the - input file is mmap'ed. uncompress 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 @@ -32,7 +30,7 @@ int ZEXPORT uncompress (dest, destLen, source, sourceLen) z_stream stream; int err; - stream.next_in = (Bytef*)source; + stream.next_in = (z_const Bytef *)source; stream.avail_in = (uInt)sourceLen; /* Check for source > 64K on 16-bit machine: */ if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR; |