From owner-p4-projects@FreeBSD.ORG  Thu May 27 10:39:28 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 758771065676; Thu, 27 May 2010 10:39:28 +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 2F2E4106566C
	for <perforce@FreeBSD.org>; Thu, 27 May 2010 10:39:28 +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 1C9FB8FC18
	for <perforce@FreeBSD.org>; Thu, 27 May 2010 10:39:28 +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 o4RAdRtg026156
	for <perforce@FreeBSD.org>; Thu, 27 May 2010 10:39:28 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4RAdRMI026154
	for perforce@freebsd.org; Thu, 27 May 2010 10:39:27 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Thu, 27 May 2010 10:39:27 GMT
Message-Id: <201005271039.o4RAdRMI026154@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 178871 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, 27 May 2010 10:39:28 -0000

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

Change 178871 by gcooper@gcooper-bayonetta on 2010/05/27 10:39:10

	style(8) fixes and better diagnose a make_play_pen failure.

Affected files ...

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

Differences ...

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

@@ -141,7 +141,7 @@
 		}
 	    }
 	    if ((where_to = make_playpen(playpen, sb.st_size * 4)) == NULL)
-		errx(1, "unable to make playpen for %lld bytes", (long long)sb.st_size * 4);
+		err(1, "unable to make playpen for %lld bytes", (long long)sb.st_size * 4);
 	    /* Since we can call ourselves recursively, keep notes on where we came from */
 	    if (!getenv("_TOP"))
 		setenv("_TOP", where_to, 1);
@@ -157,13 +157,12 @@
 		cfile = unpack_to_fd(pkg, CONTENTS_FNAME);
 
 	    if (cfile == -1) {
-		warnx(
-	"unable to open table of contents file '%s' - not a package?",
-		CONTENTS_FNAME);
+		warnx("unable to open table of contents file '%s' - not a "
+		    "package?", CONTENTS_FNAME);
 		goto bomb;
 	    }
 	    rc = read_plist(&Plist, cfile);
-	    close(cfile);
+	    (void) close(cfile);
 	    if (rc != 0)
 		goto bomb;