Replace deprecated macro ARCHIVE_COMPRESSION_* by ARCHIVE_FILTER_*.

diff --git a/libarchive/archive_read.c b/libarchive/archive_read.c
index bfd0bdbf7fadf9df4644daf4b478170a16f98b62..edd9ab57c06898a23b403ac9325124f48400b9b8 100644 (file)
--- a/libarchive/archive_read.c
+++ b/libarchive/archive_read.c
@@ -500,7 +500,7 @@ archive_read_open1(struct archive *_a)
        filter->close = client_close_proxy;
        filter->sswitch = client_switch_proxy;
        filter->name = "none";
-       filter->code = ARCHIVE_COMPRESSION_NONE;
+       filter->code = ARCHIVE_FILTER_NONE;
        a->filter = filter;
 
        client_switch_proxy(a->filter, 0);

diff --git a/libarchive/archive_read_support_filter_bzip2.c b/libarchive/archive_read_support_filter_bzip2.c
index 96647ee2a7c46cb94e41baa86d91f6a69c6d8e90..4d07e81d0d01419d407e25f567f69869de384f69 100644 (file)
--- a/libarchive/archive_read_support_filter_bzip2.c
+++ b/libarchive/archive_read_support_filter_bzip2.c
@@ -174,7 +174,7 @@ bzip2_reader_init(struct archive_read_filter *self)
        /* Note: We set the format here even if __archive_read_programl()
         * above fails.  We do, after all, know what the format is
         * even if we weren't able to read it. */
-       self->code = ARCHIVE_COMPRESSION_BZIP2;
+       self->code = ARCHIVE_FILTER_BZIP2;
        self->name = "bzip2";
        return (r);
 }
@@ -192,7 +192,7 @@ bzip2_reader_init(struct archive_read_filter *self)
        void *out_block;
        struct private_data *state;
 
-       self->code = ARCHIVE_COMPRESSION_BZIP2;
+       self->code = ARCHIVE_FILTER_BZIP2;
        self->name = "bzip2";
 
        state = (struct private_data *)calloc(sizeof(*state), 1);

diff --git a/libarchive/archive_read_support_filter_compress.c b/libarchive/archive_read_support_filter_compress.c
index 1b8530004fbba8b08b36610f097860c278c45462..b8b6260308cdfd55d061d60c1ffcfff4dbf14faf 100644 (file)
--- a/libarchive/archive_read_support_filter_compress.c
+++ b/libarchive/archive_read_support_filter_compress.c
@@ -212,7 +212,7 @@ compress_bidder_init(struct archive_read_filter *self)
        void *out_block;
        int code;
 
-       self->code = ARCHIVE_COMPRESSION_COMPRESS;
+       self->code = ARCHIVE_FILTER_COMPRESS;
        self->name = "compress (.Z)";
 
        state = (struct private_data *)calloc(sizeof(*state), 1);

diff --git a/libarchive/archive_read_support_filter_gzip.c b/libarchive/archive_read_support_filter_gzip.c
index c0feb8aa974942a83531419af486988c2158e577..fb3d1f4ae9e86051465b6bf3c64df7e518724e82 100644 (file)
--- a/libarchive/archive_read_support_filter_gzip.c
+++ b/libarchive/archive_read_support_filter_gzip.c
@@ -235,7 +235,7 @@ gzip_bidder_init(struct archive_read_filter *self)
        /* Note: We set the format here even if __archive_read_programl()
         * above fails.  We do, after all, know what the format is
         * even if we weren't able to read it. */
-       self->code = ARCHIVE_COMPRESSION_GZIP;
+       self->code = ARCHIVE_FILTER_GZIP;
        self->name = "gzip";
        return (r);
 }
@@ -252,7 +252,7 @@ gzip_bidder_init(struct archive_read_filter *self)
        static const size_t out_block_size = 64 * 1024;
        void *out_block;
 
-       self->code = ARCHIVE_COMPRESSION_GZIP;
+       self->code = ARCHIVE_FILTER_GZIP;
        self->name = "gzip";
 
        state = (struct private_data *)calloc(sizeof(*state), 1);

diff --git a/libarchive/archive_read_support_filter_lrzip.c b/libarchive/archive_read_support_filter_lrzip.c
index 08051d2780469dfb245eb97cc496666a98861fef..2cfd76e8882863ccad2991df9b67a93a9121ee87 100644 (file)
--- a/libarchive/archive_read_support_filter_lrzip.c
+++ b/libarchive/archive_read_support_filter_lrzip.c
@@ -123,7 +123,7 @@ lrzip_bidder_init(struct archive_read_filter *self)
        /* Note: We set the format here even if __archive_read_programl()
         * above fails.  We do, after all, know what the format is
         * even if we weren't able to read it. */
-       self->code = ARCHIVE_COMPRESSION_LRZIP;
+       self->code = ARCHIVE_FILTER_LRZIP;
        self->name = "lrzip";
        return (r);
 }

diff --git a/libarchive/archive_read_support_filter_program.c b/libarchive/archive_read_support_filter_program.c
index 344f5a989b88b8952a8f0671cf8b34eed5897880..f2b0e0df94dc2726891983f8d286d62daa7cab44 100644 (file)
--- a/libarchive/archive_read_support_filter_program.c
+++ b/libarchive/archive_read_support_filter_program.c
@@ -664,7 +664,7 @@ __archive_read_programv(struct archive_read_filter *self, const char *cmd,
                archive_strcat(&state->description, argv[i]);
        }
 
-       self->code = ARCHIVE_COMPRESSION_PROGRAM;
+       self->code = ARCHIVE_FILTER_PROGRAM;
        self->name = state->description.s;
 
        state->out_buf = out_buf;

