From 5631a1b9bc03d6cf31af66b13872255f18979fe8 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sat, 6 Sep 2008 10:58:53 +0200 Subject: Revert "zlib: add inflateReset2()..." This reverts commit 2a4fb661d7e3d601a5eb9ccecb4d4f2b07073097. (we don't need inflateReset2 anymore) metze (This used to be commit ac43081b93966b545928230f7af8654b942432da) --- source4/lib/zlib/inflate.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'source4/lib/zlib/inflate.c') 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; -- cgit