Fix a couple of compiler errors.

SVN-Revision: 876

diff --git a/libarchive/archive_read.c b/libarchive/archive_read.c
index 62816c2a9018b60b27bb37655a1e7b60b3d97067..937950ea13f495a0c00b84b27eea4c8b8c2ef01e 100644 (file)
--- a/libarchive/archive_read.c
+++ b/libarchive/archive_read.c
@@ -120,12 +120,11 @@ archive_read_set_format_options(struct archive *_a, const char *s)
        size_t i;
        int len, r;
 
-       __archive_check_magic(&a->archive, ARCHIVE_READ_MAGIC,
-           ARCHIVE_STATE_NEW, "archive_read_set_format_options");
-
        if (s == NULL || *s == '\0')
                return (ARCHIVE_OK);
        a = (struct archive_read *)_a;
+       __archive_check_magic(&a->archive, ARCHIVE_READ_MAGIC,
+           ARCHIVE_STATE_NEW, "archive_read_set_format_options");
        len = 0;
        for (i = 0; i < sizeof(a->formats)/sizeof(a->formats[0]); i++) {
                format = &a->formats[i];
@@ -165,12 +164,11 @@ archive_read_set_filter_options(struct archive *_a, const char *s)
        char key[64], val[64];
        int len, r;
 
-       __archive_check_magic(&a->archive, ARCHIVE_READ_MAGIC,
-           ARCHIVE_STATE_NEW, "archive_read_set_filter_options");
-
        if (s == NULL || *s == '\0')
                return (ARCHIVE_OK);
        a = (struct archive_read *)_a;
+       __archive_check_magic(&a->archive, ARCHIVE_READ_MAGIC,
+           ARCHIVE_STATE_NEW, "archive_read_set_filter_options");
        filter = a->filter;
        len = 0;
        for (filter = a->filter; filter != NULL; filter = filter->upstream) {

diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c
index ff1aef43753241f4c84c0f816a61827e84c5ff08..60d42e65ec793b7246bba0b8081d4aac91830742 100644 (file)
--- a/libarchive/archive_write.c
+++ b/libarchive/archive_write.c
@@ -136,7 +136,7 @@ archive_write_set_format_options(struct archive *_a, const char *s)
 
        __archive_check_magic(&a->archive, ARCHIVE_WRITE_MAGIC,
            ARCHIVE_STATE_NEW, "archive_write_set_format_options");
-       archive_clear_error(a);
+       archive_clear_error(&a->archive);
 
        if (s == NULL || *s == '\0')
                return (ARCHIVE_OK);
@@ -180,7 +180,7 @@ archive_write_set_compressor_options(struct archive *_a, const char *s)
 
        __archive_check_magic(&a->archive, ARCHIVE_WRITE_MAGIC,
            ARCHIVE_STATE_NEW, "archive_write_set_compressor_options");
-       archive_clear_error(a);
+       archive_clear_error(&a->archive);
 
        if (s == NULL || *s == '\0')
                return (ARCHIVE_OK);