diff --git a/libarchive/archive_read_support_filter_rpm.c b/libarchive/archive_read_support_filter_rpm.c
index 1b3e124204f1dba58e7540a9b280c6d432ef0f54..237d9801556185dcb991fb4903c3e9f27f9ab97c 100644 (file)
--- a/libarchive/archive_read_support_filter_rpm.c
+++ b/libarchive/archive_read_support_filter_rpm.c
@@ -137,7 +137,7 @@ rpm_bidder_init(struct archive_read_filter *self)
 {
        struct rpm   *rpm;
 
-       self->code = ARCHIVE_COMPRESSION_RPM;
+       self->code = ARCHIVE_FILTER_RPM;
        self->name = "rpm";
        self->read = rpm_filter_read;
        self->skip = NULL; /* not supported */

diff --git a/libarchive/archive_read_support_filter_uu.c b/libarchive/archive_read_support_filter_uu.c
index 42223f1b7841bb6475b8eb65788eb0123cbef160..be27037970a5843471329f1a955a50e3dc243b28 100644 (file)
--- a/libarchive/archive_read_support_filter_uu.c
+++ b/libarchive/archive_read_support_filter_uu.c
@@ -378,7 +378,7 @@ uudecode_bidder_init(struct archive_read_filter *self)
        void *out_buff;
        void *in_buff;
 
-       self->code = ARCHIVE_COMPRESSION_UU;
+       self->code = ARCHIVE_FILTER_UU;
        self->name = "uu";
        self->read = uudecode_filter_read;
        self->skip = NULL; /* not supported */

diff --git a/libarchive/archive_read_support_filter_xz.c b/libarchive/archive_read_support_filter_xz.c
index baf318840a76f06eccc027eba66b6cde4a1a2d75..e94c29e3f366402873836033f409e37cbc556366 100644 (file)
--- a/libarchive/archive_read_support_filter_xz.c
+++ b/libarchive/archive_read_support_filter_xz.c
@@ -415,7 +415,7 @@ lzip_bidder_bid(struct archive_read_filter_bidder *self,
 static int
 xz_bidder_init(struct archive_read_filter *self)
 {
-       self->code = ARCHIVE_COMPRESSION_XZ;
+       self->code = ARCHIVE_FILTER_XZ;
        self->name = "xz";
        return (xz_lzma_bidder_init(self));
 }
@@ -423,7 +423,7 @@ xz_bidder_init(struct archive_read_filter *self)
 static int
 lzma_bidder_init(struct archive_read_filter *self)
 {
-       self->code = ARCHIVE_COMPRESSION_LZMA;
+       self->code = ARCHIVE_FILTER_LZMA;
        self->name = "lzma";
        return (xz_lzma_bidder_init(self));
 }
@@ -431,7 +431,7 @@ lzma_bidder_init(struct archive_read_filter *self)
 static int
 lzip_bidder_init(struct archive_read_filter *self)
 {
-       self->code = ARCHIVE_COMPRESSION_LZIP;
+       self->code = ARCHIVE_FILTER_LZIP;
        self->name = "lzip";
        return (xz_lzma_bidder_init(self));
 }
@@ -518,7 +518,7 @@ xz_lzma_bidder_init(struct archive_read_filter *self)
        state->stream.avail_out = state->out_block_size;
 
        state->crc32 = 0;
-       if (self->code == ARCHIVE_COMPRESSION_LZIP) {
+       if (self->code == ARCHIVE_FILTER_LZIP) {
                /*
                 * We have to read a lzip header and use it to initialize
                 * compression library, thus we cannot initialize the
@@ -530,7 +530,7 @@ xz_lzma_bidder_init(struct archive_read_filter *self)
                state->in_stream = 1;
 
        /* Initialize compression library. */
-       if (self->code == ARCHIVE_COMPRESSION_XZ)
+       if (self->code == ARCHIVE_FILTER_XZ)
                ret = lzma_stream_decoder(&(state->stream),
                    LZMA_MEMLIMIT,/* memlimit */
                    LZMA_CONCATENATED);
@@ -730,7 +730,7 @@ xz_filter_read(struct archive_read_filter *self, const void **p)
                *p = NULL;
        else {
                *p = state->out_block;
-               if (self->code == ARCHIVE_COMPRESSION_LZIP) {
+               if (self->code == ARCHIVE_FILTER_LZIP) {
                        state->crc32 = lzma_crc32(state->out_block,
                            decompressed, state->crc32);
                        if (state->eof) {
@@ -778,7 +778,7 @@ lzma_bidder_init(struct archive_read_filter *self)
        struct private_data *state;
        ssize_t ret, avail_in;
 
-       self->code = ARCHIVE_COMPRESSION_LZMA;
+       self->code = ARCHIVE_FILTER_LZMA;
        self->name = "lzma";
 
        state = (struct private_data *)calloc(sizeof(*state), 1);
@@ -945,7 +945,7 @@ lzma_bidder_init(struct archive_read_filter *self)
        /* Note: We set the format here even if __archive_read_programl()
         * above fails.  We do, after all, know what the format is
         * even if we weren't able to read it. */
-       self->code = ARCHIVE_COMPRESSION_LZMA;
+       self->code = ARCHIVE_FILTER_LZMA;
        self->name = "lzma";
        return (r);
 }
@@ -962,7 +962,7 @@ xz_bidder_init(struct archive_read_filter *self)
        /* Note: We set the format here even if __archive_read_programl()
         * above fails.  We do, after all, know what the format is
         * even if we weren't able to read it. */
-       self->code = ARCHIVE_COMPRESSION_XZ;
+       self->code = ARCHIVE_FILTER_XZ;
        self->name = "xz";
        return (r);
 }
@@ -976,7 +976,7 @@ lzip_bidder_init(struct archive_read_filter *self)
        /* Note: We set the format here even if __archive_read_programl()
         * above fails.  We do, after all, know what the format is
         * even if we weren't able to read it. */
-       self->code = ARCHIVE_COMPRESSION_LZIP;
+       self->code = ARCHIVE_FILTER_LZIP;
        self->name = "lzip";
        return (r);
 }

diff --git a/libarchive/archive_write_add_filter_bzip2.c b/libarchive/archive_write_add_filter_bzip2.c
index 2b48959ee0933f4f1694b09476dccbe0f5bcb522..022f7282f99d1345ed04ff4a40dfdd0a78416b8c 100644 (file)
--- a/libarchive/archive_write_add_filter_bzip2.c
+++ b/libarchive/archive_write_add_filter_bzip2.c
@@ -115,7 +115,7 @@ archive_write_add_filter_bzip2(struct archive *_a)
        f->close = &archive_compressor_bzip2_close;
        f->free = &archive_compressor_bzip2_free;
        f->open = &archive_compressor_bzip2_open;
-       f->code = ARCHIVE_COMPRESSION_BZIP2;
+       f->code = ARCHIVE_FILTER_BZIP2;
        f->name = "bzip2";
        return (ARCHIVE_OK);
 }

diff --git a/libarchive/archive_write_add_filter_compress.c b/libarchive/archive_write_add_filter_compress.c
index 4923316f5d8a73e23cb97c29ddd6d8335dd5cdfa..26fcef4d42bc3e6b740431b870700925756c4ab5 100644 (file)
--- a/libarchive/archive_write_add_filter_compress.c
+++ b/libarchive/archive_write_add_filter_compress.c
@@ -135,7 +135,7 @@ archive_write_add_filter_compress(struct archive *_a)
        archive_check_magic(&a->archive, ARCHIVE_WRITE_MAGIC,
            ARCHIVE_STATE_NEW, "archive_write_add_filter_compress");
        f->open = &archive_compressor_compress_open;
-       f->code = ARCHIVE_COMPRESSION_COMPRESS;
+       f->code = ARCHIVE_FILTER_COMPRESS;
        f->name = "compress";
        return (ARCHIVE_OK);
 }
@@ -150,7 +150,7 @@ archive_compressor_compress_open(struct archive_write_filter *f)
        struct private_data *state;
        size_t bs = 65536, bpb;
 
-       f->code = ARCHIVE_COMPRESSION_COMPRESS;
+       f->code = ARCHIVE_FILTER_COMPRESS;
        f->name = "compress";
 
        ret = __archive_write_open_filter(f->next_filter);

diff --git a/libarchive/archive_write_add_filter_gzip.c b/libarchive/archive_write_add_filter_gzip.c
index b1564774fd51c55955e972f69bfe27d99ecd0dbf..b29dac18e312c947ca6ab9ac8cdb21c8b7f6d7f8 100644 (file)
--- a/libarchive/archive_write_add_filter_gzip.c
+++ b/libarchive/archive_write_add_filter_gzip.c
@@ -115,7 +115,7 @@ archive_write_add_filter_gzip(struct archive *_a)
        f->options = &archive_compressor_gzip_options;
        f->close = &archive_compressor_gzip_close;
        f->free = &archive_compressor_gzip_free;
-       f->code = ARCHIVE_COMPRESSION_GZIP;
+       f->code = ARCHIVE_FILTER_GZIP;
        f->name = "gzip";
        return (ARCHIVE_OK);
 }

diff --git a/libarchive/archive_write_add_filter_xz.c b/libarchive/archive_write_add_filter_xz.c
index 834d596701675c3e73f73a6458e2527c9736145b..fa73311e7ef42eb616113f1b7f5c2996fd0d662f 100644 (file)
--- a/libarchive/archive_write_add_filter_xz.c
+++ b/libarchive/archive_write_add_filter_xz.c
@@ -172,7 +172,7 @@ archive_write_add_filter_xz(struct archive *_a)
        f = __archive_write_allocate_filter(_a);
        r = common_setup(f);
        if (r == ARCHIVE_OK) {
-               f->code = ARCHIVE_COMPRESSION_XZ;
+               f->code = ARCHIVE_FILTER_XZ;
                f->name = "xz";
        }
        return (r);
@@ -192,7 +192,7 @@ archive_write_add_filter_lzma(struct archive *_a)
        f = __archive_write_allocate_filter(_a);
        r = common_setup(f);
        if (r == ARCHIVE_OK) {
-               f->code = ARCHIVE_COMPRESSION_LZMA;
+               f->code = ARCHIVE_FILTER_LZMA;
                f->name = "lzma";
        }
        return (r);
@@ -209,7 +209,7 @@ archive_write_add_filter_lzip(struct archive *_a)
        f = __archive_write_allocate_filter(_a);
        r = common_setup(f);
        if (r == ARCHIVE_OK) {
-               f->code = ARCHIVE_COMPRESSION_LZIP;
+               f->code = ARCHIVE_FILTER_LZIP;
                f->name = "lzip";
        }
        return (r);
@@ -225,12 +225,12 @@ archive_compressor_xz_init_stream(struct archive_write_filter *f,
        data->stream = lzma_stream_init_data;
        data->stream.next_out = data->compressed;
        data->stream.avail_out = data->compressed_buffer_size;
-       if (f->code == ARCHIVE_COMPRESSION_XZ)
+       if (f->code == ARCHIVE_FILTER_XZ)
                ret = lzma_stream_encoder(&(data->stream),
                    data->lzmafilters, LZMA_CHECK_CRC64);
-       else if (f->code == ARCHIVE_COMPRESSION_LZMA)
+       else if (f->code == ARCHIVE_FILTER_LZMA)
                ret = lzma_alone_encoder(&(data->stream), &data->lzma_opt);
-       else {  /* ARCHIVE_COMPRESSION_LZIP */
+       else {  /* ARCHIVE_FILTER_LZIP */
                int dict_size = data->lzma_opt.dict_size;
                int ds, log2dic, wedges;
 
@@ -321,7 +321,7 @@ archive_compressor_xz_open(struct archive_write_filter *f)
        f->write = archive_compressor_xz_write;
 
        /* Initialize compression library. */
-       if (f->code == ARCHIVE_COMPRESSION_LZIP) {
+       if (f->code == ARCHIVE_FILTER_LZIP) {
                const struct option_value *val =
                    &option_values[data->compression_level];
 
@@ -393,7 +393,7 @@ archive_compressor_xz_write(struct archive_write_filter *f,
 
        /* Update statistics */
        data->total_in += length;
-       if (f->code == ARCHIVE_COMPRESSION_LZIP)
+       if (f->code == ARCHIVE_FILTER_LZIP)
                data->crc32 = lzma_crc32(buff, length, data->crc32);
 
        /* Compress input data to output buffer */
@@ -422,7 +422,7 @@ archive_compressor_xz_close(struct archive_write_filter *f)
                ret = __archive_write_filter(f->next_filter,
                    data->compressed,
                    data->compressed_buffer_size - data->stream.avail_out);
-               if (f->code == ARCHIVE_COMPRESSION_LZIP && ret == ARCHIVE_OK) {
+               if (f->code == ARCHIVE_FILTER_LZIP && ret == ARCHIVE_OK) {
                        archive_le32enc(data->compressed, data->crc32);
                        archive_le64enc(data->compressed+4, data->total_in);
                        archive_le64enc(data->compressed+12, data->total_out + 20);

diff --git a/libarchive/test/test_compat_bzip2.c b/libarchive/test/test_compat_bzip2.c
index 2c359914ee76b7124e85fa5f6f1d5db14823b654..7df086ff382de3c4ea00b0daf6f24234d8fc6150 100644 (file)
--- a/libarchive/test/test_compat_bzip2.c
+++ b/libarchive/test/test_compat_bzip2.c
@@ -67,12 +67,12 @@ compat_bzip2(const char *name)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify that the format detection worked. */
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_BZIP2);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_BZIP2);
        assertEqualString(archive_filter_name(a, 0), "bzip2");
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
 
        assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_BZIP2);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_BZIP2);
        assertEqualString(archive_filter_name(a, 0), "bzip2");
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
 

diff --git a/libarchive/test/test_compat_cpio.c b/libarchive/test/test_compat_cpio.c
index 4433b514b0ee39aa263271093920df1de53f391d..0c8b042325217268356d551eed3acb7b1112de00 100644 (file)
--- a/libarchive/test/test_compat_cpio.c
+++ b/libarchive/test/test_compat_cpio.c
@@ -90,7 +90,7 @@ test_compat_cpio_1(void)
        assertEqualInt(0100644, archive_entry_mode(ae));
 
        /* Verify that the format detection worked. */
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_NONE);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_NONE);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_CPIO_SVR4_NOCRC);
 
        assertEqualInt(ARCHIVE_OK, archive_read_close(a));

diff --git a/libarchive/test/test_compat_gtar.c b/libarchive/test/test_compat_gtar.c
index 6cb5b88db805f24ac1a84c613fd229ba958ce845..3d5e456e56e6c9908fc6295ab5b5537b18900932 100644 (file)
--- a/libarchive/test/test_compat_gtar.c
+++ b/libarchive/test/test_compat_gtar.c
@@ -99,7 +99,7 @@ test_compat_gtar_1(void)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify that the format detection worked. */
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_NONE);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_NONE);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_GNUTAR);
 
        assertEqualInt(ARCHIVE_OK, archive_read_close(a));

