From 25baf53a023a69184537e7ce088c530f98a27bd2 Mon Sep 17 00:00:00 2001 From: Michihiro NAKAJIMA Date: Fri, 9 Oct 2009 08:10:26 -0400 Subject: [PATCH] Move setting of archive_format[_name] of Rock Ridge extensions to proper place. SVN-Revision: 1493 --- libarchive/archive_read_support_format_iso9660.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c index 93da99ad7..231ed5ef4 100644 --- a/libarchive/archive_read_support_format_iso9660.c +++ b/libarchive/archive_read_support_format_iso9660.c @@ -729,6 +729,12 @@ archive_read_format_iso9660_read_header(struct archive_read *a, } /* Store the root directory in the pending list. */ add_entry(iso9660, file); + if (iso9660->seenRockridge) { + a->archive.archive_format = + ARCHIVE_FORMAT_ISO9660_ROCKRIDGE; + a->archive.archive_format_name = + "ISO9660 with Rockridge extensions"; + } } /* Get the next entry that appears after the current offset. */ @@ -879,12 +885,6 @@ archive_read_format_iso9660_read_header(struct archive_read *a, return (ARCHIVE_FATAL); } add_entry(iso9660, child); - if (iso9660->seenRockridge) { - a->archive.archive_format = - ARCHIVE_FORMAT_ISO9660_ROCKRIDGE; - a->archive.archive_format_name = - "ISO9660 with Rockridge extensions"; - } } } } -- 2.47.3