d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't override the perfectly good default ->zalloc and ->zfree functions.

Browse Source
This commit is contained in:
phk 2011-02-28 08:59:35 +00:00
parent 1428b4e97e
commit 91a0b8165f
1 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
usr.sbin/fifolog/lib/fifolog_int.c
View File

@ -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);
}