diff --git a/libarchive/test/test_compat_gzip.c b/libarchive/test/test_compat_gzip.c
index eef8fa1a74e0ce084340d560f98c16253062fed1..befb825c8ce6b8393554a8db194911c3c00cf798 100644 (file)
--- a/libarchive/test/test_compat_gzip.c
+++ b/libarchive/test/test_compat_gzip.c
@@ -74,7 +74,7 @@ verify(const char *name)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify that the format detection worked. */
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_GZIP);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_GZIP);
        assertEqualString(archive_filter_name(a, 0), "gzip");
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
 

diff --git a/libarchive/test/test_compat_lzip.c b/libarchive/test/test_compat_lzip.c
index 12cc88b1cbc6eea096fce90facee30c82910497e..8f4e06d3af77fd8c4d6a7cadf9ac2117f63900f7 100644 (file)
--- a/libarchive/test/test_compat_lzip.c
+++ b/libarchive/test/test_compat_lzip.c
@@ -121,7 +121,7 @@ compat_lzip(const char *name)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify that the format detection worked. */
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_LZIP);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_LZIP);
        assertEqualString(archive_filter_name(a, 0), "lzip");
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
 

diff --git a/libarchive/test/test_compat_lzma.c b/libarchive/test/test_compat_lzma.c
index 3535744842fae9b9814e06875731117ce7f9e264..86a2665b35181617600a2f45b46d9dceb9019bbb 100644 (file)
--- a/libarchive/test/test_compat_lzma.c
+++ b/libarchive/test/test_compat_lzma.c
@@ -130,7 +130,7 @@ compat_lzma(const char *name)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify that the format detection worked. */
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_LZMA);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_LZMA);
        assertEqualString(archive_filter_name(a, 0), "lzma");
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
 

diff --git a/libarchive/test/test_compat_mac.c b/libarchive/test/test_compat_mac.c
index 4f2db79dcfc24cfa071c1e3e377ccb2f4afe1cab..c7e852521aad25a33956ba55ff4cf89a8bb67923 100644 (file)
--- a/libarchive/test/test_compat_mac.c
+++ b/libarchive/test/test_compat_mac.c
@@ -127,7 +127,7 @@ test_compat_mac_1(void)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify that the format detection worked. */
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_COMPRESS);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_COMPRESS);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_GNUTAR);
 
        assertEqualInt(ARCHIVE_OK, archive_read_close(a));
@@ -197,7 +197,7 @@ test_compat_mac_2(void)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify that the format detection worked. */
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_COMPRESS);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_COMPRESS);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
 
        assertEqualInt(ARCHIVE_OK, archive_read_close(a));

diff --git a/libarchive/test/test_compat_tar_hardlink.c b/libarchive/test/test_compat_tar_hardlink.c
index 38830884e66e845b7613c864c37a2b6f4a6682a8..73a4d54f97faff0ba32270240ea72685b9d0294d 100644 (file)
--- a/libarchive/test/test_compat_tar_hardlink.c
+++ b/libarchive/test/test_compat_tar_hardlink.c
@@ -89,7 +89,7 @@ test_compat_tar_hardlink_1(void)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify that the format detection worked. */
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_NONE);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_NONE);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR);
 
        assertEqualInt(ARCHIVE_OK, archive_read_close(a));

diff --git a/libarchive/test/test_compat_xz.c b/libarchive/test/test_compat_xz.c
index 089435a269110a8678da1b24172380b7c693f6c0..572729c48542474c1a3b77a6a43cc0df6938fa2e 100644 (file)
--- a/libarchive/test/test_compat_xz.c
+++ b/libarchive/test/test_compat_xz.c
@@ -69,7 +69,7 @@ compat_xz(const char *name)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify that the format detection worked. */
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_XZ);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_XZ);
        assertEqualString(archive_filter_name(a, 0), "xz");
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
 

diff --git a/libarchive/test/test_compat_zip.c b/libarchive/test/test_compat_zip.c
index bb7231089349a91bf1c8907f29ad04b3c57e27e8..82cd023c09e8474081d1a3c745c51f719e954bcd 100644 (file)
--- a/libarchive/test/test_compat_zip.c
+++ b/libarchive/test/test_compat_zip.c
@@ -62,7 +62,7 @@ test_compat_zip_1(void)
 
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_NONE);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_NONE);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_ZIP);
 
 finish:

diff --git a/libarchive/test/test_read_filter_lrzip.c b/libarchive/test/test_read_filter_lrzip.c
index fc7c0d7ba21371263147c7bec6c0a2afdd47e186..47388da0fb899c70d2f2af8ba40179b346c93781 100644 (file)
--- a/libarchive/test/test_read_filter_lrzip.c
+++ b/libarchive/test/test_read_filter_lrzip.c
@@ -58,7 +58,7 @@ DEFINE_TEST(test_read_filter_lrzip)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify that the format detection worked. */
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_LRZIP);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_LRZIP);
        assertEqualString(archive_filter_name(a, 0), "lrzip");
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_GNUTAR);
 

diff --git a/libarchive/test/test_read_filter_program.c b/libarchive/test/test_read_filter_program.c
index d6e02dd126014109e5a569ef045d15845315b20e..15f45a94d4d727206c2bed1e8c360a108028189a 100644 (file)
--- a/libarchive/test/test_read_filter_program.c
+++ b/libarchive/test/test_read_filter_program.c
@@ -76,7 +76,7 @@ DEFINE_TEST(test_read_filter_program)
            archive_read_open_memory(a, archive, sizeof(archive)));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_read_next_header(a, &ae));
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_PROGRAM);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_PROGRAM);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
        assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
@@ -124,7 +124,7 @@ DEFINE_TEST(test_read_filter_programl)
            archive_read_open_memory(a, archive, sizeof(archive)));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_read_next_header(a, &ae));
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_PROGRAM);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_PROGRAM);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
        assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
@@ -171,7 +171,7 @@ DEFINE_TEST(test_read_filter_programv)
            archive_read_open_memory(a, archive, sizeof(archive)));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_read_next_header(a, &ae));
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_PROGRAM);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_PROGRAM);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
        assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));

diff --git a/libarchive/test/test_read_filter_program_signature.c b/libarchive/test/test_read_filter_program_signature.c
index c59a88f1990763371248021183e4385d9e78a265..0fbedc3a7416cce98307b69007dfc20eb746da0a 100644 (file)
--- a/libarchive/test/test_read_filter_program_signature.c
+++ b/libarchive/test/test_read_filter_program_signature.c
@@ -80,7 +80,7 @@ DEFINE_TEST(test_read_filter_program_signature)
            archive_read_open_memory(a, archive, sizeof(archive)));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_read_next_header(a, &ae));
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_PROGRAM);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_PROGRAM);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
        assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
@@ -144,7 +144,7 @@ DEFINE_TEST(test_read_filter_programl_signature)
            archive_read_open_memory(a, archive, sizeof(archive)));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_read_next_header(a, &ae));
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_PROGRAM);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_PROGRAM);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
        assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
@@ -208,7 +208,7 @@ DEFINE_TEST(test_read_filter_programv_signature)
            archive_read_open_memory(a, archive, sizeof(archive)));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_read_next_header(a, &ae));
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_PROGRAM);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_PROGRAM);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
        assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));

diff --git a/libarchive/test/test_read_filter_uudecode.c b/libarchive/test/test_read_filter_uudecode.c
index be55fd16cd2567378f0c09dd70e2822aade16043..ac2eff59f794cae186ae74771da0b4e2abf3b64d 100644 (file)
--- a/libarchive/test/test_read_filter_uudecode.c
+++ b/libarchive/test/test_read_filter_uudecode.c
@@ -129,7 +129,7 @@ test_read_uu_sub(const char *uudata, size_t uusize, int no_nl)
                    "extra %d, NL %d",
                    archive_filter_name(a, 0), extra, !no_nl);
                assertEqualInt(archive_filter_code(a, 0),
-                   ARCHIVE_COMPRESSION_COMPRESS);
+                   ARCHIVE_FILTER_COMPRESS);
                failure("archive_format_name(a)=\"%s\""
                    "extra %d, NL %d",
                    archive_format_name(a), extra, !no_nl);

diff --git a/libarchive/test/test_read_format_7zip.c b/libarchive/test/test_read_format_7zip.c
index 9c40a7aab3ddd2a4090fb4c0af6d0b9de852597e..0858b920adb3171791195cf4b12eebaff82e6dd9 100644 (file)
--- a/libarchive/test/test_read_format_7zip.c
+++ b/libarchive/test/test_read_format_7zip.c
@@ -59,7 +59,7 @@ test_copy()
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_7ZIP, archive_format(a));
 
        /* Close the archive. */
@@ -90,7 +90,7 @@ test_empty_archive()
        assertEqualInt(0, archive_file_count(a));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_7ZIP, archive_format(a));
 
        /* Close the archive. */
@@ -129,7 +129,7 @@ test_empty_file()
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_7ZIP, archive_format(a));
 
        /* Close the archive. */
@@ -170,7 +170,7 @@ test_plain_header(const char *refname)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_7ZIP, archive_format(a));
 
        /* Close the archive. */
@@ -245,7 +245,7 @@ test_extract_all_files(const char *refname)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_7ZIP, archive_format(a));
 
        /* Close the archive. */
@@ -314,7 +314,7 @@ test_extract_last_file(const char *refname)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_7ZIP, archive_format(a));
 
        /* Close the archive. */
@@ -427,7 +427,7 @@ test_extract_all_files2(const char *refname)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_7ZIP, archive_format(a));
 
        /* Close the archive. */
@@ -481,7 +481,7 @@ test_delta_lzma(const char *refname)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_7ZIP, archive_format(a));
 
        /* Close the archive. */
@@ -535,7 +535,7 @@ test_bcj(const char *refname)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_7ZIP, archive_format(a));
 
        /* Close the archive. */
@@ -590,7 +590,7 @@ test_ppmd()
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_7ZIP, archive_format(a));
 
        /* Close the archive. */
@@ -635,7 +635,7 @@ test_symname()
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_7ZIP, archive_format(a));
 
        /* Close the archive. */

