* OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
* OR MODIFICATIONS.
*
- * $Id: deflate.c,v 1.1 1996/01/18 03:17:48 paulus Exp $
+ * $Id: deflate.c,v 1.3 1996/06/26 00:53:16 paulus Exp $
*/
#ifdef AIX4
#define PACKETPTR mblk_t *
#include <net/ppp-comp.h>
+
+#ifdef __osf__
+#include "zlib.h"
+#else
#include "common/zlib.h"
+#endif
#if DO_DEFLATE
#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 *z_alloc __P((void *, u_int items, u_int size));
+static void z_free __P((void *, void *ptr, u_int nb));
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));
/*
* Space allocation and freeing routines for use by zlib routines.
*/
-void *
-zalloc(notused, items, size)
+static void *
+z_alloc(notused, items, size)
void *notused;
u_int items, size;
{
+#ifdef __osf__
+ return ALLOC_SLEEP(items * size);
+#else
return ALLOC_NOSLEEP(items * size);
+#endif
}
-void
-zfree(notused, ptr, nbytes)
+static void
+z_free(notused, ptr, nbytes)
void *notused;
void *ptr;
u_int nbytes;
return NULL;
state->strm.next_in = NULL;
- state->strm.zalloc = zalloc;
- state->strm.zfree = zfree;
+ state->strm.zalloc = (alloc_func) z_alloc;
+ state->strm.zfree = (free_func) z_free;
if (deflateInit2(&state->strm, Z_DEFAULT_COMPRESSION, DEFLATE_METHOD_VAL,
-w_size, 8, Z_DEFAULT_STRATEGY, DEFLATE_OVHD+2) != Z_OK) {
FREE(state, sizeof(*state));
deflateReset(&state->strm);
}
-int
+static int
z_compress(arg, mret, mp, orig_len, maxolen)
void *arg;
mblk_t **mret; /* compressed packet (out) */
return NULL;
state->strm.next_out = NULL;
- state->strm.zalloc = zalloc;
- state->strm.zfree = zfree;
+ state->strm.zalloc = (alloc_func) z_alloc;
+ state->strm.zfree = (free_func) z_free;
if (inflateInit2(&state->strm, -w_size) != Z_OK) {
FREE(state, sizeof(*state));
return NULL;
* bug, so we return DECOMP_FATALERROR for them in order to turn off
* compression, even though they are detected by inspecting the input.
*/
-int
+static int
z_decompress(arg, mi, mop)
void *arg;
mblk_t *mi, **mop;