From owner-p4-projects@FreeBSD.ORG  Mon Oct 17 11:38:20 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9689916A422; Mon, 17 Oct 2005 11:38:19 +0000 (GMT)
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 6FD2F16A41F
	for <perforce@freebsd.org>; Mon, 17 Oct 2005 11:38:19 +0000 (GMT)
	(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 E8F1643D49
	for <perforce@freebsd.org>; Mon, 17 Oct 2005 11:38:18 +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 j9HBcIb3053890
	for <perforce@freebsd.org>; Mon, 17 Oct 2005 11:38:18 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 j9HBcI5I053887
	for perforce@freebsd.org; Mon, 17 Oct 2005 11:38:18 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 17 Oct 2005 11:38:18 GMT
Message-Id: <200510171138.j9HBcI5I053887@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 <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 85426 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Oct 2005 11:38:20 -0000

http://perforce.freebsd.org/chv.cgi?CH=85426

Change 85426 by rwatson@rwatson_zoo on 2005/10/17 11:37:46

	In FreeBSD, we use KASSERT(), so don't need a local assertion
	definition for the audit code (as was required in Darwin).

Affected files ...

.. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#47 edit

Differences ...

==== //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#47 (text+ko) ====

@@ -68,19 +68,6 @@
 #define	AUDIT_PRINTF(X)
 #endif
 
-#if 0
-#if DIAGNOSTIC
-#if defined(assert)
-#undef assert()
-#endif
-#define assert(cond)    \
-    ((void) ((cond) ? 0 : panic("%s:%d (%s)", __FILE__, __LINE__, # cond)))
-#else
-#include <kern/assert.h>
-#endif /* DIAGNOSTIC */
-#endif
-#define assert(x)	KASSERT(x, x)
-
 MALLOC_DEFINE(M_AUDIT, "audit", "Audit event records");
 
 /*