aboutsummaryrefslogtreecommitdiff
path: root/uncompr.c
diff options
context:
space:
mode:
authorMark Adler <madler@alumni.caltech.edu>2011-09-09 23:17:33 -0700
committerMark Adler <madler@alumni.caltech.edu>2011-09-09 23:17:33 -0700
commit7850e4e406dce1f7a819297eeb151d1ca18e7cd9 (patch)
treed4befddacae46b06c4924193904de533099610b4 /uncompr.c
parentebd3c2c0e734fc99a1360014ea52ed04fe6aade4 (diff)
downloadzlib-7850e4e406dce1f7a819297eeb151d1ca18e7cd9.tar.gz
zlib-7850e4e406dce1f7a819297eeb151d1ca18e7cd9.tar.bz2
zlib-7850e4e406dce1f7a819297eeb151d1ca18e7cd9.zip
zlib 1.0.7v1.0.7
Diffstat (limited to 'uncompr.c')
-rw-r--r--uncompr.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/uncompr.c b/uncompr.c
index c3de969..2db47c4 100644
--- a/uncompr.c
+++ b/uncompr.c
@@ -1,9 +1,9 @@
1/* uncompr.c -- decompress a memory buffer 1/* uncompr.c -- decompress a memory buffer
2 * Copyright (C) 1995-1996 Jean-loup Gailly. 2 * Copyright (C) 1995-1998 Jean-loup Gailly.
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
6/* $Id: uncompr.c,v 1.8 1996/01/30 21:59:26 me Exp $ */ 6/* @(#) $Id$ */
7 7
8#include "zlib.h" 8#include "zlib.h"
9 9
@@ -22,7 +22,7 @@
22 enough memory, Z_BUF_ERROR if there was not enough room in the output 22 enough memory, Z_BUF_ERROR if there was not enough room in the output
23 buffer, or Z_DATA_ERROR if the input data was corrupted. 23 buffer, or Z_DATA_ERROR if the input data was corrupted.
24*/ 24*/
25int uncompress (dest, destLen, source, sourceLen) 25int EXPORT uncompress (dest, destLen, source, sourceLen)
26 Bytef *dest; 26 Bytef *dest;
27 uLongf *destLen; 27 uLongf *destLen;
28 const Bytef *source; 28 const Bytef *source;
@@ -49,7 +49,7 @@ int uncompress (dest, destLen, source, sourceLen)
49 err = inflate(&stream, Z_FINISH); 49 err = inflate(&stream, Z_FINISH);
50 if (err != Z_STREAM_END) { 50 if (err != Z_STREAM_END) {
51 inflateEnd(&stream); 51 inflateEnd(&stream);
52 return err; 52 return err == Z_OK ? Z_BUF_ERROR : err;
53 } 53 }
54 *destLen = stream.total_out; 54 *destLen = stream.total_out;
55 55