aboutsummaryrefslogtreecommitdiffstats
path: root/libarchive/archive_read_support_format_iso9660.c
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2011-12-27 10:21:29 +0000
committerMartin Matuska <mm@FreeBSD.org>2011-12-27 10:21:29 +0000
commit1cd00a236b6b591357d4aa3d7d1d89bfbd92c2c9 (patch)
treefb64e53a49e16c5cb36036758aed48768d0596be /libarchive/archive_read_support_format_iso9660.c
parent7691a6970b48b047c4290c0837e91dcab450db90 (diff)
downloadsrc-1cd00a236b6b591357d4aa3d7d1d89bfbd92c2c9.tar.gz
src-1cd00a236b6b591357d4aa3d7d1d89bfbd92c2c9.zip
Update to vendor revision 4016
Notes
Notes: svn path=/vendor/libarchive/dist/; revision=228908
Diffstat (limited to 'libarchive/archive_read_support_format_iso9660.c')
-rw-r--r--libarchive/archive_read_support_format_iso9660.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c
index 2c1301ad57bb..85927444c187 100644
--- a/libarchive/archive_read_support_format_iso9660.c
+++ b/libarchive/archive_read_support_format_iso9660.c
@@ -1830,7 +1830,7 @@ parse_file_info(struct archive_read *a, struct file_info *parent,
(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, struct file_info *parent,
* 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");