Merge r1243 from trunk. Equivalently:

Merge r192031 from FreeBSD-CURRENT: Eliminate redundant error messages.

SVN-Revision: 1250

diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c
index 6e12517b5e587a960c17303cef067422d6b40a1d..8f90191352aaea29e221babaad9393b798fb71fd 100644 (file)
--- a/libarchive/archive_read_disk_entry_from_file.c
+++ b/libarchive/archive_read_disk_entry_from_file.c
@@ -92,6 +92,7 @@ archive_read_disk_entry_from_file(struct archive *_a,
        int initial_fd = fd;
        int r, r1;
 
+       archive_clear_error(_a);
        path = archive_entry_sourcepath(entry);
        if (path == NULL)
                path = archive_entry_pathname(entry);