From owner-svn-src-all@FreeBSD.ORG  Tue Dec 27 10:21:29 2011
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 EB74E1065672;
	Tue, 27 Dec 2011 10:21:29 +0000 (UTC) (envelope-from mm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DA6438FC12;
	Tue, 27 Dec 2011 10:21:29 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pBRALTkr048599;
	Tue, 27 Dec 2011 10:21:29 GMT (envelope-from mm@svn.freebsd.org)
Received: (from mm@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBRALT5R048597;
	Tue, 27 Dec 2011 10:21:29 GMT (envelope-from mm@svn.freebsd.org)
Message-Id: <201112271021.pBRALT5R048597@svn.freebsd.org>
From: Martin Matuska <mm@FreeBSD.org>
Date: Tue, 27 Dec 2011 10:21:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-vendor@freebsd.org
X-SVN-Group: vendor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r228908 - vendor/libarchive/dist/libarchive
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: Tue, 27 Dec 2011 10:21:30 -0000

Author: mm
Date: Tue Dec 27 10:21:29 2011
New Revision: 228908
URL: http://svn.freebsd.org/changeset/base/228908

Log:
  Update to vendor revision 4016
  
  Obtained from:	http://libarchive.googlecode.com/svn/release/2.8

Modified:
  vendor/libarchive/dist/libarchive/archive_read_support_format_iso9660.c

Modified: vendor/libarchive/dist/libarchive/archive_read_support_format_iso9660.c
==============================================================================
--- vendor/libarchive/dist/libarchive/archive_read_support_format_iso9660.c	Tue Dec 27 10:16:24 2011	(r228907)
+++ vendor/libarchive/dist/libarchive/archive_read_support_format_iso9660.c	Tue Dec 27 10:21:29 2011	(r228908)
@@ -1830,7 +1830,7 @@ parse_file_info(struct archive_read *a, 
 		    (parent->re || parent->re_descendant))
 			file->re_descendant = 1;
 		if (file->cl_offset) {
-			struct file_info *p;
+			struct file_info *r;
 
 			if (parent == NULL || parent->parent == NULL) {
 				archive_set_error(&a->archive,
@@ -1858,8 +1858,8 @@ parse_file_info(struct archive_read *a, 
 			 * Sanity check: cl_offset does not point at its
 			 * the parents or itself.
 			 */
-			for (p = parent; p; p = p->parent) {
-				if (p->offset == file->cl_offset) {
+			for (r = parent; r; r = r->parent) {
+				if (r->offset == file->cl_offset) {
 					archive_set_error(&a->archive,
 					    ARCHIVE_ERRNO_MISC,
 					    "Invalid Rockridge CL");