diff --git a/libarchive/test/test_read_format_cab.c b/libarchive/test/test_read_format_cab.c
index 03b88147b1e4d0a76b9df8125e11368b442f8ee5..e09d46d238358d11c98ca535578b34a92165e15d 100644 (file)
--- a/libarchive/test/test_read_format_cab.c
+++ b/libarchive/test/test_read_format_cab.c
@@ -260,7 +260,7 @@ verify(const char *refname, enum comp_type comp)
        }
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_CAB, archive_format(a));
 
        /* Close the archive. */
@@ -321,7 +321,7 @@ verify2(const char *refname, enum comp_type comp)
        }
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_CAB, archive_format(a));
 
        /* Close the archive. */
@@ -368,7 +368,7 @@ verify3(const char *refname, enum comp_type comp)
        }
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_CAB, archive_format(a));
 
        /* Close the archive. */

diff --git a/libarchive/test/test_read_format_cab_filename.c b/libarchive/test/test_read_format_cab_filename.c
index 138753667f1464ccd0a225c866555c43d6216aa6..f148590ff508a5a0e18965230a32f98c850a5f71 100644 (file)
--- a/libarchive/test/test_read_format_cab_filename.c
+++ b/libarchive/test/test_read_format_cab_filename.c
@@ -71,7 +71,7 @@ test_read_format_cab_filename_CP932_eucJP(const char *refname)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_CAB, archive_format(a));
 
        /* Close the archive. */
@@ -145,7 +145,7 @@ test_read_format_cab_filename_CP932_UTF8(const char *refname)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_CAB, archive_format(a));
 
        /* Close the archive. */

diff --git a/libarchive/test/test_read_format_cpio_afio.c b/libarchive/test/test_read_format_cpio_afio.c
index 6f77991d6daa9016d85407a4157cad09af4cb48f..3d5814bce7e53b20f9199b4d975f5b7738dac5bd 100644 (file)
--- a/libarchive/test/test_read_format_cpio_afio.c
+++ b/libarchive/test/test_read_format_cpio_afio.c
@@ -97,7 +97,7 @@ DEFINE_TEST(test_read_format_cpio_afio)
         */
        assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
        assertEqualInt(17, archive_entry_size(ae));
-       assertA(archive_filter_code(a, 0) == ARCHIVE_COMPRESSION_NONE);
+       assertA(archive_filter_code(a, 0) == ARCHIVE_FILTER_NONE);
        assertA(archive_format(a) == ARCHIVE_FORMAT_CPIO_POSIX);
        /*
         * Second entry is afio large ASCII format.
@@ -106,7 +106,7 @@ DEFINE_TEST(test_read_format_cpio_afio)
        assertEqualInt(17, archive_entry_size(ae));
        if (uid_size() > 4)
                assertEqualInt(65536, archive_entry_uid(ae));
-       assertA(archive_filter_code(a, 0) == ARCHIVE_COMPRESSION_NONE);
+       assertA(archive_filter_code(a, 0) == ARCHIVE_FILTER_NONE);
        assertA(archive_format(a) == ARCHIVE_FORMAT_CPIO_AFIO_LARGE);
        assertEqualInt(ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));

diff --git a/libarchive/test/test_read_format_cpio_bin.c b/libarchive/test/test_read_format_cpio_bin.c
index bd2824b700e337541ec183cb3e1cbca981f0fa2e..e65cb9b3870c86f99d9bb4ff40bc5435781e5526 100644 (file)
--- a/libarchive/test/test_read_format_cpio_bin.c
+++ b/libarchive/test/test_read_format_cpio_bin.c
@@ -52,7 +52,7 @@ DEFINE_TEST(test_read_format_cpio_bin)
        assertEqualIntA(a, 0, archive_read_open_memory(a, archive, sizeof(archive)));
        assertEqualIntA(a, 0, archive_read_next_header(a, &ae));
        assertEqualInt(1, archive_file_count(a));
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_CPIO_BIN_LE, archive_format(a));
        assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));

diff --git a/libarchive/test/test_read_format_cpio_bin_Z.c b/libarchive/test/test_read_format_cpio_bin_Z.c
index 08d1afc3a7f040de3ea823a9899ed2dc37773175..8aca71f2476db64a58216729c1b52a35c8d15591 100644 (file)
--- a/libarchive/test/test_read_format_cpio_bin_Z.c
+++ b/libarchive/test/test_read_format_cpio_bin_Z.c
@@ -46,7 +46,7 @@ DEFINE_TEST(test_read_format_cpio_bin_Z)
        assertEqualInt(1, archive_file_count(a));
        failure("archive_filter_name(a, 0)=\"%s\"",
            archive_filter_name(a, 0));
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_COMPRESS);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_COMPRESS);
        assertEqualString(archive_filter_name(a, 0), "compress (.Z)");
        failure("archive_format_name(a)=\"%s\"",
            archive_format_name(a));

diff --git a/libarchive/test/test_read_format_cpio_bin_be.c b/libarchive/test/test_read_format_cpio_bin_be.c
index 6679af4bfb65d519a6c1a4936fef84f07ff969c8..dfd664c9a4d2a0644f19fbf11c90ed6c4b57ec03 100644 (file)
--- a/libarchive/test/test_read_format_cpio_bin_be.c
+++ b/libarchive/test/test_read_format_cpio_bin_be.c
@@ -45,7 +45,7 @@ DEFINE_TEST(test_read_format_cpio_bin_be)
        assertEqualInt(archive_entry_uid(ae), 1000);
        assertEqualInt(archive_entry_gid(ae), 0);
 
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_NONE);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_NONE);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_CPIO_BIN_BE);
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
        assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));

diff --git a/libarchive/test/test_read_format_cpio_bin_bz2.c b/libarchive/test/test_read_format_cpio_bin_bz2.c
index f383f52808bef9d6d012e0f17058db1f706711d4..8afbbcd1ebc1d0cef6f2a6aa77bbb505c21193e1 100644 (file)
--- a/libarchive/test/test_read_format_cpio_bin_bz2.c
+++ b/libarchive/test/test_read_format_cpio_bin_bz2.c
@@ -49,7 +49,7 @@ DEFINE_TEST(test_read_format_cpio_bin_bz2)
        assertEqualIntA(a, ARCHIVE_OK,
            archive_read_open_memory(a, archive, sizeof(archive)));
        assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
-       assert(archive_filter_code(a, 0) == ARCHIVE_COMPRESSION_BZIP2);
+       assert(archive_filter_code(a, 0) == ARCHIVE_FILTER_BZIP2);
        assert(archive_format(a) == ARCHIVE_FORMAT_CPIO_BIN_LE);
        assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));

diff --git a/libarchive/test/test_read_format_cpio_bin_gz.c b/libarchive/test/test_read_format_cpio_bin_gz.c
index d834f0c861a80880e8fb5840cc9de40c8faed22f..98f53578e12930c900d1a28a78fda897ef1c4dc1 100644 (file)
--- a/libarchive/test/test_read_format_cpio_bin_gz.c
+++ b/libarchive/test/test_read_format_cpio_bin_gz.c
@@ -52,7 +52,7 @@ DEFINE_TEST(test_read_format_cpio_bin_gz)
            archive_read_open_memory(a, archive, sizeof(archive)));
        assertEqualInt(ARCHIVE_OK, archive_read_next_header(a, &ae));
        assertEqualInt(archive_filter_code(a, 0),
-           ARCHIVE_COMPRESSION_GZIP);
+           ARCHIVE_FILTER_GZIP);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_CPIO_BIN_LE);
        assertEqualInt(ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));

diff --git a/libarchive/test/test_read_format_cpio_bin_lzip.c b/libarchive/test/test_read_format_cpio_bin_lzip.c
index 71f6fe6720750a8a579a0bc94e71c4c95d832fde..4e3fb58722fefc49503c996133752b5027fecf8e 100644 (file)
--- a/libarchive/test/test_read_format_cpio_bin_lzip.c
+++ b/libarchive/test/test_read_format_cpio_bin_lzip.c
@@ -53,7 +53,7 @@ DEFINE_TEST(test_read_format_cpio_bin_lzip)
        assertEqualIntA(a, ARCHIVE_OK,
            archive_read_open_memory(a, archive, sizeof(archive)));
        assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_LZIP);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_LZIP);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_CPIO_BIN_LE);
        assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));

diff --git a/libarchive/test/test_read_format_cpio_bin_lzma.c b/libarchive/test/test_read_format_cpio_bin_lzma.c
index 1ac86c370bbeff1945475ab4166cd93357a3ceb3..cca19ffa7786a25c2abedc8a59727ca58927e327 100644 (file)
--- a/libarchive/test/test_read_format_cpio_bin_lzma.c
+++ b/libarchive/test/test_read_format_cpio_bin_lzma.c
@@ -52,7 +52,7 @@ DEFINE_TEST(test_read_format_cpio_bin_lzma)
        assertEqualIntA(a, ARCHIVE_OK,
            archive_read_open_memory(a, archive, sizeof(archive)));
        assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_LZMA);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_LZMA);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_CPIO_BIN_LE);
        assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));

diff --git a/libarchive/test/test_read_format_cpio_bin_xz.c b/libarchive/test/test_read_format_cpio_bin_xz.c
index 5f56cf4a91998b8e0528152a013d9e03468188bf..2b5e6143ca5a71934d9545ed3688dab3e0d053b5 100644 (file)
--- a/libarchive/test/test_read_format_cpio_bin_xz.c
+++ b/libarchive/test/test_read_format_cpio_bin_xz.c
@@ -62,7 +62,7 @@ DEFINE_TEST(test_read_format_cpio_bin_xz)
        assertEqualIntA(a, ARCHIVE_OK,
            archive_read_open_memory(a, archive, sizeof(archive)));
        assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_XZ);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_XZ);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_CPIO_BIN_LE);
        assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));

diff --git a/libarchive/test/test_read_format_cpio_filename.c b/libarchive/test/test_read_format_cpio_filename.c
index 7a641b5906132f49427eea1b1b325a54381c858f..d0c7c7afafffb68d6c8288dc2ed080734f6c7ad2 100644 (file)
--- a/libarchive/test/test_read_format_cpio_filename.c
+++ b/libarchive/test/test_read_format_cpio_filename.c
@@ -68,7 +68,7 @@ test_read_format_cpio_filename_eucJP_UTF8(const char *refname)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_CPIO_POSIX, archive_format(a));
 
        /* Close the archive. */
