From 5631a1b9bc03d6cf31af66b13872255f18979fe8 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
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 +++------------
 source4/lib/zlib/zconf.h   |  1 -
 source4/lib/zlib/zlib.h    | 15 ---------------
 3 files changed, 3 insertions(+), 28 deletions(-)

(limited to 'source4/lib/zlib')

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;
diff --git a/source4/lib/zlib/zconf.h b/source4/lib/zlib/zconf.h
index 214603c151..3742ad4106 100644
--- a/source4/lib/zlib/zconf.h
+++ b/source4/lib/zlib/zconf.h
@@ -35,7 +35,6 @@
 #  define inflateSyncPoint      z_inflateSyncPoint
 #  define inflateCopy           z_inflateCopy
 #  define inflateReset          z_inflateReset
-#  define inflateReset2         z_inflateReset2
 #  define inflateBack           z_inflateBack
 #  define inflateBackEnd        z_inflateBackEnd
 #  define compress              z_compress
diff --git a/source4/lib/zlib/zlib.h b/source4/lib/zlib/zlib.h
index 8ff1d222de..a660031e94 100644
--- a/source4/lib/zlib/zlib.h
+++ b/source4/lib/zlib/zlib.h
@@ -210,9 +210,6 @@ typedef gz_header FAR *gz_headerp;
 
 #define Z_NULL  0  /* for initializing zalloc, zfree, opaque */
 
-#define Z_RESET_KEEP_WINDOW 0x0001
-/* This flag can be passed to inflateReset2 and deflateReset2 */
-
 #define zlib_version zlibVersion()
 /* for compatibility with versions < 1.0.2 */
 
@@ -805,8 +802,6 @@ ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
    destination.
 */
 
-ZEXTERN int ZEXPORT inflateReset2 OF((z_streamp strm, unsigned flags));
-
 ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
 /*
      This function is equivalent to inflateEnd followed by inflateInit,
@@ -817,16 +812,6 @@ ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
    stream state was inconsistent (such as zalloc or state being NULL).
 */
 
-ZEXTERN int ZEXPORT inflateReset2 OF((z_streamp strm, unsigned flags));
-/*
-     This function is like inflateReset, but you can pass some flags
-   to have further control over the behavior. If you pass Z_RESET_KEEP_WINDOW
-   the window will be untouched and will be reused in the next runs of inflate()
-
-      inflateReset2 returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being NULL).
-*/
-
 ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
                                      int bits,
                                      int value));
-- 
cgit