diff options
| author | hbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-12 08:48:38 +0000 |
|---|---|---|
| committer | hbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-12 08:48:38 +0000 |
| commit | f159d38cb10c746d54e1f380c94878dbeb935b01 (patch) | |
| tree | a71e2dadea23a0da5d25c867c0b6ecf2d420a10f /third_party/zlib/uncompr.c | |
| parent | 8a9378308da3edfed5b1d53d0c82345f1f11a420 (diff) | |
| download | chromium_src-f159d38cb10c746d54e1f380c94878dbeb935b01.zip chromium_src-f159d38cb10c746d54e1f380c94878dbeb935b01.tar.gz chromium_src-f159d38cb10c746d54e1f380c94878dbeb935b01.tar.bz2 | |
Update zlib to 1.2.5.
This change applies upstream patches from 1.2.3 to 1.2.5.
BUG=30704,39219
TEST=build and run Chrome without any valgrind errors.
Review URL: http://codereview.chromium.org/8806004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113994 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/zlib/uncompr.c')
| -rw-r--r-- | third_party/zlib/uncompr.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/third_party/zlib/uncompr.c b/third_party/zlib/uncompr.c index c3d7716..ad98be3a 100644 --- a/third_party/zlib/uncompr.c +++ b/third_party/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 |