@@ -119,7 +119,7 @@ test_read_format_cpio_filename_UTF8_eucJP(const char *refname)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_CPIO_POSIX, archive_format(a));
 
        /* Close the archive. */
@@ -166,7 +166,7 @@ test_read_format_cpio_filename_UTF8_UTF8_jp(const char *refname)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_CPIO_POSIX, archive_format(a));
 
        /* Close the archive. */
@@ -217,7 +217,7 @@ test_read_format_cpio_filename_CP866_KOI8R(const char *refname)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_CPIO_POSIX, archive_format(a));
 
        /* Close the archive. */
@@ -268,7 +268,7 @@ test_read_format_cpio_filename_CP866_UTF8(const char *refname)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_CPIO_POSIX, archive_format(a));
 
        /* Close the archive. */
@@ -320,7 +320,7 @@ test_read_format_cpio_filename_KOI8R_CP866(const char *refname)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_CPIO_POSIX, archive_format(a));
 
        /* Close the archive. */
@@ -371,7 +371,7 @@ test_read_format_cpio_filename_KOI8R_UTF8(const char *refname)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_CPIO_POSIX, archive_format(a));
 
        /* Close the archive. */
@@ -423,7 +423,7 @@ test_read_format_cpio_filename_UTF8_KOI8R(const char *refname)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_CPIO_POSIX, archive_format(a));
 
        /* Close the archive. */
@@ -475,7 +475,7 @@ test_read_format_cpio_filename_UTF8_CP866(const char *refname)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_CPIO_POSIX, archive_format(a));
 
        /* Close the archive. */
@@ -521,7 +521,7 @@ test_read_format_cpio_filename_UTF8_UTF8_ru(const char *refname)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_CPIO_POSIX, archive_format(a));
 
        /* Close the archive. */
@@ -570,7 +570,7 @@ test_read_format_cpio_filename_eucJP_CP932(const char *refname)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_CPIO_POSIX, archive_format(a));
 
        /* Close the archive. */
@@ -621,7 +621,7 @@ test_read_format_cpio_filename_UTF8_CP932(const char *refname)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_CPIO_POSIX, archive_format(a));
 
        /* Close the archive. */
@@ -673,7 +673,7 @@ test_read_format_cpio_filename_CP866_CP1251(const char *refname)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_CPIO_POSIX, archive_format(a));
 
        /* Close the archive. */
@@ -725,7 +725,7 @@ test_read_format_cpio_filename_CP866_CP1251_win(const char *refname)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_CPIO_POSIX, archive_format(a));
 
        /* Close the archive. */
@@ -776,7 +776,7 @@ test_read_format_cpio_filename_KOI8R_CP1251(const char *refname)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_CPIO_POSIX, archive_format(a));
 
        /* Close the archive. */
@@ -828,7 +828,7 @@ test_read_format_cpio_filename_UTF8_CP1251(const char *refname)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_CPIO_POSIX, archive_format(a));
 
        /* Close the archive. */

diff --git a/libarchive/test/test_read_format_cpio_odc.c b/libarchive/test/test_read_format_cpio_odc.c
index 0b24b3d57cdbcc972253d8ccd98b74cd9305ff29..c608bf045a506f5644996dcaf55adf8c97d7b25f 100644 (file)
--- a/libarchive/test/test_read_format_cpio_odc.c
+++ b/libarchive/test/test_read_format_cpio_odc.c
@@ -55,7 +55,7 @@ DEFINE_TEST(test_read_format_cpio_odc)
        assertA(0 == archive_read_support_format_all(a));
        assertA(0 == archive_read_open_memory(a, archive, sizeof(archive)));
        assertEqualIntA(a, 0, archive_read_next_header(a, &ae));
-       assertA(archive_filter_code(a, 0) == ARCHIVE_COMPRESSION_NONE);
+       assertA(archive_filter_code(a, 0) == ARCHIVE_FILTER_NONE);
        assertA(archive_format(a) == ARCHIVE_FORMAT_CPIO_POSIX);
        assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));

diff --git a/libarchive/test/test_read_format_cpio_svr4_bzip2_rpm.c b/libarchive/test/test_read_format_cpio_svr4_bzip2_rpm.c
index b7b83fde908b62eeabd90d621826ef2642e6876f..d069da39eb74702fd8abb9bb9c954c332dd91375 100644 (file)
--- a/libarchive/test/test_read_format_cpio_svr4_bzip2_rpm.c
+++ b/libarchive/test/test_read_format_cpio_svr4_bzip2_rpm.c
@@ -117,7 +117,7 @@ DEFINE_TEST(test_read_format_cpio_svr4_bzip2_rpm)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
   
        /* Verify that the format detection worked. */
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_BZIP2);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_BZIP2);
        assertEqualString(archive_filter_name(a, 0), "bzip2");
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_CPIO_SVR4_NOCRC);
  

diff --git a/libarchive/test/test_read_format_cpio_svr4_gzip.c b/libarchive/test/test_read_format_cpio_svr4_gzip.c
index fc191a65d25c31d389499d69136f073f46ee15d1..9b96234644ce72c5b43e772d0173c4b27c7c5ad0 100644 (file)
--- a/libarchive/test/test_read_format_cpio_svr4_gzip.c
+++ b/libarchive/test/test_read_format_cpio_svr4_gzip.c
@@ -51,7 +51,7 @@ DEFINE_TEST(test_read_format_cpio_svr4_gzip)
            archive_read_open_memory(a, archive, sizeof(archive)));
        assertEqualInt(ARCHIVE_OK, archive_read_next_header(a, &ae));
        assertEqualInt(archive_filter_code(a, 0),
-           ARCHIVE_COMPRESSION_GZIP);
+           ARCHIVE_FILTER_GZIP);
        assertEqualInt(archive_format(a),
            ARCHIVE_FORMAT_CPIO_SVR4_NOCRC);
        assertEqualInt(ARCHIVE_OK, archive_read_close(a));

diff --git a/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.c b/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.c
index a5b74f4e009b5bd5469fe7a49082fd20a9a0d8b1..eccde65ad53cc8fb5e7a255861a570fab0bbb1e5 100644 (file)
--- a/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.c
+++ b/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.c
@@ -117,7 +117,7 @@ DEFINE_TEST(test_read_format_cpio_svr4_gzip_rpm)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
   
        /* Verify that the format detection worked. */
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_GZIP);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_GZIP);
        assertEqualString(archive_filter_name(a, 0), "gzip");
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_CPIO_SVR4_NOCRC);
  

diff --git a/libarchive/test/test_read_format_cpio_svr4c_Z.c b/libarchive/test/test_read_format_cpio_svr4c_Z.c
index 56abfcf57ad684e0fa36fc98666cd4c26db7fca3..c33cd07ef83c4ca016fae05532aad91a9f0f5811 100644 (file)
--- a/libarchive/test/test_read_format_cpio_svr4c_Z.c
+++ b/libarchive/test/test_read_format_cpio_svr4c_Z.c
@@ -48,7 +48,7 @@ DEFINE_TEST(test_read_format_cpio_svr4c_Z)
        assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
        failure("archive_filter_name(a, 0)=\"%s\"",
            archive_filter_name(a, 0));
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_COMPRESS);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_COMPRESS);
        failure("archive_format_name(a)=\"%s\"", archive_format_name(a));
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_CPIO_SVR4_CRC);
        assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));

diff --git a/libarchive/test/test_read_format_empty.c b/libarchive/test/test_read_format_empty.c
index eb109f34510f37e8878e103509cda32cb40d7d64..c27d57ad5a820f6608aac44d3eea31edb8a2dc7b 100644 (file)
--- a/libarchive/test/test_read_format_empty.c
+++ b/libarchive/test/test_read_format_empty.c
@@ -36,7 +36,7 @@ DEFINE_TEST(test_read_format_empty)
        assertA(0 == archive_read_support_format_all(a));
        assertA(0 == archive_read_open_memory(a, archive, 0));
        assertA(ARCHIVE_EOF == archive_read_next_header(a, &ae));
-       assertA(archive_filter_code(a, 0) == ARCHIVE_COMPRESSION_NONE);
+       assertA(archive_filter_code(a, 0) == ARCHIVE_FILTER_NONE);
        assertA(archive_format(a) == ARCHIVE_FORMAT_EMPTY);
        assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));

diff --git a/libarchive/test/test_read_format_gtar_gz.c b/libarchive/test/test_read_format_gtar_gz.c
index dd2f21e70e5eb0d37d4e9c8215360fabd00746d9..8d60de00754f6ae441013585e9c110eef47d6316 100644 (file)
--- a/libarchive/test/test_read_format_gtar_gz.c
+++ b/libarchive/test/test_read_format_gtar_gz.c
@@ -52,7 +52,7 @@ DEFINE_TEST(test_read_format_gtar_gz)
        assertEqualInt(ARCHIVE_OK, archive_read_next_header(a, &ae));
        assertEqualInt(1, archive_file_count(a));
        assertEqualInt(archive_filter_code(a, 0),
-           ARCHIVE_COMPRESSION_GZIP);
+           ARCHIVE_FILTER_GZIP);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_GNUTAR);
        assertEqualInt(ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));

diff --git a/libarchive/test/test_read_format_gtar_lzma.c b/libarchive/test/test_read_format_gtar_lzma.c
index 9fc5d72d11f107a8788c7fc9b62cecdf0d999267..5dfbb2c227f22f9a8437f4252fd8848887f13393 100644 (file)
--- a/libarchive/test/test_read_format_gtar_lzma.c
+++ b/libarchive/test/test_read_format_gtar_lzma.c
@@ -64,7 +64,7 @@ DEFINE_TEST(test_read_format_gtar_lzma)
        }
        assertEqualIntA(a, ARCHIVE_OK,
            archive_read_next_header(a, &ae));
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_LZMA);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_LZMA);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_GNUTAR);
        assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
 finish:

