aboutsummaryrefslogtreecommitdiffstats
path: root/deflate.c
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2013-05-03 22:32:49 +0000
committerXin LI <delphij@FreeBSD.org>2013-05-03 22:32:49 +0000
commitf1ff077ba4aaaa6b3b74ee72e5b95f34e79da9a5 (patch)
tree62888a5274d470784bb7431e507f40f39e4e00eb /deflate.c
parent11598cceda4aa6b2db006d9dc3b7c80e9e727174 (diff)
downloadsrc-f1ff077ba4aaaa6b3b74ee72e5b95f34e79da9a5.tar.gz
src-f1ff077ba4aaaa6b3b74ee72e5b95f34e79da9a5.zip
Vendor import of zlib 1.2.8.vendor/zlib/1.2.8
Notes
Notes: svn path=/vendor/libz/dist/; revision=250224 svn path=/vendor/libz/1.2.8/; revision=250225; tag=vendor/zlib/1.2.8
Diffstat (limited to 'deflate.c')
-rw-r--r--deflate.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/deflate.c b/deflate.c
index 9e4c2cbc8af8..696957705b75 100644
--- a/deflate.c
+++ b/deflate.c
@@ -1,5 +1,5 @@
/* deflate.c -- compress data using the deflation algorithm
- * Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler
+ * Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -52,7 +52,7 @@
#include "deflate.h"
const char deflate_copyright[] =
- " deflate 1.2.7 Copyright 1995-2012 Jean-loup Gailly and Mark Adler ";
+ " deflate 1.2.8 Copyright 1995-2013 Jean-loup Gailly and Mark Adler ";
/*
If you use the zlib library in a product, an acknowledgment is welcome
in the documentation of your product. If for some reason you cannot
@@ -305,7 +305,7 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
s->pending_buf == Z_NULL) {
s->status = FINISH_STATE;
- strm->msg = (char*)ERR_MSG(Z_MEM_ERROR);
+ strm->msg = ERR_MSG(Z_MEM_ERROR);
deflateEnd (strm);
return Z_MEM_ERROR;
}
@@ -329,7 +329,7 @@ int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
uInt str, n;
int wrap;
unsigned avail;
- unsigned char *next;
+ z_const unsigned char *next;
if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL)
return Z_STREAM_ERROR;
@@ -359,7 +359,7 @@ int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
avail = strm->avail_in;
next = strm->next_in;
strm->avail_in = dictLength;
- strm->next_in = (Bytef *)dictionary;
+ strm->next_in = (z_const Bytef *)dictionary;
fill_window(s);
while (s->lookahead >= MIN_MATCH) {
str = s->strstart;
@@ -513,6 +513,8 @@ int ZEXPORT deflateParams(strm, level, strategy)
strm->total_in != 0) {
/* Flush the last buffer: */
err = deflate(strm, Z_BLOCK);
+ if (err == Z_BUF_ERROR && s->pending == 0)
+ err = Z_OK;
}
if (s->level != level) {
s->level = level;