Date: Tue, 27 Dec 2011 10:21:29 +0000 (UTC) From: Martin Matuska <mm@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r228908 - vendor/libarchive/dist/libarchive Message-ID: <201112271021.pBRALT5R048597@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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");
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201112271021.pBRALT5R048597>