diff --git a/libarchive/test/test_read_format_iso_Z.c b/libarchive/test/test_read_format_iso_Z.c
index 1e7fc0df5b742fbf95bd3373d1976b80f6ebbfe4..551e0cf3431c9d481b294b0f02288334982317e0 100644 (file)
--- a/libarchive/test/test_read_format_iso_Z.c
+++ b/libarchive/test/test_read_format_iso_Z.c
@@ -45,7 +45,7 @@ test1(void)
            archive_read_next_header(a, &ae));
        assertEqualInt(1, archive_file_count(a));
        assertEqualInt(archive_filter_code(a, 0),
-           ARCHIVE_COMPRESSION_COMPRESS);
+           ARCHIVE_FILTER_COMPRESS);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_ISO9660);
        assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
@@ -86,7 +86,7 @@ test2(void)
            archive_read_next_header(a, &ae));
        assertEqualInt(5, archive_file_count(a));
        assertEqualInt(archive_filter_code(a, 0),
-           ARCHIVE_COMPRESSION_COMPRESS);
+           ARCHIVE_FILTER_COMPRESS);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_ISO9660);
        assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));

diff --git a/libarchive/test/test_read_format_iso_multi_extent.c b/libarchive/test/test_read_format_iso_multi_extent.c
index 30bce54d3da444cd091aa1e2b1568151028cab77..63b5cf7abb5d88dbc4f2372dce45444180ec07b0 100644 (file)
--- a/libarchive/test/test_read_format_iso_multi_extent.c
+++ b/libarchive/test/test_read_format_iso_multi_extent.c
@@ -83,7 +83,7 @@ DEFINE_TEST(test_read_format_iso_multi_extent)
        assertEqualInt(ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_COMPRESS);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_COMPRESS);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_ISO9660_ROCKRIDGE);
 
        /* Close the archive. */

diff --git a/libarchive/test/test_read_format_iso_xorriso.c b/libarchive/test/test_read_format_iso_xorriso.c
index 5971240a029950bb61d8b36159696a0acb09fbd9..13502605a2ba63810eec4a4ce1cb19ad15f5ad33 100644 (file)
--- a/libarchive/test/test_read_format_iso_xorriso.c
+++ b/libarchive/test/test_read_format_iso_xorriso.c
@@ -202,7 +202,7 @@ DEFINE_TEST(test_read_format_iso_xorriso)
        assertEqualInt(ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_COMPRESS);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_COMPRESS);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_ISO9660_ROCKRIDGE);
 
        /* Close the archive. */

diff --git a/libarchive/test/test_read_format_isojoliet_bz2.c b/libarchive/test/test_read_format_isojoliet_bz2.c
index 64e0184908690ac6fc32ada7faa973681d719a89..36239d121feae46d19ab77fc08d8833e2d325e5b 100644 (file)
--- a/libarchive/test/test_read_format_isojoliet_bz2.c
+++ b/libarchive/test/test_read_format_isojoliet_bz2.c
@@ -126,7 +126,7 @@ DEFINE_TEST(test_read_format_isojoliet_bz2)
        assertEqualInt(ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_COMPRESS);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_COMPRESS);
 
        /* Close the archive. */
        assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));

diff --git a/libarchive/test/test_read_format_isojoliet_long.c b/libarchive/test/test_read_format_isojoliet_long.c
index 22cbb23ba42471a8e6cced85ee3145f1184b39f7..06f3f4fee488f3b2e4d35f05396cdd03a16c30d9 100644 (file)
--- a/libarchive/test/test_read_format_isojoliet_long.c
+++ b/libarchive/test/test_read_format_isojoliet_long.c
@@ -132,7 +132,7 @@ DEFINE_TEST(test_read_format_isojoliet_long)
        assertEqualInt(ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_COMPRESS);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_COMPRESS);
 
        /* Close the archive. */
        assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));

diff --git a/libarchive/test/test_read_format_isojoliet_rr.c b/libarchive/test/test_read_format_isojoliet_rr.c
index 66980d00cb928cf677f32e86671c1bb222b47811..ebf1b92d97f5ddb5ea0e79eb93ceb9ee48da21b9 100644 (file)
--- a/libarchive/test/test_read_format_isojoliet_rr.c
+++ b/libarchive/test/test_read_format_isojoliet_rr.c
@@ -150,7 +150,7 @@ DEFINE_TEST(test_read_format_isojoliet_rr)
        assertEqualInt(ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_COMPRESS);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_COMPRESS);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_ISO9660_ROCKRIDGE);
 
        /* Close the archive. */

diff --git a/libarchive/test/test_read_format_isojoliet_versioned.c b/libarchive/test/test_read_format_isojoliet_versioned.c
index ac7227feaa71abbdafd0aa9f96e42a6aa612cad8..8fa974b9806f669d6cf904c99afb477112c0fd35 100644 (file)
--- a/libarchive/test/test_read_format_isojoliet_versioned.c
+++ b/libarchive/test/test_read_format_isojoliet_versioned.c
@@ -74,7 +74,7 @@ DEFINE_TEST(test_read_format_isojoliet_versioned)
        assertEqualInt(ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_COMPRESS);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_COMPRESS);
 
        /* Close the archive. */
        assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));

diff --git a/libarchive/test/test_read_format_isorr_bz2.c b/libarchive/test/test_read_format_isorr_bz2.c
index 93aaae7dbff877e9a50c9035074566b4dfcf6ffa..1c16f3cb1ef7fc0edafd28ec7cbced8370c462ad 100644 (file)
--- a/libarchive/test/test_read_format_isorr_bz2.c
+++ b/libarchive/test/test_read_format_isorr_bz2.c
@@ -192,7 +192,7 @@ DEFINE_TEST(test_read_format_isorr_bz2)
        assertEqualInt(ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_COMPRESS);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_COMPRESS);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_ISO9660_ROCKRIDGE);
 
        /* Close the archive. */

diff --git a/libarchive/test/test_read_format_isorr_ce.c b/libarchive/test/test_read_format_isorr_ce.c
index 8f86b18c82d8fd11236426ff148e48528215181a..c198643486643b8e20d7289519d4d8264265cef0 100644 (file)
--- a/libarchive/test/test_read_format_isorr_ce.c
+++ b/libarchive/test/test_read_format_isorr_ce.c
@@ -212,7 +212,7 @@ DEFINE_TEST(test_read_format_isorr_ce)
        assertEqualInt(ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_COMPRESS);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_COMPRESS);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_ISO9660_ROCKRIDGE);
 
        /* Close the archive. */

diff --git a/libarchive/test/test_read_format_isorr_new_bz2.c b/libarchive/test/test_read_format_isorr_new_bz2.c
index 9418a5f5bcb27884762dfbef4685df75ca9de78a..96fb0589340c409b3d19f9eda7403ccf5dc2cf59 100644 (file)
--- a/libarchive/test/test_read_format_isorr_new_bz2.c
+++ b/libarchive/test/test_read_format_isorr_new_bz2.c
@@ -193,7 +193,7 @@ DEFINE_TEST(test_read_format_isorr_new_bz2)
        assertEqualInt(ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_COMPRESS);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_COMPRESS);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_ISO9660_ROCKRIDGE);
 
        /* Close the archive. */

diff --git a/libarchive/test/test_read_format_isorr_rr_moved.c b/libarchive/test/test_read_format_isorr_rr_moved.c
index 9c9526e0d6706f8e88590ffbba5e6c7faaa8659c..57e7e1f85951bb635d3420063b23fe4ff1ac5678 100644 (file)
--- a/libarchive/test/test_read_format_isorr_rr_moved.c
+++ b/libarchive/test/test_read_format_isorr_rr_moved.c
@@ -259,7 +259,7 @@ DEFINE_TEST(test_read_format_isorr_rr_moved)
        assertEqualInt(ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_COMPRESS);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_COMPRESS);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_ISO9660_ROCKRIDGE);
 
        /* Close the archive. */

diff --git a/libarchive/test/test_read_format_isozisofs_bz2.c b/libarchive/test/test_read_format_isozisofs_bz2.c
index 75b6bec27e187c7e1d89c9af7d6d4e4ced5d5917..50ad32c70b015390fd88d5a898d208df7b672507 100644 (file)
--- a/libarchive/test/test_read_format_isozisofs_bz2.c
+++ b/libarchive/test/test_read_format_isozisofs_bz2.c
@@ -176,7 +176,7 @@ DEFINE_TEST(test_read_format_isozisofs_bz2)
        assertEqualInt(ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_COMPRESS);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_COMPRESS);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_ISO9660_ROCKRIDGE);
 
        /* Close the archive. */

diff --git a/libarchive/test/test_read_format_lha.c b/libarchive/test/test_read_format_lha.c
index 0f7085f94552f9e50491907adec45ccc10d336d3..36c5d080340a1a9c3caa03961f2ba885a9a7a1f4 100644 (file)
--- a/libarchive/test/test_read_format_lha.c
+++ b/libarchive/test/test_read_format_lha.c
@@ -247,7 +247,7 @@ verify(const char *refname, int posix)
        }
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_LHA, archive_format(a));
 
        /* Close the archive. */

diff --git a/libarchive/test/test_read_format_lha_filename.c b/libarchive/test/test_read_format_lha_filename.c
index 89c8bf78acc395834eda1141f0b6be9fec202979..67b6f3643843863cbaadc3f4743a7bb30ccb0883 100644 (file)
--- a/libarchive/test/test_read_format_lha_filename.c
+++ b/libarchive/test/test_read_format_lha_filename.c
@@ -79,7 +79,7 @@ test_read_format_lha_filename_CP932_eucJP(const char *refname)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_LHA, archive_format(a));
 
        /* Close the archive. */
@@ -139,7 +139,7 @@ test_read_format_lha_filename_CP932_UTF8(const char *refname)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_LHA, archive_format(a));
 
        /* Close the archive. */
@@ -189,7 +189,7 @@ test_read_format_lha_filename_CP932_Windows(const char *refname)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_LHA, archive_format(a));
 
        /* Close the archive. */

diff --git a/libarchive/test/test_read_format_pax_bz2.c b/libarchive/test/test_read_format_pax_bz2.c
index 39fc7930d9332fdecee3a2e31afe79d67bb6c551..48717fbd60e5fd89f31aa2b8ea2b452df090bbe3 100644 (file)
--- a/libarchive/test/test_read_format_pax_bz2.c
+++ b/libarchive/test/test_read_format_pax_bz2.c
@@ -58,7 +58,7 @@ DEFINE_TEST(test_read_format_pax_bz2)
            archive_read_open_memory(a, archive, sizeof(archive)));
        assertEqualIntA(a,ARCHIVE_OK, archive_read_next_header(a, &ae));
        assertEqualInt(1, archive_file_count(a));
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_BZIP2);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_BZIP2);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_PAX_INTERCHANGE);
        assertEqualIntA(a,ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));

