From owner-svn-src-all@FreeBSD.ORG Mon Feb 28 08:59:35 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DD4FB1065670; Mon, 28 Feb 2011 08:59:35 +0000 (UTC) (envelope-from phk@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CBD3F8FC16; Mon, 28 Feb 2011 08:59:35 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1S8xZRM031248; Mon, 28 Feb 2011 08:59:35 GMT (envelope-from phk@svn.freebsd.org) Received: (from phk@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1S8xZ2P031246; Mon, 28 Feb 2011 08:59:35 GMT (envelope-from phk@svn.freebsd.org) Message-Id: <201102280859.p1S8xZ2P031246@svn.freebsd.org> From: Poul-Henning Kamp Date: Mon, 28 Feb 2011 08:59:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219094 - head/usr.sbin/fifolog/lib X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Feb 2011 08:59:36 -0000 Author: phk Date: Mon Feb 28 08:59:35 2011 New Revision: 219094 URL: http://svn.freebsd.org/changeset/base/219094 Log: Don't override the perfectly good default ->zalloc and ->zfree functions. Modified: head/usr.sbin/fifolog/lib/fifolog_int.c Modified: head/usr.sbin/fifolog/lib/fifolog_int.c ============================================================================== --- head/usr.sbin/fifolog/lib/fifolog_int.c Mon Feb 28 06:54:14 2011 (r219093) +++ head/usr.sbin/fifolog/lib/fifolog_int.c Mon Feb 28 08:59:35 2011 (r219094) @@ -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 * 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->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); }