From owner-p4-projects@FreeBSD.ORG  Thu May 13 17:51:53 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 70F5E1065674; Thu, 13 May 2010 17:51:53 +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 358A4106566C
	for <perforce@FreeBSD.org>; Thu, 13 May 2010 17:51:53 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 233718FC14
	for <perforce@FreeBSD.org>; Thu, 13 May 2010 17:51:53 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4DHppgP046607
	for <perforce@FreeBSD.org>; Thu, 13 May 2010 17:51:51 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4DHppR0046605
	for perforce@freebsd.org; Thu, 13 May 2010 17:51:51 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Thu, 13 May 2010 17:51:51 GMT
Message-Id: <201005131751.o4DHppR0046605@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gcooper@FreeBSD.org using -f
From: Garrett Cooper <gcooper@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 178214 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Thu, 13 May 2010 17:51:53 -0000

http://p4web.freebsd.org/@@178214?ac=10

Change 178214 by gcooper@starr-bastion on 2010/05/13 17:51:29

	Remove the do-while(0). It's not required as this block of code does not
	require this as it's already properly partitioned off with an
	if-statement. 

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#23 edit

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#23 (text+ko) ====

@@ -431,13 +431,11 @@
 make_dist(const char *homedir, const char *pkg, const char *suff, Package *plist)
 {
 
-#define ADD_FILE(SRCFILE, DESTFILE, OPEN_FLAGS)				\
-	do {								\
-		if (error == NULL) {					\
-			error = add_file(archive, SRCFILE, DESTFILE,	\
-			    OPEN_FLAGS);				\
-		}							\
-	} while (0)
+#define ADD_FILE(SRCFILE, DESTFILE, OPEN_FLAGS)			\
+	if (error == NULL) {					\
+		error = add_file(archive, SRCFILE, DESTFILE,	\
+		    OPEN_FLAGS);				\
+	}
 
 	PackingList p;
 	struct archive *archive = NULL;