PERFORCE change 178875 for review

Garrett Cooper gcooper at FreeBSD.org
Thu May 27 11:26:21 UTC 2010


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

Change 178875 by gcooper at 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;
 	    }


More information about the p4-projects mailing list