Use archive_clear_error() to wipe the error info.

SVN-Revision: 1995

diff --git a/libarchive/archive_read_support_format_cpio.c b/libarchive/archive_read_support_format_cpio.c
index d0bc1d10e2ca14a04687b1fb969ce532aa9f50a5..04cceba417dfbbdaf41b54a149ecffa978774ab7 100644 (file)
--- a/libarchive/archive_read_support_format_cpio.c
+++ b/libarchive/archive_read_support_format_cpio.c
@@ -308,9 +308,9 @@ archive_read_format_cpio_read_header(struct archive_read *a,
 
        /* Compare name to "TRAILER!!!" to test for end-of-archive. */
        if (namelength == 11 && strcmp((const char *)h, "TRAILER!!!") == 0) {
-           /* TODO: Store file location of start of block. */
-           archive_set_error(&a->archive, 0, NULL);
-           return (ARCHIVE_EOF);
+               /* TODO: Store file location of start of block. */
+               archive_clear_error(&a->archive);
+               return (ARCHIVE_EOF);
        }
 
        /* Detect and record hardlinks to previously-extracted entries. */

diff --git a/libarchive/archive_read_support_format_tar.c b/libarchive/archive_read_support_format_tar.c
index 7d45dbd307ce3a744ec8f36fd1a446349e0e5848..c60d04baae922872bf872c8c53e66d7914b0e55c 100644 (file)
--- a/libarchive/archive_read_support_format_tar.c
+++ b/libarchive/archive_read_support_format_tar.c
@@ -577,7 +577,7 @@ tar_read_header(struct archive_read *a, struct tar *tar,
                h = __archive_read_ahead(a, 512, NULL);
                if (h != NULL)
                        __archive_read_consume(a, 512);
-               archive_set_error(&a->archive, 0, NULL);
+               archive_clear_error(&a->archive);
                if (a->archive.archive_format_name == NULL) {
                        a->archive.archive_format = ARCHIVE_FORMAT_TAR;
                        a->archive.archive_format_name = "tar";