diff --git a/libarchive/test/test_read_format_tar.c b/libarchive/test/test_read_format_tar.c
index 82abfe416bc489597e193caf2efe5e0d588cf1f4..8273e753065868411a8546d3e7dbaeb138eba2f5 100644 (file)
--- a/libarchive/test/test_read_format_tar.c
+++ b/libarchive/test/test_read_format_tar.c
@@ -70,7 +70,7 @@ static void verifyEmpty(void)
        assertA(0 == archive_read_support_format_all(a));
        assertA(0 == archive_read_open_memory(a, archiveEmpty, 512));
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_NONE);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_NONE);
        assertEqualString(archive_filter_name(a, 0), "none");
        failure("512 zero bytes should be recognized as a tar archive.");
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR);
@@ -452,21 +452,21 @@ DEFINE_TEST(test_read_format_tar)
 {
        verifyEmpty();
        verify(archive1, sizeof(archive1), verify1,
-           ARCHIVE_COMPRESSION_NONE, ARCHIVE_FORMAT_TAR_USTAR);
+           ARCHIVE_FILTER_NONE, ARCHIVE_FORMAT_TAR_USTAR);
        verify(archive2, sizeof(archive2), verify2,
-           ARCHIVE_COMPRESSION_NONE, ARCHIVE_FORMAT_TAR_USTAR);
+           ARCHIVE_FILTER_NONE, ARCHIVE_FORMAT_TAR_USTAR);
        verify(archive3, sizeof(archive3), verify3,
-           ARCHIVE_COMPRESSION_NONE, ARCHIVE_FORMAT_TAR_USTAR);
+           ARCHIVE_FILTER_NONE, ARCHIVE_FORMAT_TAR_USTAR);
        verify(archive4, sizeof(archive4), verify4,
-           ARCHIVE_COMPRESSION_NONE, ARCHIVE_FORMAT_TAR_USTAR);
+           ARCHIVE_FILTER_NONE, ARCHIVE_FORMAT_TAR_USTAR);
        verify(archive5, sizeof(archive5), verify5,
-           ARCHIVE_COMPRESSION_NONE, ARCHIVE_FORMAT_TAR_USTAR);
+           ARCHIVE_FILTER_NONE, ARCHIVE_FORMAT_TAR_USTAR);
        verify(archive6, sizeof(archive6), verify6,
-           ARCHIVE_COMPRESSION_NONE, ARCHIVE_FORMAT_TAR_USTAR);
+           ARCHIVE_FILTER_NONE, ARCHIVE_FORMAT_TAR_USTAR);
        verify(archiveK, sizeof(archiveK), verifyK,
-           ARCHIVE_COMPRESSION_NONE, ARCHIVE_FORMAT_TAR_GNUTAR);
+           ARCHIVE_FILTER_NONE, ARCHIVE_FORMAT_TAR_GNUTAR);
        verify(archivexL, sizeof(archivexL), verifyxL,
-           ARCHIVE_COMPRESSION_NONE, ARCHIVE_FORMAT_TAR_PAX_INTERCHANGE);
+           ARCHIVE_FILTER_NONE, ARCHIVE_FORMAT_TAR_PAX_INTERCHANGE);
 }
 
 

diff --git a/libarchive/test/test_read_format_tar_empty_filename.c b/libarchive/test/test_read_format_tar_empty_filename.c
index 5f98fe1bdaea530e6bd7dbaef12ea49728536979..d7c8105a4262c7acf3804c7b9db574a6a4a21112 100644 (file)
--- a/libarchive/test/test_read_format_tar_empty_filename.c
+++ b/libarchive/test/test_read_format_tar_empty_filename.c
@@ -54,7 +54,7 @@ DEFINE_TEST(test_read_format_tar_empty_filename)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify that the format detection worked. */
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_NONE);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_NONE);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
 
        assertEqualInt(ARCHIVE_OK, archive_read_close(a));

diff --git a/libarchive/test/test_read_format_tbz.c b/libarchive/test/test_read_format_tbz.c
index ae007af732d782216e012b2ab9955348dc77b11c..475c558eefc510d84e5916f794ff8e35dbe9fd93 100644 (file)
--- a/libarchive/test/test_read_format_tbz.c
+++ b/libarchive/test/test_read_format_tbz.c
@@ -51,7 +51,7 @@ DEFINE_TEST(test_read_format_tbz)
            archive_read_open_memory(a, archive, sizeof(archive)));
        assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
        assertEqualInt(1, archive_file_count(a));
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_BZIP2);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_BZIP2);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
        assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));

diff --git a/libarchive/test/test_read_format_tgz.c b/libarchive/test/test_read_format_tgz.c
index 2fad691fc9ecf7735dbf9cf2505d0c31979d5e86..60985a0d9f8c6400a78a809a00f2b3827b02555c 100644 (file)
--- a/libarchive/test/test_read_format_tgz.c
+++ b/libarchive/test/test_read_format_tgz.c
@@ -52,7 +52,7 @@ DEFINE_TEST(test_read_format_tgz)
        assertEqualInt(ARCHIVE_OK, archive_read_next_header(a, &ae));
        assertEqualInt(1, archive_file_count(a));
        assertEqualInt(archive_filter_code(a, 0),
-           ARCHIVE_COMPRESSION_GZIP);
+           ARCHIVE_FILTER_GZIP);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
        assertEqualInt(ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK,archive_read_free(a));

diff --git a/libarchive/test/test_read_format_tlz.c b/libarchive/test/test_read_format_tlz.c
index cf9a067d4350c0805f759b405d91aba225c0ebd0..2a058d03971bb4f8e67ad752c9987fc8247e5080 100644 (file)
--- a/libarchive/test/test_read_format_tlz.c
+++ b/libarchive/test/test_read_format_tlz.c
@@ -54,7 +54,7 @@ DEFINE_TEST(test_read_format_tlz)
            archive_read_open_memory(a, archive, sizeof(archive)));
        assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
        assertEqualInt(1, archive_file_count(a));
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_LZMA);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_LZMA);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
        assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));

diff --git a/libarchive/test/test_read_format_txz.c b/libarchive/test/test_read_format_txz.c
index a00ddd7cfa026b7004db215a37f71e71efe4a163..6672ad2f08645ff6d8e2f93b303acc9f704ee255 100644 (file)
--- a/libarchive/test/test_read_format_txz.c
+++ b/libarchive/test/test_read_format_txz.c
@@ -57,7 +57,7 @@ DEFINE_TEST(test_read_format_txz)
            archive_read_open_memory(a, archive, sizeof(archive)));
        assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
        assertEqualInt(1, archive_file_count(a));
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_XZ);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_XZ);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
        assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));

diff --git a/libarchive/test/test_read_format_tz.c b/libarchive/test/test_read_format_tz.c
index b1e5f5e9f5e952f703abc11e981208334381b2f1..60d8a4e61514ae93ed84b827dec947d86cdfad61 100644 (file)
--- a/libarchive/test/test_read_format_tz.c
+++ b/libarchive/test/test_read_format_tz.c
@@ -48,7 +48,7 @@ DEFINE_TEST(test_read_format_tz)
        assertEqualInt(1, archive_file_count(a));
        failure("archive_filter_name(a, 0)=\"%s\"",
            archive_filter_name(a, 0));
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_COMPRESS);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_COMPRESS);
        failure("archive_format_name(a)=\"%s\"", archive_format_name(a));
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
        assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));

diff --git a/libarchive/test/test_read_format_xar.c b/libarchive/test/test_read_format_xar.c
index bb148c6ebc490df0cf07d1fa27ff313ede784cc0..f2de1e0139452202cbc8eb3ed999ab74a15f02ae 100644 (file)
--- a/libarchive/test/test_read_format_xar.c
+++ b/libarchive/test/test_read_format_xar.c
@@ -661,13 +661,13 @@ static void verify(unsigned char *d, size_t s,
        assertA(0 == archive_read_support_format_all(a));
        assertA(0 == archive_read_open_memory(a, buff, s + 1024));
        assertA(0 == archive_read_next_header(a, &ae));
-       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_NONE);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_NONE);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_XAR);
        /* Verify the only entry. */
        f1(a, ae);
        if (f2) {
                assertA(0 == archive_read_next_header(a, &ae));
-               assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_NONE);
+               assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_NONE);
                assertEqualInt(archive_format(a), ARCHIVE_FORMAT_XAR);
                /* Verify the only entry. */
                f2(a, ae);

diff --git a/libarchive/test/test_read_format_zip.c b/libarchive/test/test_read_format_zip.c
index 61e4e18b54887b5418dc4161b233d3fcbad20014..7f3568157b5bfcb2735206da752c6a6092ed1577 100644 (file)
--- a/libarchive/test/test_read_format_zip.c
+++ b/libarchive/test/test_read_format_zip.c
@@ -98,7 +98,7 @@ verify_basic(struct archive *a, int seek_checks)
        /* Verify the number of files read. */
        failure("the archive file has three files");
        assertEqualInt(3, archive_file_count(a));
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
        assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));
@@ -165,7 +165,7 @@ verify_info_zip_ux(struct archive *a, int seek_checks)
        failure("the archive file has just one file");
        assertEqualInt(1, archive_file_count(a));
 
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
        assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));

