From owner-p4-projects@FreeBSD.ORG  Thu May 27 11:26:21 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7559C1065676; Thu, 27 May 2010 11:26:21 +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 39E3E106566C
	for <perforce@FreeBSD.org>; Thu, 27 May 2010 11:26:21 +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 274698FC13
	for <perforce@FreeBSD.org>; Thu, 27 May 2010 11:26:21 +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 o4RBQLJZ030676
	for <perforce@FreeBSD.org>; Thu, 27 May 2010 11:26:21 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4RBQLxj030674
	for perforce@freebsd.org; Thu, 27 May 2010 11:26:21 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Thu, 27 May 2010 11:26:21 GMT
Message-Id: <201005271126.o4RBQLxj030674@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 178875 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 11:26:21 -0000

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

Change 178875 by gcooper@gcooper-bayonetta on 2010/05/27 11:25:24

	Get rid of the unused [and improperly initialized] variable extract as
	it was superceded by extract_whole_archive_from_stdin in @176831.

Affected files ...

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

Differences ...

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

@@ -71,7 +71,6 @@
     char pre_arg[FILENAME_MAX], post_arg[FILENAME_MAX];
     char *conflict[2];
     char **matched;
-    char *extract;
     const char *where_to;
     int cfile;
     int code;
@@ -197,7 +196,7 @@
 	     * compress an average of 75%, so multiply by 4 for good measure.
 	     */
 
-	    if (!extract && !inPlace && min_free(playpen) < sb.st_size * 4) {
+	    if (!inPlace && min_free(playpen) < sb.st_size * 4) {
 		warnx("projected size of %lld exceeds available free space.\n"
 "Please set your PKG_TMPDIR variable to point to a location with more\n"
 		       "free space and try again", (long long)sb.st_size * 4);
@@ -212,7 +211,7 @@
 
 	    /* Finally unpack the whole mess.  If extract is null we
 	       already + did so so don't bother doing it again. */
-	    if (extract && unpack_to_disk(pkg, NULL)) {
+	    if (unpack_to_disk(pkg, NULL)) {
 		warnx("unable to extract '%s'!", pkg);
 		goto bomb;
 	    }