From owner-p4-projects@FreeBSD.ORG  Sun Dec 28 15:19:07 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3C3431065679; Sun, 28 Dec 2008 15:19:07 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0070A1065677
	for <perforce@freebsd.org>; Sun, 28 Dec 2008 15:19:07 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id DDB998FC29
	for <perforce@freebsd.org>; Sun, 28 Dec 2008 15:19:06 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBSFJ6dH074719
	for <perforce@freebsd.org>; Sun, 28 Dec 2008 15:19:06 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBSFJ6d3074717
	for perforce@freebsd.org; Sun, 28 Dec 2008 15:19:06 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 28 Dec 2008 15:19:06 GMT
Message-Id: <200812281519.mBSFJ6d3074717@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 155378 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: Sun, 28 Dec 2008 15:19:07 -0000

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

Change 155378 by rwatson@rwatson_lethe on 2008/12/28 15:18:20

	Eliminate warnings when building bsm_audit.c on systems without
	audit system calls: au_assemble() doesn't need all of its local
	variables.

Affected files ...

.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#35 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#35 (text+ko) ====

@@ -30,7 +30,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#34 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#35 $
  */
 
 #include <sys/types.h>
@@ -219,13 +219,16 @@
 static int
 au_assemble(au_record_t *rec, short event)
 {
+#ifdef HAVE_AUDIT_SYSCALLS
+	struct in6_addr *aptr;
+	struct auditinfo_addr aia;
+	struct timeval tm;
+	size_t hdrsize;
+#endif /* HAVE_AUDIT_SYSCALLS */
 	token_t *header, *tok, *trailer;
-	size_t tot_rec_size, hdrsize;
+	size_t tot_rec_size;
 	u_char *dptr;
-	struct in6_addr *aptr;
 	int error;
-	struct auditinfo_addr aia;
-	struct timeval tm;
 
 #ifdef HAVE_AUDIT_SYSCALLS
 	/*