diff options
| author | Michihiro NAKAJIMA <ggcueroad@gmail.com> | 2012-01-19 06:56:38 -0500 |
|---|---|---|
| committer | Michihiro NAKAJIMA <ggcueroad@gmail.com> | 2012-01-19 06:56:38 -0500 |
| commit | 309265ddf6c95057b6f75b510d15c9980bb76d9b (patch) | |
| tree | 371288f9b3bfdbb42f79d31da57e015384650aae /libarchive/archive_read_disk_windows.c | |
| parent | ffa08263e3add5f077e444cde2b1488be2984360 (diff) | |
| download | libarchive-309265ddf6c95057b6f75b510d15c9980bb76d9b.tar.gz | |
Do not return ARCHIVE_WARN even if the current file cannot descend, simply returns ARCHIVE_OK.
SVN-Revision: 4187
Diffstat (limited to 'libarchive/archive_read_disk_windows.c')
| -rw-r--r-- | libarchive/archive_read_disk_windows.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libarchive/archive_read_disk_windows.c b/libarchive/archive_read_disk_windows.c index 3d9669f7..382276b8 100644 --- 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, |