From: Charles Wilson <cwilso11@gmail.com>
Date: Mon, 20 Jul 2009 05:14:00 +0000 (-0400)
Subject: Merge r1243 from trunk. Equivalently:
X-Git-Tag: v2.7.1~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c1b7f1c376dd476a47ad28f2b73b173e1df710ca;p=thirdparty%2Flibarchive.git

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 6e12517b5..8f9019135 100644
--- 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);