From: Paul Mackerras <paulus@samba.org>
Date: Thu, 27 Nov 1997 06:06:33 +0000 (+0000)
Subject: mods for new zlib; get rid of zalloc_init and nb arg to zfree
X-Git-Tag: RELEASE_2_3_6~156
X-Git-Url: https://git.ozlabs.org/?p=ppp.git;a=commitdiff_plain;h=6aa9e14471977d7a54fed98ce40fc42ef2444d02;hp=96dad36e1d37716004171559280613739e7df29e

mods for new zlib; get rid of zalloc_init and nb arg to zfree
---

diff --git a/netbsd-1.1/ppp-deflate.c b/netbsd-1.1/ppp-deflate.c
index 697cac6..424a69f 100644
--- a/netbsd-1.1/ppp-deflate.c
+++ b/netbsd-1.1/ppp-deflate.c
@@ -1,4 +1,4 @@
-/*	$Id: ppp-deflate.c,v 1.6 1997/04/30 05:47:23 paulus Exp $	*/
+/*	$Id: ppp-deflate.c,v 1.7 1997/11/27 06:06:31 paulus Exp $	*/
 
 /*
  * ppp_deflate.c - interface the zlib procedures for Deflate compression
@@ -60,7 +60,7 @@ struct deflate_state {
 #define DEFLATE_OVHD	2		/* Deflate overhead/packet */
 
 static void	*zalloc __P((void *, u_int items, u_int size));
-static void	zfree __P((void *, void *ptr, u_int nb));
+static void	zfree __P((void *, void *ptr));
 static void	*z_comp_alloc __P((u_char *options, int opt_len));
 static void	*z_decomp_alloc __P((u_char *options, int opt_len));
 static void	z_comp_free __P((void *state));
@@ -113,10 +113,9 @@ zalloc(notused, items, size)
 }
 
 void
-zfree(notused, ptr, nbytes)
+zfree(notused, ptr)
     void *notused;
     void *ptr;
-    u_int nbytes;
 {
     FREE(ptr, M_DEVBUF);
 }
@@ -148,10 +147,9 @@ z_comp_alloc(options, opt_len)
 
     state->strm.next_in = NULL;
     state->strm.zalloc = zalloc;
-    state->strm.zalloc_init = zalloc;
     state->strm.zfree = zfree;
     if (deflateInit2(&state->strm, Z_DEFAULT_COMPRESSION, DEFLATE_METHOD_VAL,
-		     -w_size, 8, Z_DEFAULT_STRATEGY, DEFLATE_OVHD+2) != Z_OK) {
+		     -w_size, 8, Z_DEFAULT_STRATEGY) != Z_OK) {
 	FREE(state, M_DEVBUF);
 	return NULL;
     }
@@ -380,7 +378,6 @@ z_decomp_alloc(options, opt_len)
 
     state->strm.next_out = NULL;
     state->strm.zalloc = zalloc;
-    state->strm.zalloc_init = zalloc;
     state->strm.zfree = zfree;
     if (inflateInit2(&state->strm, -w_size) != Z_OK) {
 	FREE(state, M_DEVBUF);
diff --git a/netbsd-1.2/ppp-deflate.c b/netbsd-1.2/ppp-deflate.c
index f14f381..3144834 100644
--- a/netbsd-1.2/ppp-deflate.c
+++ b/netbsd-1.2/ppp-deflate.c
@@ -61,7 +61,7 @@ struct deflate_state {
 #define DEFLATE_OVHD	2		/* Deflate overhead/packet */
 
 static void	*zalloc __P((void *, u_int items, u_int size));
-static void	zfree __P((void *, void *ptr, u_int nb));
+static void	zfree __P((void *, void *ptr));
 static void	*z_comp_alloc __P((u_char *options, int opt_len));
 static void	*z_decomp_alloc __P((u_char *options, int opt_len));
 static void	z_comp_free __P((void *state));
@@ -114,10 +114,9 @@ zalloc(notused, items, size)
 }
 
 void
-zfree(notused, ptr, nbytes)
+zfree(notused, ptr)
     void *notused;
     void *ptr;
-    u_int nbytes;
 {
     FREE(ptr, M_DEVBUF);
 }
@@ -149,10 +148,9 @@ z_comp_alloc(options, opt_len)
 
     state->strm.next_in = NULL;
     state->strm.zalloc = zalloc;
-    state->strm.zalloc_init = zalloc;
     state->strm.zfree = zfree;
     if (deflateInit2(&state->strm, Z_DEFAULT_COMPRESSION, DEFLATE_METHOD_VAL,
-		     -w_size, 8, Z_DEFAULT_STRATEGY, DEFLATE_OVHD+2) != Z_OK) {
+		     -w_size, 8, Z_DEFAULT_STRATEGY) != Z_OK) {
 	FREE(state, M_DEVBUF);
 	return NULL;
     }
