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 697cac6a78754f7988e49a7202b4a47148d5b72c..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.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
 
 /*
  * 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));
 #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));
 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
 }
 
 void

-zfree(notused, ptr, nbytes)
+zfree(notused, ptr)

     void *notused;
     void *ptr;
     void *notused;
     void *ptr;

-    u_int nbytes;

 {
     FREE(ptr, M_DEVBUF);
 }
 {
     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.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,
     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;
     }
        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.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);
     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 f14f381e6beea2c3c062daa5311e6b0fc51ea35f..3144834c534e2037a11c85110cf9acb7df4e345a 100644 (file)
--- 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));
 #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));
 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
 }
 
 void

-zfree(notused, ptr, nbytes)
+zfree(notused, ptr)

     void *notused;
     void *ptr;
     void *notused;
     void *ptr;

-    u_int nbytes;

 {
     FREE(ptr, M_DEVBUF);
 }
 {
     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.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,
     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;
     }
        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.
 
     /*
      * 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 {
        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.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);
     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 1e6fa93bacb48cf062691d92e5227966ec35b129..018a59bb6c8683446b56a4da647ac88dd0dd3ca4 100644 (file)
--- 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
 
 /*
  * 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));
 #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));
 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
 }
 
 void

-zfree(notused, ptr, nbytes)
+zfree(notused, ptr)

     void *notused;
     void *ptr;
     void *notused;
     void *ptr;

-    u_int nbytes;

 {
     KM_FREE(ptr, KM_DEVBUF);
 }
 {
     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.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,
     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;
     }
        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.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);
     state->strm.zfree = (free_func) zfree;
     if (inflateInit2(&state->strm, -w_size) != Z_OK) {
        KM_FREE(state, KM_DEVBUF);