From owner-p4-projects@FreeBSD.ORG  Mon Oct 17 11:44:28 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 CD57D16A422; Mon, 17 Oct 2005 11:44:27 +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 36C6C16A41F
	for <perforce@freebsd.org>; Mon, 17 Oct 2005 11:44:27 +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 CA67A43D49
	for <perforce@freebsd.org>; Mon, 17 Oct 2005 11:44:26 +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 j9HBiQuX054255
	for <perforce@freebsd.org>; Mon, 17 Oct 2005 11:44:26 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 j9HBiQSF054252
	for perforce@freebsd.org; Mon, 17 Oct 2005 11:44:26 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 17 Oct 2005 11:44:26 GMT
Message-Id: <200510171144.j9HBiQSF054252@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 85427 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:44:28 -0000

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

Change 85427 by rwatson@rwatson_zoo on 2005/10/17 11:43:30

	Since kau_write() can't fail, and none of the callers check the
	return value, change the function to return void rather than int.

Affected files ...

.. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_audit.c#20 edit

Differences ...

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

@@ -86,18 +86,14 @@
 /*
  * Store the token with the record descriptor.
  */ 
-static int
+static void
 kau_write(struct au_record *rec, struct au_token *tok)
 {
 
-	/* XXXRW: KASSERT, void return instead? */
-	if (tok == NULL)
-		return -1; /* Invalid Token */
+	KASSERT(tok != NULL, ("kau_write: tok == NULL"));
 
 	TAILQ_INSERT_TAIL(&rec->token_q, tok, tokens);
 	rec->len += tok->len;
-	
-	return (0); 
 }
 
 /*