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

[ppp.git] / netbsd-1.1 / ppp-deflate.c

diff --git a/netbsd-1.1/ppp-deflate.c b/netbsd-1.1/ppp-deflate.c
index 5092e9ac79e215141059c957f10ed06ba8d697f7..424a69f4320ea3c9241400c25c982327e6e0f159 100644 (file)
--- a/netbsd-1.1/ppp-deflate.c
+++ b/netbsd-1.1/ppp-deflate.c
@@ -1,4 +1,4 @@
-/*     $Id: ppp-deflate.c,v 1.3 1996/08/28 06:37:09 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);
 }
@@ -150,7 +149,7 @@ z_comp_alloc(options, opt_len)
     state->strm.zalloc = 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;
     }