From owner-p4-projects@FreeBSD.ORG  Fri Aug 29 08:22:21 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 30C4A16A4C2; Fri, 29 Aug 2003 08:22:21 -0700 (PDT)
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 0C5D316A4BF
	for <perforce@freebsd.org>; Fri, 29 Aug 2003 08:22:21 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 64D7F43FB1
	for <perforce@freebsd.org>; Fri, 29 Aug 2003 08:22:20 -0700 (PDT)
	(envelope-from cvance@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7TFMK0U029482
	for <perforce@freebsd.org>; Fri, 29 Aug 2003 08:22:20 -0700 (PDT)
	(envelope-from cvance@nailabs.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7TFMJM6029479
	for perforce@freebsd.org; Fri, 29 Aug 2003 08:22:19 -0700 (PDT)
Date: Fri, 29 Aug 2003 08:22:19 -0700 (PDT)
Message-Id: <200308291522.h7TFMJM6029479@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cvance@nailabs.com using -f
From: Chris Vance <cvance@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 37180 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Fri, 29 Aug 2003 15:22:21 -0000

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

Change 37180 by cvance@cvance_korben on 2003/08/29 08:21:42

	Fix comma bug -- when we unwind, 'first' was incorrect.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#408 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#408 (text+ko) ====

@@ -459,10 +459,9 @@
 		 } else							\
 			ignorenotfound = 0;				\
 		savedlen = sbuf_len(&sb);				\
-		if (first) {						\
+		if (first)						\
 			error = sbuf_printf(&sb, "%s/", element_name);	\
-			first = 0;					\
-		} else							\
+		else							\
 			error = sbuf_printf(&sb, ",%s/", element_name);	\
 		if (error == -1) {					\
 			error = EINVAL;	/* XXX: E2BIG? */		\
@@ -479,6 +478,8 @@
 		} else if (claimed != 1) {				\
 			error = EINVAL;	/* XXX: ENOLABEL? */		\
 			break;						\
+		} else {						\
+			first = 0;					\
 		}							\
 	}								\
 	sbuf_finish(&sb);						\