From owner-trustedbsd-cvs@FreeBSD.ORG Tue Mar 28 19:12:48 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A73D116A41F for ; Tue, 28 Mar 2006 19:12:48 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id D2D5B43D5E for ; Tue, 28 Mar 2006 19:12:43 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 483ED46BCA for ; Tue, 28 Mar 2006 14:12:41 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 5208E62F8B; Tue, 28 Mar 2006 19:12:38 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 4919F16A422; Tue, 28 Mar 2006 19:12:38 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2151E16A401 for ; Tue, 28 Mar 2006 19:12:38 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6958D43D6B for ; Tue, 28 Mar 2006 19:12:35 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2SJCZ1C054380 for ; Tue, 28 Mar 2006 19:12:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2SJCZ1P054377 for perforce@freebsd.org; Tue, 28 Mar 2006 19:12:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Mar 2006 19:12:35 GMT Message-Id: <200603281912.k2SJCZ1P054377@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 94195 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Mar 2006 19:12:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=94195 Change 94195 by rwatson@rwatson_zoo on 2006/03/28 19:12:20 Canonicalize calling of functions via pointers, one or two minor style/warning nits. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#4 edit .. //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd_conf.c#3 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#3 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#4 $ */ #include @@ -86,7 +86,6 @@ case SIGQUIT: quit++; break; - } } @@ -96,8 +95,8 @@ struct auditfilter_module *am; TAILQ_FOREACH(am, &filter_list, am_list) { - if (am->am_record != NULL) - (*am->am_bsmrecord)(am->am_instance, ts, data, len); + if (am->am_bsmrecord != NULL) + (am->am_bsmrecord)(am->am_instance, ts, data, len); } } @@ -115,7 +114,8 @@ bytesread += tok.len; } TAILQ_FOREACH(am, &filter_list, am_list) { - + if (am->am_record != NULL) + (am->am_record)(am->am_instance, ts, 0, NULL); } } ==== //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd_conf.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd_conf.c#2 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd_conf.c#3 $ */ /* @@ -70,7 +70,6 @@ static void auditfilter_module_free(struct auditfilter_module *am) { - int i; if (am->am_modulename != NULL) free(am->am_modulename); @@ -106,7 +105,7 @@ { if (am->am_detach != NULL) - (*am->am_detach)(am->am_instance); + am->am_detach(am->am_instance); am->am_instance = NULL; (void)dlclose(am->am_dlhandle); am->am_dlhandle = NULL; @@ -155,8 +154,8 @@ am->am_detach = dlsym(am->am_dlhandle, AUDIT_FILTER_DETACH_STRING); if (am->am_attach != NULL) { - if ((*am->am_attach)(&am->am_instance, am->am_argc, - am->am_argv) != AUDIT_FILTER_SUCCESS) { + if (am->am_attach(&am->am_instance, am->am_argc, am->am_argv) + != AUDIT_FILTER_SUCCESS) { warnx("auditfilter_module_attach: %s: failed", am->am_modulename); dlclose(am->am_dlhandle); @@ -185,7 +184,7 @@ if (am->am_reinit == NULL) return (0); - if ((*am->am_reinit)(&am->am_instance, am->am_argc, am->am_argv) != + if (am->am_reinit(&am->am_instance, am->am_argc, am->am_argv) != AUDIT_FILTER_SUCCESS) { warnx("auditfilter_module_reinit: %s: failed", am->am_modulename);