Use archive_clear_error() to clear the error markers.

SVN-Revision: 3740

diff --git a/libarchive/archive_read_support_format_cpio.c b/libarchive/archive_read_support_format_cpio.c
index 1def0006a6e75e95a9af25b29874e24b7d8020c8..ed579b90cb372d8ad6e1993f8f757b13467f2ba7 100644 (file)
--- a/libarchive/archive_read_support_format_cpio.c
+++ b/libarchive/archive_read_support_format_cpio.c
@@ -264,9 +264,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 dae13dc6e0060de1a68fba046dcd76b24f19d324..8ddc779aae6962e26beb0cde4bb1efb9a24b6384 100644 (file)
--- a/libarchive/archive_read_support_format_tar.c
+++ b/libarchive/archive_read_support_format_tar.c
@@ -576,7 +576,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";