Cleaned up archive_read_disk_descend functions.

diff --git a/libarchive/archive_read_disk_posix.c b/libarchive/archive_read_disk_posix.c
index 3ee6269ff3ce6cb64b7850a1ed27d91037c6e3ba..7e9b63bde5a9818d68d76ce55c23aeece47e11e0 100644 (file)
--- a/libarchive/archive_read_disk_posix.c
+++ b/libarchive/archive_read_disk_posix.c
@@ -1290,7 +1290,7 @@ 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)
+       if (!archive_read_disk_can_descend(_a))
                return (ARCHIVE_OK);
 
        /*

diff --git a/libarchive/archive_read_disk_windows.c b/libarchive/archive_read_disk_windows.c
index 877bc449a765c32df472af0104c5e6e365a0882f..4838969d8ae86b09854781faa77614f494fafada 100644 (file)
--- a/libarchive/archive_read_disk_windows.c
+++ b/libarchive/archive_read_disk_windows.c
@@ -1300,7 +1300,7 @@ 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)
+       if (!archive_read_disk_can_descend(_a))
                return (ARCHIVE_OK);
 
        if (tree_current_is_physical_dir(t)) {