@@ -313,11 +311,8 @@ z_compress(arg, mret, mp, orig_len, maxolen)
 
     /*
      * See if we managed to reduce the size of the packet.
-     * If the compressor just gave us a single zero byte, it means
-     * the packet was incompressible.
      */
-    if (m != NULL && olen < orig_len
-	&& !(olen == PPP_HDRLEN + 3 && *wptr == 0)) {
+    if (m != NULL && olen < orig_len) {
 	state->stats.comp_bytes += olen;
 	state->stats.comp_packets++;
     } else {
@@ -381,7 +376,6 @@ z_decomp_alloc(options, opt_len)
 
     state->strm.next_out = NULL;
     state->strm.zalloc = zalloc;
-    state->strm.zalloc_init = zalloc;
     state->strm.zfree = zfree;
     if (inflateInit2(&state->strm, -w_size) != Z_OK) {
 	FREE(state, M_DEVBUF);
diff --git a/ultrix/ppp-deflate.c b/ultrix/ppp-deflate.c
index 1e6fa93..018a59b 100644
--- a/ultrix/ppp-deflate.c
+++ b/ultrix/ppp-deflate.c
@@ -1,4 +1,4 @@
-/*	$Id: ppp-deflate.c,v 1.3 1997/04/30 06:00:45 paulus Exp $	*/
+/*	$Id: ppp-deflate.c,v 1.4 1997/11/27 06:06:33 paulus Exp $	*/
 
 /*
  * ppp_deflate.c - interface the zlib procedures for Deflate compression
@@ -59,7 +59,7 @@ struct deflate_state {
 #define DEFLATE_OVHD	2		/* Deflate overhead/packet */
 
 static void	*zalloc __P((void *, u_int items, u_int size));
-static void	zfree __P((void *, void *ptr, u_int nb));
+static void	zfree __P((void *, void *ptr));
 static void	*z_comp_alloc __P((u_char *options, int opt_len));
 static void	*z_decomp_alloc __P((u_char *options, int opt_len));
 static void	z_comp_free __P((void *state));
@@ -121,10 +121,9 @@ zalloc(notused, items, size)
 }
 
 void
-zfree(notused, ptr, nbytes)
+zfree(notused, ptr)
     void *notused;
     void *ptr;
-    u_int nbytes;
 {
     KM_FREE(ptr, KM_DEVBUF);
 }
@@ -157,10 +156,9 @@ z_comp_alloc(options, opt_len)
 
     state->strm.next_in = NULL;
     state->strm.zalloc = (alloc_func) zalloc;
-    state->strm.zalloc_init = (alloc_func) zalloc;
     state->strm.zfree = (free_func) zfree;
     if (deflateInit2(&state->strm, Z_DEFAULT_COMPRESSION, DEFLATE_METHOD_VAL,
-		     -w_size, 8, Z_DEFAULT_STRATEGY, DEFLATE_OVHD+2) != Z_OK) {
+		     -w_size, 8, Z_DEFAULT_STRATEGY) != Z_OK) {
 	KM_FREE(state, KM_DEVBUF);
 	return NULL;
     }
@@ -393,7 +391,6 @@ z_decomp_alloc(options, opt_len)
 
     state->strm.next_out = NULL;
     state->strm.zalloc = (alloc_func) zalloc;
-    state->strm.zalloc_init = (alloc_func) zalloc;
     state->strm.zfree = (free_func) zfree;
     if (inflateInit2(&state->strm, -w_size) != Z_OK) {
 	KM_FREE(state, KM_DEVBUF);