Do not return ARCHIVE_WARN even if the current file cannot descend, simply returns...

SVN-Revision: 4187

diff --git a/libarchive/archive_read_disk_posix.c b/libarchive/archive_read_disk_posix.c
index 7ebe10acfa6373a7114e55605412f739c708b913..5e39516c95eb39b4557dd73a6df32661ad3f7f5f 100644 (file)
--- a/libarchive/archive_read_disk_posix.c
+++ b/libarchive/archive_read_disk_posix.c
@@ -1258,11 +1258,8 @@ archive_read_disk_descend(struct archive *_a)
            ARCHIVE_STATE_HEADER | ARCHIVE_STATE_DATA,
            "archive_read_disk_descend");
 
-       if (t->visit_type != TREE_REGULAR || !t->descend) {
-               archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
-                   "Ignored the request descending the current object");
-               return (ARCHIVE_WARN);
-       }
+       if (t->visit_type != TREE_REGULAR || !t->descend)
+               return (ARCHIVE_OK);
 
        if (tree_current_is_physical_dir(t)) {
                tree_push(t, t->basename, t->current_filesystem_id,

diff --git a/libarchive/archive_read_disk_windows.c b/libarchive/archive_read_disk_windows.c
index 3d9669f71a8fd76d7ff7010bd7315f8a88bbdfef..382276b84f391c09910340005cba5b12189f6085 100644 (file)
--- a/libarchive/archive_read_disk_windows.c
+++ b/libarchive/archive_read_disk_windows.c
@@ -1130,11 +1130,8 @@ archive_read_disk_descend(struct archive *_a)
            ARCHIVE_STATE_HEADER | ARCHIVE_STATE_DATA,
            "archive_read_disk_descend");
 
-       if (t->visit_type != TREE_REGULAR || !t->descend) {
-               archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
-                   "Ignored the request descending the current object");
-               return (ARCHIVE_WARN);
-       }
+       if (t->visit_type != TREE_REGULAR || !t->descend)
+               return (ARCHIVE_OK);
 
        if (tree_current_is_physical_dir(t)) {
                tree_push(t, t->basename, t->full_path.s,