summaryrefslogtreecommitdiffstats
path: root/usr.sbin/fifolog
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2011-02-28 08:59:35 +0000
committerphk <phk@FreeBSD.org>2011-02-28 08:59:35 +0000
commit91a0b8165f31621e8f1546e4ee2e58f9940c9ee6 (patch)
tree4715b42e2a2b58b4046fbafb1c55c7999b40c99a /usr.sbin/fifolog
parent1428b4e97ec88cb8e16b83a7fe25182fc0d68307 (diff)
downloadFreeBSD-src-91a0b8165f31621e8f1546e4ee2e58f9940c9ee6.zip
FreeBSD-src-91a0b8165f31621e8f1546e4ee2e58f9940c9ee6.tar.gz
Don't override the perfectly good default ->zalloc and ->zfree functions.
Diffstat (limited to 'usr.sbin/fifolog')
-rw-r--r--usr.sbin/fifolog/lib/fifolog_int.c21
1 files changed, 1 insertions, 20 deletions
diff --git a/usr.sbin/fifolog/lib/fifolog_int.c b/usr.sbin/fifolog/lib/fifolog_int.c
index d16e1b7..f980f19 100644
--- a/usr.sbin/fifolog/lib/fifolog_int.c
+++ b/usr.sbin/fifolog/lib/fifolog_int.c
@@ -43,24 +43,6 @@
#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.
*
* Return value is NULL for success or a error description string to
@@ -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);
}
OpenPOWER on IntegriCloud