From owner-svn-src-all@FreeBSD.ORG  Sun Mar  8 05:35:59 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 86866106572A;
	Sun,  8 Mar 2009 05:35:59 +0000 (UTC)
	(envelope-from kientzle@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 74B108FC16;
	Sun,  8 Mar 2009 05:35:59 +0000 (UTC)
	(envelope-from kientzle@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n285Zxa7073424;
	Sun, 8 Mar 2009 05:35:59 GMT (envelope-from kientzle@svn.freebsd.org)
Received: (from kientzle@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n285Zx08073423;
	Sun, 8 Mar 2009 05:35:59 GMT (envelope-from kientzle@svn.freebsd.org)
Message-Id: <200903080535.n285Zx08073423@svn.freebsd.org>
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Sun, 8 Mar 2009 05:35:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r189518 - head/usr.bin/tar
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Mar 2009 05:36:00 -0000

Author: kientzle
Date: Sun Mar  8 05:35:59 2009
New Revision: 189518
URL: http://svn.freebsd.org/changeset/base/189518

Log:
  Merge r622 from libarchive.googlecode.com:  Avoid warning on platforms
  that lack regex.h.

Modified:
  head/usr.bin/tar/util.c

Modified: head/usr.bin/tar/util.c
==============================================================================
--- head/usr.bin/tar/util.c	Sun Mar  8 05:34:20 2009	(r189517)
+++ head/usr.bin/tar/util.c	Sun Mar  8 05:35:59 2009	(r189518)
@@ -453,8 +453,8 @@ edit_pathname(struct bsdtar *bsdtar, str
 	const char *name = archive_entry_pathname(entry);
 #if HAVE_REGEX_H
 	char *subst_name;
-#endif
 	int r;
+#endif
 
 #if HAVE_REGEX_H
 	r = apply_substitution(bsdtar, name, &subst_name, 0);