From owner-p4-projects@FreeBSD.ORG  Sun Apr 11 20:57:17 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B38CA1065672; Sun, 11 Apr 2010 20:57:17 +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 781F8106564A
	for <perforce@FreeBSD.org>; Sun, 11 Apr 2010 20:57:17 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 2F7DC8FC15
	for <perforce@FreeBSD.org>; Sun, 11 Apr 2010 20:57:17 +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 o3BKvH2T007860
	for <perforce@FreeBSD.org>; Sun, 11 Apr 2010 20:57:17 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3BKvH02007856
	for perforce@freebsd.org; Sun, 11 Apr 2010 20:57:17 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Sun, 11 Apr 2010 20:57:17 GMT
Message-Id: <201004112057.o3BKvH02007856@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 176817 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: Sun, 11 Apr 2010 20:57:18 -0000

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

Change 176817 by gcooper@gcooper-bayonetta on 2010/04/11 20:57:00

	Simplify code a bit.
	
	- archive_read_data_skip call is unneeded because we're doing an in-order
	  traversal of the archive anyhow.
	- Thus, there's no reason why we should save the value of fnmatch(3) because
	  we're not reusing it anywhere else.
	- Fix indentation on multiline branch statement.

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/lib/file.c#7 edit

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/lib/file.c#7 (text+ko) ====

@@ -348,7 +348,7 @@
 	Boolean extract_whole_archive = FALSE;
 	const char *error = NULL;
 	const char *pkg_name_humanized;
-	int fn_ret = 0, r;
+	int r;
 
 	if (file_expr == NULL || strcmp("*", file_expr) == 0)
 		extract_whole_archive = TRUE;
@@ -374,8 +374,8 @@
 
 			/* Let's extract the whole archive, or just a file. */
 			if (extract_whole_archive == TRUE ||
-			    (fn_ret = fnmatch(file_expr,
-			     archive_entry_pathname(archive_entry),
+			    (fnmatch(file_expr,
+			         archive_entry_pathname(archive_entry),
 			         FNM_PATHNAME) == 0)) {
 
 				r = archive_read_extract(archive, archive_entry,
@@ -389,13 +389,6 @@
 
 			}
 
-			/*
-			 * Else let's skip the entry because we still haven't
-			 * found what we're looking for.
-			 */
-			else if (fn_ret == FNM_NOMATCH)
-				archive_read_data_skip(archive);
-
 		}
 
 	archive_read_finish(archive);