PERFORCE change 178871 for review

[Garrett Cooper]

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

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