diff options
author | Andrew Bartlett <abartlet@samba.org> | 2008-09-08 12:54:13 +1000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2008-09-08 12:54:13 +1000 |
commit | 3eb6f79a02de6820581b91f8d9be80b8dd620119 (patch) | |
tree | 3567dccbd6e247f72fe079e4592f0084b1ac0059 /source4/lib/zlib/inflate.c | |
parent | dadd59ba401943d0cf5e4d07959456b70a3c11d9 (diff) | |
parent | 1efff73068e933dd0b4cc81ff901f6010fda9a6b (diff) | |
download | samba-3eb6f79a02de6820581b91f8d9be80b8dd620119.tar.gz samba-3eb6f79a02de6820581b91f8d9be80b8dd620119.tar.bz2 samba-3eb6f79a02de6820581b91f8d9be80b8dd620119.zip |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into trusted-domains
(This used to be commit a057c3ed9df2670e5cad5f1807e280d77eb58cb0)
Diffstat (limited to 'source4/lib/zlib/inflate.c')
-rw-r--r-- | source4/lib/zlib/inflate.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/source4/lib/zlib/inflate.c b/source4/lib/zlib/inflate.c index fbecefd8f5..ccbfac804d 100644 --- a/source4/lib/zlib/inflate.c +++ b/source4/lib/zlib/inflate.c @@ -100,9 +100,8 @@ local int updatewindow OF((z_streamp strm, unsigned out)); local unsigned syncsearch OF((unsigned FAR *have, unsigned const char FAR *buf, unsigned len)); -int ZEXPORT inflateReset2(strm, flags) +int ZEXPORT inflateReset(strm) z_streamp strm; -unsigned flags; { struct inflate_state FAR *state; @@ -116,10 +115,8 @@ unsigned flags; state->havedict = 0; state->dmax = 32768U; state->head = Z_NULL; - if (!(flags & Z_RESET_KEEP_WINDOW)) { - state->wsize = 0; - state->whave = 0; - } + state->wsize = 0; + state->whave = 0; state->write = 0; state->hold = 0; state->bits = 0; @@ -128,12 +125,6 @@ unsigned flags; return Z_OK; } -int ZEXPORT inflateReset(strm) -z_streamp strm; -{ - return inflateReset2(strm, 0); -} - int ZEXPORT inflatePrime(strm, bits, value) z_streamp strm; int bits; |