diff --git a/libarchive/test/test_read_format_zip_filename.c b/libarchive/test/test_read_format_zip_filename.c
index e207c777464d618c98aacb3e9e0a1ba22c65cf96..21b6160275d5701879c6aa1bcd8e0b8d411de659 100644 (file)
--- a/libarchive/test/test_read_format_zip_filename.c
+++ b/libarchive/test/test_read_format_zip_filename.c
@@ -71,7 +71,7 @@ test_read_format_zip_filename_CP932_eucJP(const char *refname)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */
@@ -144,7 +144,7 @@ test_read_format_zip_filename_CP932_UTF8(const char *refname)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */
@@ -211,7 +211,7 @@ test_read_format_zip_filename_UTF8_eucJP(const char *refname)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */
@@ -299,7 +299,7 @@ test_read_format_zip_filename_UTF8_UTF8(const char *refname)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */
@@ -350,7 +350,7 @@ test_read_format_zip_filename_CP866_KOI8R(const char *refname)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */
@@ -401,7 +401,7 @@ test_read_format_zip_filename_CP866_UTF8(const char *refname)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */
@@ -453,7 +453,7 @@ test_read_format_zip_filename_KOI8R_CP866(const char *refname)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */
@@ -504,7 +504,7 @@ test_read_format_zip_filename_KOI8R_UTF8(const char *refname)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */
@@ -561,7 +561,7 @@ test_read_format_zip_filename_UTF8_KOI8R(const char *refname)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */
@@ -621,7 +621,7 @@ test_read_format_zip_filename_UTF8_CP866(const char *refname)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */
@@ -669,7 +669,7 @@ test_read_format_zip_filename_UTF8_UTF8_ru(const char *refname)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */
@@ -722,7 +722,7 @@ test_read_format_zip_filename_CP932_CP932(const char *refname)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */
@@ -792,7 +792,7 @@ test_read_format_zip_filename_UTF8_CP932(const char *refname)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */
@@ -844,7 +844,7 @@ test_read_format_zip_filename_CP866_CP1251(const char *refname)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */
@@ -896,7 +896,7 @@ test_read_format_zip_filename_CP866_CP1251_win(const char *refname)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */
@@ -947,7 +947,7 @@ test_read_format_zip_filename_KOI8R_CP1251(const char *refname)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */
@@ -1006,7 +1006,7 @@ test_read_format_zip_filename_UTF8_CP1251(const char *refname)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */
@@ -1071,7 +1071,7 @@ test_read_format_zip_filename_KOI8R_UTF8_2(const char *refname)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */
@@ -1112,7 +1112,7 @@ next_test:
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */

diff --git a/libarchive/test/test_write_filter_bzip2.c b/libarchive/test/test_write_filter_bzip2.c
index 27741ba78ede69253e7a0a473e4a208fdb78550e..96ac0e62df4804d4d896a7222c62eeb57f01f278 100644 (file)
--- a/libarchive/test/test_write_filter_bzip2.c
+++ b/libarchive/test/test_write_filter_bzip2.c
@@ -63,10 +63,10 @@ DEFINE_TEST(test_write_filter_bzip2)
        }
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_set_bytes_per_block(a, 10));
-       assertEqualInt(ARCHIVE_COMPRESSION_BZIP2, archive_filter_code(a, 0));
+       assertEqualInt(ARCHIVE_FILTER_BZIP2, archive_filter_code(a, 0));
        assertEqualString("bzip2", archive_filter_name(a, 0));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_open_memory(a, buff, buffsize, &used1));
-       assertEqualInt(ARCHIVE_COMPRESSION_BZIP2, archive_filter_code(a, 0));
+       assertEqualInt(ARCHIVE_FILTER_BZIP2, archive_filter_code(a, 0));
        assertEqualString("bzip2", archive_filter_name(a, 0));
        assert((ae = archive_entry_new()) != NULL);
        archive_entry_set_filetype(ae, AE_IFREG);

diff --git a/libarchive/test/test_write_filter_gzip.c b/libarchive/test/test_write_filter_gzip.c
index 566834685d859166716d59bb3fb5ee925c665c28..e3f50beecdc0d1c11234e74d233dbf143717628b 100644 (file)
--- a/libarchive/test/test_write_filter_gzip.c
+++ b/libarchive/test/test_write_filter_gzip.c
@@ -63,7 +63,7 @@ DEFINE_TEST(test_write_filter_gzip)
        }
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_set_bytes_per_block(a, 10));
-       assertEqualInt(ARCHIVE_COMPRESSION_GZIP, archive_filter_code(a, 0));
+       assertEqualInt(ARCHIVE_FILTER_GZIP, archive_filter_code(a, 0));
        assertEqualString("gzip", archive_filter_name(a, 0));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_open_memory(a, buff, buffsize, &used1));
        assert((ae = archive_entry_new()) != NULL);

diff --git a/libarchive/test/test_write_filter_lzip.c b/libarchive/test/test_write_filter_lzip.c
index ef874027cc8cbfa628507f6b43c942d498da3b5f..508ecd00cdd8e2b6d865f1f54f8611c0d1d2f36e 100644 (file)
--- a/libarchive/test/test_write_filter_lzip.c
+++ b/libarchive/test/test_write_filter_lzip.c
@@ -63,11 +63,11 @@ DEFINE_TEST(test_write_filter_lzip)
        }
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_set_bytes_per_block(a, 10));
-       assertEqualInt(ARCHIVE_COMPRESSION_LZIP, archive_filter_code(a, 0));
+       assertEqualInt(ARCHIVE_FILTER_LZIP, archive_filter_code(a, 0));
        assertEqualString("lzip", archive_filter_name(a, 0));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_open_memory(a, buff, buffsize, &used1));
-       assertEqualInt(ARCHIVE_COMPRESSION_LZIP, archive_filter_code(a, 0));
+       assertEqualInt(ARCHIVE_FILTER_LZIP, archive_filter_code(a, 0));
        assertEqualString("lzip", archive_filter_name(a, 0));
        assert((ae = archive_entry_new()) != NULL);
        archive_entry_set_filetype(ae, AE_IFREG);

diff --git a/libarchive/test/test_write_filter_lzma.c b/libarchive/test/test_write_filter_lzma.c
index 42d0ddccdb0e39516283fc165d5228428cc53492..8f4324576536cbdef89f4d29ea911cfc34b0ed86 100644 (file)
--- a/libarchive/test/test_write_filter_lzma.c
+++ b/libarchive/test/test_write_filter_lzma.c
@@ -62,11 +62,11 @@ DEFINE_TEST(test_write_filter_lzma)
        }
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_set_bytes_per_block(a, 10));
-       assertEqualInt(ARCHIVE_COMPRESSION_LZMA, archive_filter_code(a, 0));
+       assertEqualInt(ARCHIVE_FILTER_LZMA, archive_filter_code(a, 0));
        assertEqualString("lzma", archive_filter_name(a, 0));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_open_memory(a, buff, buffsize, &used1));
-       assertEqualInt(ARCHIVE_COMPRESSION_LZMA, archive_filter_code(a, 0));
+       assertEqualInt(ARCHIVE_FILTER_LZMA, archive_filter_code(a, 0));
        assertEqualString("lzma", archive_filter_name(a, 0));
        assert((ae = archive_entry_new()) != NULL);
        archive_entry_set_filetype(ae, AE_IFREG);

diff --git a/libarchive/test/test_write_filter_xz.c b/libarchive/test/test_write_filter_xz.c
index 115883dcc9f915d56b4db4d4c17c1a79d0049d75..ae148cc44f81b6f1e7e85d7859bd193a5dd5048d 100644 (file)
--- a/libarchive/test/test_write_filter_xz.c
+++ b/libarchive/test/test_write_filter_xz.c
@@ -63,10 +63,10 @@ DEFINE_TEST(test_write_filter_xz)
        }
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_set_bytes_per_block(a, 10));
-       assertEqualInt(ARCHIVE_COMPRESSION_XZ, archive_filter_code(a, 0));
+       assertEqualInt(ARCHIVE_FILTER_XZ, archive_filter_code(a, 0));
        assertEqualString("xz", archive_filter_name(a, 0));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_open_memory(a, buff, buffsize, &used1));
-       assertEqualInt(ARCHIVE_COMPRESSION_XZ, archive_filter_code(a, 0));
+       assertEqualInt(ARCHIVE_FILTER_XZ, archive_filter_code(a, 0));
        assertEqualString("xz", archive_filter_name(a, 0));
        assert((ae = archive_entry_new()) != NULL);
        archive_entry_set_filetype(ae, AE_IFREG);

diff --git a/libarchive/test/test_write_format_7zip.c b/libarchive/test/test_write_format_7zip.c
index b9150460a96b82ba5043e665904e90ea29088628..f4bbfb405aa7958d4bdd29f388a80e5e1ddca81a 100644 (file)
--- a/libarchive/test/test_write_format_7zip.c
+++ b/libarchive/test/test_write_format_7zip.c
@@ -308,7 +308,7 @@ test_basic(const char *compression_type)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_7ZIP, archive_format(a));
 
        assertEqualInt(ARCHIVE_OK, archive_read_close(a));
@@ -515,7 +515,7 @@ test_basic2(const char *compression_type)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_7ZIP, archive_format(a));
 
        assertEqualInt(ARCHIVE_OK, archive_read_close(a));
@@ -644,7 +644,7 @@ test_only_empty_file(void)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_7ZIP, archive_format(a));
 
        assertEqualInt(ARCHIVE_OK, archive_read_close(a));
@@ -780,7 +780,7 @@ test_only_empty_files(void)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify archive format. */
-       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
+       assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_7ZIP, archive_format(a));
 
        assertEqualInt(ARCHIVE_OK, archive_read_close(a));

diff --git a/tar/write.c b/tar/write.c
index 5c8cffb0c92d8468af002b91c191225e517acc64..b6e1c58ff94f713e22dd687a273ade846475b13a 100644 (file)
--- a/tar/write.c
+++ b/tar/write.c
@@ -276,7 +276,7 @@ tar_mode_r(struct bsdtar *bsdtar)
                    "Can't read archive %s: %s", bsdtar->filename,
                    archive_error_string(a));
        while (0 == archive_read_next_header(a, &entry)) {
-               if (archive_filter_code(a, 0) != ARCHIVE_COMPRESSION_NONE) {
+               if (archive_filter_code(a, 0) != ARCHIVE_FILTER_NONE) {
                        archive_read_free(a);
                        close(bsdtar->fd);
                        lafe_errc(1, 0,
@@ -369,7 +369,7 @@ tar_mode_u(struct bsdtar *bsdtar)
 
        /* Build a list of all entries and their recorded mod times. */
        while (0 == archive_read_next_header(a, &entry)) {
-               if (archive_filter_code(a, 0) != ARCHIVE_COMPRESSION_NONE) {
+               if (archive_filter_code(a, 0) != ARCHIVE_FILTER_NONE) {
                        archive_read_free(a);
                        close(bsdtar->fd);
                        lafe_errc(1, 0,