From 91a0b8165f31621e8f1546e4ee2e58f9940c9ee6 Mon Sep 17 00:00:00 2001 From: phk Date: Mon, 28 Feb 2011 08:59:35 +0000 Subject: [PATCH] Don't override the perfectly good default ->zalloc and ->zfree functions. --- usr.sbin/fifolog/lib/fifolog_int.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/usr.sbin/fifolog/lib/fifolog_int.c b/usr.sbin/fifolog/lib/fifolog_int.c index d16e1b77b469..f980f19fcdac 100644 --- a/usr.sbin/fifolog/lib/fifolog_int.c +++ b/usr.sbin/fifolog/lib/fifolog_int.c @@ -42,24 +42,6 @@ #include "fifolog.h" #include "libfifolog_int.h" -/* - * Memory handling for zlib - */ - -static voidpf -fifo_zalloc(voidpf opaque __unused, uInt items, uInt size) -{ - - return calloc(items,size); -} - -static void -fifo_zfree(voidpf opaque __unused, voidpf address) -{ - - free(address); -} - /* * Open a fifolog file or partition for reading or writing. * @@ -88,6 +70,7 @@ fifolog_int_open_i(struct fifolog_file *f, const char *fname, int mode) if (i != 0) { i = fstat(f->fd, &st); + assert(i == 0); if (!S_ISREG(st.st_mode)) return ("Neither disk nor regular file"); f->recsize = 512; @@ -145,8 +128,6 @@ fifolog_int_open_i(struct fifolog_file *f, const char *fname, int mode) f->zs = calloc(sizeof *f->zs, 1); if (f->zs == NULL) return ("cannot malloc"); - f->zs->zalloc = fifo_zalloc; - f->zs->zfree = fifo_zfree; return (NULL); }