Merge r1052,r1055 from libarchive.googlecode.com:

Clear the error flag on entry to a few more API functions.

4 files changed, 5 insertions, 0 deletions

diff --git a/lib/libarchive/archive_read_open_fd.c b/lib/libarchive/archive_read_open_fd.c
index a7c2e29..259ddc2 100644
--- a/lib/libarchive/archive_read_open_fd.c
+++ b/lib/libarchive/archive_read_open_fd.c
@@ -66,6 +66,7 @@ archive_read_open_fd(struct archive *a, int fd, size_t block_size)
 	struct read_fd_data *mine;
 	void *b;
 
+	archive_clear_error(a);
 	if (fstat(fd, &st) != 0) {
 		archive_set_error(a, errno, "Can't stat fd %d", fd);
 		return (ARCHIVE_FATAL);
diff --git a/lib/libarchive/archive_read_open_file.c b/lib/libarchive/archive_read_open_file.c
index e77d447..37039e9 100644
--- a/lib/libarchive/archive_read_open_file.c
+++ b/lib/libarchive/archive_read_open_file.c
@@ -70,6 +70,7 @@ archive_read_open_FILE(struct archive *a, FILE *f)
 	size_t block_size = 128 * 1024;
 	void *b;
 
+	archive_clear_error(a);
 	mine = (struct read_FILE_data *)malloc(sizeof(*mine));
 	b = malloc(block_size);
 	if (mine == NULL || b == NULL) {
diff --git a/lib/libarchive/archive_read_open_filename.c b/lib/libarchive/archive_read_open_filename.c
index e86a93d..356fae9 100644
--- a/lib/libarchive/archive_read_open_filename.c
+++ b/lib/libarchive/archive_read_open_filename.c
@@ -84,6 +84,7 @@ archive_read_open_filename(struct archive *a, const char *filename,
 	void *b;
 	int fd;
 
+	archive_clear_error(a);
 	if (filename == NULL || filename[0] == '\0')
 		return (archive_read_open_fd(a, 0, block_size));
 
diff --git a/lib/libarchive/archive_read_support_compression_xz.c b/lib/libarchive/archive_read_support_compression_xz.c
index a3c9553..d3f4297 100644
--- a/lib/libarchive/archive_read_support_compression_xz.c
+++ b/lib/libarchive/archive_read_support_compression_xz.c
@@ -100,6 +100,7 @@ archive_read_support_compression_xz(struct archive *_a)
 	struct archive_read *a = (struct archive_read *)_a;
 	struct archive_read_filter_bidder *bidder = __archive_read_get_bidder(a);
 
+	archive_clear_error(_a);
 	if (bidder == NULL)
 		return (ARCHIVE_FATAL);
 
@@ -123,6 +124,7 @@ archive_read_support_compression_lzma(struct archive *_a)
 	struct archive_read *a = (struct archive_read *)_a;
 	struct archive_read_filter_bidder *bidder = __archive_read_get_bidder(a);
 
+	archive_clear_error(_a);
 	if (bidder == NULL)
 		return (ARCHIVE_FATAL);