Stop using deprecated functions. Much remains to be replaced.

s/archive_write_set_compression_/archive_write_add_filter_/

diff --git a/cpio/cpio.c b/cpio/cpio.c
index 40e7b29fbbeb11f148e7681bd565a415407612af..75ee8fc2ecd0eb7fd27ffd70a8d3b2f1dc158689 100644 (file)
--- a/cpio/cpio.c
+++ b/cpio/cpio.c
@@ -520,28 +520,28 @@ mode_out(struct cpio *cpio)
                lafe_errc(1, 0, "Failed to allocate archive object");
        switch (cpio->compress) {
        case 'J':
-               r = archive_write_set_compression_xz(cpio->archive);
+               r = archive_write_add_filter_xz(cpio->archive);
                break;
        case OPTION_LRZIP:
                r = archive_write_add_filter_lrzip(cpio->archive);
                break;
        case OPTION_LZMA:
-               r = archive_write_set_compression_lzma(cpio->archive);
+               r = archive_write_add_filter_lzma(cpio->archive);
                break;
        case OPTION_LZOP:
                r = archive_write_add_filter_lzop(cpio->archive);
                break;
        case 'j': case 'y':
-               r = archive_write_set_compression_bzip2(cpio->archive);
+               r = archive_write_add_filter_bzip2(cpio->archive);
                break;
        case 'z':
-               r = archive_write_set_compression_gzip(cpio->archive);
+               r = archive_write_add_filter_gzip(cpio->archive);
                break;
        case 'Z':
-               r = archive_write_set_compression_compress(cpio->archive);
+               r = archive_write_add_filter_compress(cpio->archive);
                break;
        default:
-               r = archive_write_set_compression_none(cpio->archive);
+               r = archive_write_add_filter_none(cpio->archive);
                break;
        }
        if (r < ARCHIVE_WARN)

diff --git a/libarchive/test/test_acl_pax.c b/libarchive/test/test_acl_pax.c
index 2bee4572cf7f0b6c3138bf57daf9ad1bb02286b3..5150b11d63b52ac2e31221a92f6df1d73da2caf3 100644 (file)
--- a/libarchive/test/test_acl_pax.c
+++ b/libarchive/test/test_acl_pax.c
@@ -184,7 +184,7 @@ DEFINE_TEST(test_acl_pax)
        /* Write an archive to memory. */
        assert(NULL != (a = archive_write_new()));
        assertA(0 == archive_write_set_format_pax(a));
-       assertA(0 == archive_write_set_compression_none(a));
+       assertA(0 == archive_write_add_filter_none(a));
        assertA(0 == archive_write_set_bytes_per_block(a, 1));
        assertA(0 == archive_write_set_bytes_in_last_block(a, 1));
        assertA(0 == archive_write_open_memory(a, buff, sizeof(buff), &used));

diff --git a/libarchive/test/test_archive_write_set_filter_option.c b/libarchive/test/test_archive_write_set_filter_option.c
index 87a3e5350bd4447206da0954e78ea7471b784348..4a0d535e61d654ece4a184ef85e52c3fd8079d43 100644 (file)
--- a/libarchive/test/test_archive_write_set_filter_option.c
+++ b/libarchive/test/test_archive_write_set_filter_option.c
@@ -35,7 +35,7 @@ test(int pristine)
        struct archive* a = archive_write_new();
 
        if (!pristine)
-               archive_write_set_compression_gzip(a);
+               archive_write_add_filter_gzip(a);
 
        should(a, ARCHIVE_OK, NULL, NULL, NULL);
        should(a, ARCHIVE_OK, "", "", "");

diff --git a/libarchive/test/test_archive_write_set_option.c b/libarchive/test/test_archive_write_set_option.c
index a7957ed7b2669089e2ae2acf8166f14aeda7f322..d64d1e6ce08d66b3e4e878dd6b893fe73cb4f1e7 100644 (file)
--- a/libarchive/test/test_archive_write_set_option.c
+++ b/libarchive/test/test_archive_write_set_option.c
@@ -36,7 +36,7 @@ test(int pristine)
        int known_option_rv = pristine ? ARCHIVE_FAILED : ARCHIVE_OK;
 
        if (!pristine) {
-               archive_write_set_compression_gzip(a);
+               archive_write_add_filter_gzip(a);
                archive_write_set_format_iso9660(a);
         }
 

diff --git a/libarchive/test/test_archive_write_set_options.c b/libarchive/test/test_archive_write_set_options.c
index 57aba98c18c96d2737965c23bf7a51cb5e9b95ac..a12177df8b7f8b4228685ad9401e7c0607bef40e 100644 (file)
--- a/libarchive/test/test_archive_write_set_options.c
+++ b/libarchive/test/test_archive_write_set_options.c
@@ -37,7 +37,7 @@ test(int pristine)
        int known_option_rv = pristine ? ARCHIVE_FAILED : ARCHIVE_OK;
 
        if (!pristine) {
-               archive_write_set_compression_gzip(a);
+               archive_write_add_filter_gzip(a);
                archive_write_set_format_iso9660(a);
        }
 

diff --git a/libarchive/test/test_empty_write.c b/libarchive/test/test_empty_write.c
index 5495177f207f02ba9a092b33892c614800731e32..d4b6f405a644732d947186ed4daaf95d9f2d5b6d 100644 (file)
--- a/libarchive/test/test_empty_write.c
+++ b/libarchive/test/test_empty_write.c
@@ -40,7 +40,7 @@ DEFINE_TEST(test_empty_write)
        /* Create a new archive in memory. */
        assert((a = archive_write_new()) != NULL);
        assertA(0 == archive_write_set_format_ustar(a));
-       r = archive_write_set_compression_gzip(a);
+       r = archive_write_add_filter_gzip(a);
        if (r == ARCHIVE_FATAL) {
                skipping("Empty write to gzip-compressed archive");
        } else {
@@ -71,7 +71,7 @@ DEFINE_TEST(test_empty_write)
        /* Create a new archive in memory. */
        assert((a = archive_write_new()) != NULL);
        assertA(0 == archive_write_set_format_ustar(a));
-       r = archive_write_set_compression_bzip2(a);
+       r = archive_write_add_filter_bzip2(a);
        if (r == ARCHIVE_FATAL) {
                skipping("Empty write to bzip2-compressed archive");
        } else {
@@ -101,7 +101,7 @@ DEFINE_TEST(test_empty_write)
        /* Create a new archive in memory. */
        assert((a = archive_write_new()) != NULL);
        assertA(0 == archive_write_set_format_ustar(a));
-       assertA(0 == archive_write_set_compression_none(a));
+       assertA(0 == archive_write_add_filter_none(a));
        assertA(0 == archive_write_open_memory(a, buff, sizeof(buff), &used));
        /* Write a file to it. */
        assert((ae = archive_entry_new()) != NULL);

diff --git a/libarchive/test/test_filter_count.c b/libarchive/test/test_filter_count.c
index 175c88cc255a145e9e3d26b283834de60a8263bc..e15ab11c6f637b0e165e3f66b5ba947fbc03bc22 100644 (file)
--- a/libarchive/test/test_filter_count.c
+++ b/libarchive/test/test_filter_count.c
@@ -56,7 +56,7 @@ write_test(void)
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_bytes_per_block(a, 10));
 
-       if(ARCHIVE_OK != archive_write_set_compression_bzip2(a)) {
+       if(ARCHIVE_OK != archive_write_add_filter_bzip2(a)) {
                skipping("bzip2 unsupported");
                return;
        }

diff --git a/libarchive/test/test_open_fd.c b/libarchive/test/test_open_fd.c
index 13b594a05fa27906abc33f9b983b57eba92b2cfd..ff5fab1ad45b92418564d633eb835d069c40c740 100644 (file)
--- a/libarchive/test/test_open_fd.c
+++ b/libarchive/test/test_open_fd.c
@@ -55,7 +55,7 @@ DEFINE_TEST(test_open_fd)
        /* Write an archive through this fd. */
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
-       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_none(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_none(a));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_open_fd(a, fd));
 
        /*

diff --git a/libarchive/test/test_open_file.c b/libarchive/test/test_open_file.c
index 4308f024344b5cd7a60a78a6b886152178acccae..bee4b3b4835b4c46d3fe608d8eadd477c747f96b 100644 (file)
--- a/libarchive/test/test_open_file.c
+++ b/libarchive/test/test_open_file.c
@@ -40,7 +40,7 @@ DEFINE_TEST(test_open_file)
        /* Write an archive through this FILE *. */
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
-       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_none(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_none(a));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_open_FILE(a, f));
 
        /*

diff --git a/libarchive/test/test_open_filename.c b/libarchive/test/test_open_filename.c
index 15646b86162bf6bd897a1cc8671378c8cb8cafc3..91afce244ae493d84f973f2e70785e01fe5b274c 100644 (file)
--- a/libarchive/test/test_open_filename.c
+++ b/libarchive/test/test_open_filename.c
@@ -35,7 +35,7 @@ test_open_filename_mbs(void)
        /* Write an archive through this FILE *. */
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
-       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_none(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_none(a));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_open_filename(a, "test.tar"));
 
@@ -119,7 +119,7 @@ test_open_filename_wcs(void)
        /* Write an archive through this FILE *. */
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
-       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_none(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_none(a));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_open_filename_w(a, L"test.tar"));
 

diff --git a/libarchive/test/test_pax_filename_encoding.c b/libarchive/test/test_pax_filename_encoding.c
index 3a28e2f7dda219cf2a6928bdbaabfdf1212263dc..e03276e411f0e9793ff7f41ea77fac589e96f26c 100644 (file)
--- a/libarchive/test/test_pax_filename_encoding.c
+++ b/libarchive/test/test_pax_filename_encoding.c
@@ -115,7 +115,7 @@ test_pax_filename_encoding_2(void)
 
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, 0, archive_write_set_format_pax(a));
-       assertEqualIntA(a, 0, archive_write_set_compression_none(a));
+       assertEqualIntA(a, 0, archive_write_add_filter_none(a));
        assertEqualIntA(a, 0, archive_write_set_bytes_per_block(a, 0));
        assertEqualInt(0,
            archive_write_open_memory(a, buff, sizeof(buff), &used));
@@ -234,7 +234,7 @@ test_pax_filename_encoding_3(void)
 
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, 0, archive_write_set_format_pax(a));
-       assertEqualIntA(a, 0, archive_write_set_compression_none(a));
+       assertEqualIntA(a, 0, archive_write_add_filter_none(a));
        assertEqualIntA(a, 0, archive_write_set_bytes_per_block(a, 0));
        assertEqualInt(0,
            archive_write_open_memory(a, buff, sizeof(buff), &used));

diff --git a/libarchive/test/test_read_data_large.c b/libarchive/test/test_read_data_large.c
index 963ee95ef66f527e8f2bc03a5359229b8975c7e5..7bb72c01ed50e3027ae6886eb54e48ec52587302 100644 (file)
--- a/libarchive/test/test_read_data_large.c
+++ b/libarchive/test/test_read_data_large.c
@@ -55,7 +55,7 @@ DEFINE_TEST(test_read_data_large)
        /* Create a new archive in memory. */
        assert((a = archive_write_new()) != NULL);
        assertA(0 == archive_write_set_format_ustar(a));
-       assertA(0 == archive_write_set_compression_none(a));
+       assertA(0 == archive_write_add_filter_none(a));
        assertA(0 == archive_write_open_memory(a, buff1, sizeof(buff1), &used));
 
        /*

diff --git a/libarchive/test/test_read_extract.c b/libarchive/test/test_read_extract.c
index d7de26b6ee6188822d16e1aad9c35a62f97baa49..c537e4f936c47f2cf34599fbb848254832d3b91e 100644 (file)
--- a/libarchive/test/test_read_extract.c
+++ b/libarchive/test/test_read_extract.c
@@ -45,7 +45,7 @@ DEFINE_TEST(test_read_extract)
        /* Create a new archive in memory containing various types of entries. */
        assert((a = archive_write_new()) != NULL);
        assertA(0 == archive_write_set_format_ustar(a));
-       assertA(0 == archive_write_set_compression_none(a));
+       assertA(0 == archive_write_add_filter_none(a));
        assertA(0 == archive_write_open_memory(a, buff, BUFF_SIZE, &used));
        /* A directory to be restored with EXTRACT_PERM. */
        ++numEntries;

diff --git a/libarchive/test/test_read_pax_truncated.c b/libarchive/test/test_read_pax_truncated.c
index 7c1ba6c1e2abdd9e3eec7891acf57aac09e5b775..bc5d74d5bdb8536fec2ee06a38ff80f470335338 100644 (file)
--- a/libarchive/test/test_read_pax_truncated.c
+++ b/libarchive/test/test_read_pax_truncated.c
@@ -38,7 +38,7 @@ DEFINE_TEST(test_read_pax_truncated)
        /* Create a new archive in memory. */
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_pax(a));
-       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_none(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_none(a));
        assertEqualIntA(a, ARCHIVE_OK,
                        archive_write_open_memory(a, buff, buff_size, &used));
 

diff --git a/libarchive/test/test_read_truncated.c b/libarchive/test/test_read_truncated.c
index 306834127972f56189c3aefa621c39c35b669e0f..3e66525673872fc4fe9a072dfadc3d6311932a33 100644 (file)
--- a/libarchive/test/test_read_truncated.c
+++ b/libarchive/test/test_read_truncated.c
@@ -38,7 +38,7 @@ DEFINE_TEST(test_read_truncated)
        /* Create a new archive in memory. */
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
-       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_none(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_none(a));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_open_memory(a, buff, sizeof(buff), &used));
 
        /*

diff --git a/libarchive/test/test_read_truncated_filter.c b/libarchive/test/test_read_truncated_filter.c
index cb7611ec4c82117a4c090ff3054a4e726a02a0ea..ce2f1fd007f4ee8f23df9eefffae43aabeb5758d 100644 (file)
--- a/libarchive/test/test_read_truncated_filter.c
+++ b/libarchive/test/test_read_truncated_filter.c
@@ -55,7 +55,7 @@ test_truncation(const char *compression, int (*set_compression)(struct archive *
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
        assertEqualIntA(a, ARCHIVE_OK,
-           archive_write_set_compression_compress(a));
+           archive_write_add_filter_compress(a));
        r = (*set_compression)(a);
        if (r == ARCHIVE_FATAL) {
                skipping("%s writing not supported on this platform", compression);
@@ -123,10 +123,10 @@ test_truncation(const char *compression, int (*set_compression)(struct archive *
 
 DEFINE_TEST(test_read_truncated_filter)
 {
-       test_truncation("bzip2", archive_write_set_compression_bzip2);
-       test_truncation("compress", archive_write_set_compression_compress);
-       test_truncation("gzip", archive_write_set_compression_gzip);
-       test_truncation("lzip", archive_write_set_compression_lzip);
-       test_truncation("lzma", archive_write_set_compression_lzma);
-       test_truncation("xz", archive_write_set_compression_xz);
+       test_truncation("bzip2", archive_write_add_filter_bzip2);
+       test_truncation("compress", archive_write_add_filter_compress);
+       test_truncation("gzip", archive_write_add_filter_gzip);
+       test_truncation("lzip", archive_write_add_filter_lzip);
+       test_truncation("lzma", archive_write_add_filter_lzma);
+       test_truncation("xz", archive_write_add_filter_xz);
 }

diff --git a/libarchive/test/test_tar_filenames.c b/libarchive/test/test_tar_filenames.c
index de423bbe9787c731b174ec665fcfe5f6d39bf5dc..84e955cc4b087287dc5968c03f62dc2672a04086 100644 (file)
--- a/libarchive/test/test_tar_filenames.c
+++ b/libarchive/test/test_tar_filenames.c
@@ -62,7 +62,7 @@ test_filename(const char *prefix, int dlen, int flen)
        /* Create a new archive in memory. */
        assert((a = archive_write_new()) != NULL);
        assertA(0 == archive_write_set_format_pax_restricted(a));
-       assertA(0 == archive_write_set_compression_none(a));
+       assertA(0 == archive_write_add_filter_none(a));
        assertA(0 == archive_write_set_bytes_per_block(a,0));
        assertA(0 == archive_write_open_memory(a, buff, sizeof(buff), &used));
 

diff --git a/libarchive/test/test_ustar_filenames.c b/libarchive/test/test_ustar_filenames.c
index 55665bb610a48109811f0077ce5960dbb75bd294..1a4b4e1452c2cb0f6e7099ebdaaf405e8be350ff 100644 (file)
--- a/libarchive/test/test_ustar_filenames.c
+++ b/libarchive/test/test_ustar_filenames.c
@@ -60,7 +60,7 @@ test_filename(const char *prefix, int dlen, int flen)
        /* Create a new archive in memory. */
        assert((a = archive_write_new()) != NULL);
        assertA(0 == archive_write_set_format_ustar(a));
-       assertA(0 == archive_write_set_compression_none(a));
+       assertA(0 == archive_write_add_filter_none(a));
        assertA(0 == archive_write_set_bytes_per_block(a,0));
        assertA(0 == archive_write_open_memory(a, buff, sizeof(buff), &used));
 

diff --git a/libarchive/test/test_write_compress.c b/libarchive/test/test_write_compress.c
index bb81c4f311bf8d367196ca3fcbca830096350e85..7a398742edd0d6d381ac05990103deb0b01933cd 100644 (file)
--- a/libarchive/test/test_write_compress.c
+++ b/libarchive/test/test_write_compress.c
@@ -54,7 +54,7 @@ DEFINE_TEST(test_write_compress)
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_set_format_ustar(a));
        assertEqualIntA(a, ARCHIVE_OK,
-           archive_write_set_compression_compress(a));
+           archive_write_add_filter_compress(a));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_open_memory(a, buff, buffsize, &used));
 

diff --git a/libarchive/test/test_write_compress_bzip2.c b/libarchive/test/test_write_compress_bzip2.c
index b9e92369a9c2d06ab5fa3e3e5c14d47507f4d06d..98cda704674f52ff67062cb8af71d092e58bec5f 100644 (file)
--- a/libarchive/test/test_write_compress_bzip2.c
+++ b/libarchive/test/test_write_compress_bzip2.c
@@ -55,7 +55,7 @@ DEFINE_TEST(test_write_compress_bzip2)
         */
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
-       r = archive_write_set_compression_bzip2(a);
+       r = archive_write_add_filter_bzip2(a);
        if (r == ARCHIVE_FATAL) {
                skipping("bzip2 writing not supported on this platform");
                assertEqualInt(ARCHIVE_OK, archive_write_free(a));
@@ -104,7 +104,7 @@ DEFINE_TEST(test_write_compress_bzip2)
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_set_bytes_per_block(a, 10));
-       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_bzip2(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_bzip2(a));
        assertEqualIntA(a, ARCHIVE_FAILED,
            archive_write_set_filter_option(a, NULL, "nonexistent-option", "0"));
        assertEqualIntA(a, ARCHIVE_FAILED,
@@ -156,7 +156,7 @@ DEFINE_TEST(test_write_compress_bzip2)
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_set_bytes_per_block(a, 10));
-       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_bzip2(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_bzip2(a));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_set_filter_option(a, NULL, "compression-level", "1"));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_open_memory(a, buff, buffsize, &used2));
@@ -199,23 +199,23 @@ DEFINE_TEST(test_write_compress_bzip2)
         * don't crash or leak memory.
         */
        assert((a = archive_write_new()) != NULL);
-       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_bzip2(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_bzip2(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        assert((a = archive_write_new()) != NULL);
-       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_bzip2(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_bzip2(a));
        assertEqualInt(ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
-       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_bzip2(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_bzip2(a));
        assertEqualInt(ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
-       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_bzip2(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_bzip2(a));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_open_memory(a, buff, buffsize, &used2));
        assertEqualInt(ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));

diff --git a/libarchive/test/test_write_compress_gzip.c b/libarchive/test/test_write_compress_gzip.c
index c8281e7b6f23bd011288fd003e99095dc06b3c75..0ab88a4bc47320e927bbfde3f5aedd2086b9f165 100644 (file)
--- a/libarchive/test/test_write_compress_gzip.c
+++ b/libarchive/test/test_write_compress_gzip.c
@@ -55,9 +55,7 @@ DEFINE_TEST(test_write_compress_gzip)
         */
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
-       assertEqualIntA(a, ARCHIVE_OK,
-           archive_write_set_compression_compress(a));
-       r = archive_write_set_compression_gzip(a);
+       r = archive_write_add_filter_gzip(a);
        if (r == ARCHIVE_FATAL) {
                skipping("gzip writing not supported on this platform");
                assertEqualInt(ARCHIVE_OK, archive_write_free(a));
@@ -68,8 +66,6 @@ DEFINE_TEST(test_write_compress_gzip)
        assertEqualInt(ARCHIVE_COMPRESSION_GZIP, archive_compression(a));
        assertEqualString("gzip", archive_compression_name(a));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_open_memory(a, buff, buffsize, &used1));
-       assertEqualInt(ARCHIVE_COMPRESSION_GZIP, archive_compression(a));
-       assertEqualString("gzip", archive_compression_name(a));
        assert((ae = archive_entry_new()) != NULL);
        archive_entry_set_filetype(ae, AE_IFREG);
        archive_entry_set_size(ae, datasize);
@@ -113,7 +109,7 @@ DEFINE_TEST(test_write_compress_gzip)
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_set_bytes_per_block(a, 10));
-       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_gzip(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_gzip(a));
        assertEqualIntA(a, ARCHIVE_FAILED,
            archive_write_set_options(a, "gzip:nonexistent-option=0"));
        assertEqualIntA(a, ARCHIVE_OK,
@@ -177,7 +173,7 @@ DEFINE_TEST(test_write_compress_gzip)
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_set_bytes_per_block(a, 10));
-       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_gzip(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_gzip(a));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_set_filter_option(a, NULL, "compression-level", "0"));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_open_memory(a, buff, buffsize, &used2));
@@ -227,23 +223,23 @@ DEFINE_TEST(test_write_compress_gzip)
         * don't crash or leak memory.
         */
        assert((a = archive_write_new()) != NULL);
-       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_gzip(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_gzip(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        assert((a = archive_write_new()) != NULL);
-       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_gzip(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_gzip(a));
        assertEqualInt(ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
-       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_gzip(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_gzip(a));
        assertEqualInt(ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
-       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_gzip(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_gzip(a));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_open_memory(a, buff, buffsize, &used2));
        assertEqualInt(ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));

diff --git a/libarchive/test/test_write_compress_lzip.c b/libarchive/test/test_write_compress_lzip.c
index 7dd8bcf24a2566026209579b46ddc4862719ba1e..d53920341076cfaa3f79ea48f0103a38cce8cbf1 100644 (file)
--- a/libarchive/test/test_write_compress_lzip.c
+++ b/libarchive/test/test_write_compress_lzip.c
@@ -55,7 +55,7 @@ DEFINE_TEST(test_write_compress_lzip)
         */
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
-       r = archive_write_set_compression_lzip(a);
+       r = archive_write_add_filter_lzip(a);
        if (r == ARCHIVE_FATAL) {
                skipping("lzip writing not supported on this platform");
                assertEqualInt(ARCHIVE_OK, archive_write_free(a));
@@ -114,7 +114,7 @@ DEFINE_TEST(test_write_compress_lzip)
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_set_bytes_per_block(a, 10));
-       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_lzip(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_lzip(a));
        assertEqualIntA(a, ARCHIVE_FAILED,
            archive_write_set_filter_option(a, NULL, "nonexistent-option", "0"));
        assertEqualIntA(a, ARCHIVE_FAILED,
@@ -168,7 +168,7 @@ DEFINE_TEST(test_write_compress_lzip)
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_set_bytes_per_block(a, 10));
-       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_lzip(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_lzip(a));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_set_filter_option(a, NULL, "compression-level", "0"));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_open_memory(a, buff, buffsize, &used2));
@@ -218,23 +218,23 @@ DEFINE_TEST(test_write_compress_lzip)
         * don't crash or leak memory.
         */
        assert((a = archive_write_new()) != NULL);
-       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_lzip(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_lzip(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        assert((a = archive_write_new()) != NULL);
-       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_lzip(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_lzip(a));
        assertEqualInt(ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
-       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_lzip(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_lzip(a));
        assertEqualInt(ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
-       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_lzip(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_lzip(a));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_open_memory(a, buff, buffsize, &used2));
        assertEqualInt(ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));

diff --git a/libarchive/test/test_write_compress_lzma.c b/libarchive/test/test_write_compress_lzma.c
index f3b9de369f2b05f5b4efa87d593affd23f856f14..38b604760fcbb66621f52dd6a11070b1734cbd80 100644 (file)
--- a/libarchive/test/test_write_compress_lzma.c
+++ b/libarchive/test/test_write_compress_lzma.c
@@ -54,7 +54,7 @@ DEFINE_TEST(test_write_compress_lzma)
         */
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
-       r = archive_write_set_compression_lzma(a);
+       r = archive_write_add_filter_lzma(a);
        if (r == ARCHIVE_FATAL) {
                skipping("lzma writing not supported on this platform");
                assertEqualInt(ARCHIVE_OK, archive_write_free(a));
@@ -113,7 +113,7 @@ DEFINE_TEST(test_write_compress_lzma)
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_set_bytes_per_block(a, 10));
-       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_lzma(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_lzma(a));
        assertEqualIntA(a, ARCHIVE_FAILED,
            archive_write_set_filter_option(a, NULL, "nonexistent-option", "0"));
        assertEqualIntA(a, ARCHIVE_FAILED,
@@ -167,7 +167,7 @@ DEFINE_TEST(test_write_compress_lzma)
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_set_bytes_per_block(a, 10));
-       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_lzma(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_lzma(a));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_set_filter_option(a, NULL, "compression-level", "0"));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_open_memory(a, buff, buffsize, &used2));
@@ -222,23 +222,23 @@ DEFINE_TEST(test_write_compress_lzma)
         * don't crash or leak memory.
         */
        assert((a = archive_write_new()) != NULL);
-       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_lzma(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_lzma(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        assert((a = archive_write_new()) != NULL);
-       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_lzma(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_lzma(a));
        assertEqualInt(ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
-       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_lzma(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_lzma(a));
        assertEqualInt(ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
-       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_lzma(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_lzma(a));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_open_memory(a, buff, buffsize, &used2));
        assertEqualInt(ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));

diff --git a/libarchive/test/test_write_compress_xz.c b/libarchive/test/test_write_compress_xz.c
index 281dbcf55752fc2c8e256a5a0d2ace18c283103f..16332630cf905ba58525c95514674bb6d1eb548a 100644 (file)
--- a/libarchive/test/test_write_compress_xz.c
+++ b/libarchive/test/test_write_compress_xz.c
@@ -55,7 +55,7 @@ DEFINE_TEST(test_write_compress_xz)
         */
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
-       r = archive_write_set_compression_xz(a);
+       r = archive_write_add_filter_xz(a);
        if (r == ARCHIVE_FATAL) {
                skipping("xz writing not supported on this platform");
                assertEqualInt(ARCHIVE_OK, archive_write_free(a));
@@ -113,7 +113,7 @@ DEFINE_TEST(test_write_compress_xz)
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_set_bytes_per_block(a, 10));
-       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_xz(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_xz(a));
        assertEqualIntA(a, ARCHIVE_FAILED,
            archive_write_set_filter_option(a, NULL, "nonexistent-option", "0"));
        assertEqualIntA(a, ARCHIVE_FAILED,
@@ -174,7 +174,7 @@ DEFINE_TEST(test_write_compress_xz)
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_set_bytes_per_block(a, 10));
-       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_xz(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_xz(a));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_set_filter_option(a, NULL, "compression-level", "0"));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_open_memory(a, buff, buffsize, &used2));
@@ -228,23 +228,23 @@ DEFINE_TEST(test_write_compress_xz)
         * don't crash or leak memory.
         */
        assert((a = archive_write_new()) != NULL);
-       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_xz(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_xz(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        assert((a = archive_write_new()) != NULL);
-       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_xz(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_xz(a));
        assertEqualInt(ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
-       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_xz(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_xz(a));
        assertEqualInt(ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
 
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
-       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_xz(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_xz(a));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_open_memory(a, buff, buffsize, &used2));
        assertEqualInt(ARCHIVE_OK, archive_write_close(a));
        assertEqualInt(ARCHIVE_OK, archive_write_free(a));

diff --git a/libarchive/test/test_write_format_7zip.c b/libarchive/test/test_write_format_7zip.c
index b0f0a68fb6308d80a6394779c157545e16e53da7..c92b753ef47442e1a64bb9d1a9ce1588114921d2 100644 (file)
--- a/libarchive/test/test_write_format_7zip.c
+++ b/libarchive/test/test_write_format_7zip.c
@@ -51,7 +51,7 @@ test_basic(const char *compression_type)
                free(buff);
                return;
        }
-       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_none(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_none(a));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_open_memory(a, buff, buffsize, &used));
 
@@ -341,7 +341,7 @@ test_basic2(const char *compression_type)
                free(buff);
                return;
        }
-       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_none(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_none(a));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_open_memory(a, buff, buffsize, &used));
 
@@ -540,7 +540,7 @@ test_empty_archive(void)
        /* Create a new archive in memory. */
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_7zip(a));
-       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_none(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_none(a));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_open_memory(a, buff, buffsize, &used));
 
@@ -578,7 +578,7 @@ test_only_empty_file(void)
        /* Create a new archive in memory. */
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_7zip(a));
-       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_none(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_none(a));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_open_memory(a, buff, buffsize, &used));
 
@@ -667,7 +667,7 @@ test_only_empty_files(void)
        /* Create a new archive in memory. */
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_7zip(a));
-       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_none(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_none(a));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_open_memory(a, buff, buffsize, &used));
 

diff --git a/libarchive/test/test_write_format_cpio.c b/libarchive/test/test_write_format_cpio.c
index 2984a6a37c9a9d1cad5d2b4271ab106b77386a1d..9f7307f28ca2d179d0451ceacf9a192c42c1f651 100644 (file)
--- a/libarchive/test/test_write_format_cpio.c
+++ b/libarchive/test/test_write_format_cpio.c
@@ -42,7 +42,7 @@ test_format(int       (*set_format)(struct archive *))
        /* Create a new archive in memory. */
        assert((a = archive_write_new()) != NULL);
        assertA(0 == (*set_format)(a));
-       assertA(0 == archive_write_set_compression_none(a));
+       assertA(0 == archive_write_add_filter_none(a));
        assertA(0 == archive_write_open_memory(a, buff, buffsize, &used));
 
        /*
@@ -234,7 +234,7 @@ test_big_entries(int (*set_format)(struct archive *), int64_t size, int expected
        /* Create a new archive in memory. */
        assert((a = archive_write_new()) != NULL);
        assertA(0 == (*set_format)(a));
-       assertA(0 == archive_write_set_compression_none(a));
+       assertA(0 == archive_write_add_filter_none(a));
        assertA(0 == archive_write_open_memory(a, buff, buffsize, &used));
 
        assert((ae = archive_entry_new()) != NULL);

diff --git a/libarchive/test/test_write_format_cpio_empty.c b/libarchive/test/test_write_format_cpio_empty.c
index 53aaec822712ccb2f0ffa4024d0d33780504369f..60fb283401337cbbf044a9c369afe1a444f5748b 100644 (file)
--- a/libarchive/test/test_write_format_cpio_empty.c
+++ b/libarchive/test/test_write_format_cpio_empty.c
@@ -53,7 +53,7 @@ DEFINE_TEST(test_write_format_cpio_empty)
        /* Create a new archive in memory. */
        assert((a = archive_write_new()) != NULL);
        assertA(0 == archive_write_set_format_cpio(a));
-       assertA(0 == archive_write_set_compression_none(a));
+       assertA(0 == archive_write_add_filter_none(a));
        /* 1-byte block size ensures we see only the required bytes. */
        /* We're not testing the padding here. */
        assertA(0 == archive_write_set_bytes_per_block(a, 1));

diff --git a/libarchive/test/test_write_format_cpio_newc.c b/libarchive/test/test_write_format_cpio_newc.c
index 81c3d22d90e13661a628e5b17015b6489579f9f2..3bbc173017f93e0c4d5053748ad6fab9f56617d1 100644 (file)
--- a/libarchive/test/test_write_format_cpio_newc.c
+++ b/libarchive/test/test_write_format_cpio_newc.c
@@ -61,7 +61,7 @@ DEFINE_TEST(test_write_format_cpio_newc)
        /* Create a new archive in memory. */
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, 0, archive_write_set_format_cpio_newc(a));
-       assertEqualIntA(a, 0, archive_write_set_compression_none(a));
+       assertEqualIntA(a, 0, archive_write_add_filter_none(a));
        assertEqualIntA(a, 0, archive_write_open_memory(a, buff, buffsize, &used));
 
        /*

diff --git a/libarchive/test/test_write_format_cpio_odc.c b/libarchive/test/test_write_format_cpio_odc.c
index 48af04ecf355653e9b8d8c7596d16df20e7aa2e0..ba1fecd5f0eaf5efd56df3e1910c30ce6a848bc4 100644 (file)
--- a/libarchive/test/test_write_format_cpio_odc.c
+++ b/libarchive/test/test_write_format_cpio_odc.c
@@ -55,7 +55,7 @@ DEFINE_TEST(test_write_format_cpio_odc)
        /* Create a new archive in memory. */
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, 0, archive_write_set_format_cpio(a));
-       assertEqualIntA(a, 0, archive_write_set_compression_none(a));
+       assertEqualIntA(a, 0, archive_write_add_filter_none(a));
        assertEqualIntA(a, 0, archive_write_open_memory(a, buff, buffsize, &used));
 
        /*

diff --git a/libarchive/test/test_write_format_gnutar.c b/libarchive/test/test_write_format_gnutar.c
index 42063e9cfa363499120fde1977a11004260d4173..67f5a107cb4c1eaa0d1917661469919d41aef62e 100644 (file)
--- a/libarchive/test/test_write_format_gnutar.c
+++ b/libarchive/test/test_write_format_gnutar.c
@@ -109,7 +109,7 @@ DEFINE_TEST(test_write_format_gnutar)
        /* Create a new archive in memory. */
        assert((a = archive_write_new()) != NULL);
        assertA(0 == archive_write_set_format_gnutar(a));
-       assertA(0 == archive_write_set_compression_none(a));
+       assertA(0 == archive_write_add_filter_none(a));
        assertA(0 == archive_write_open_memory(a, buff, buffsize, &used));
 
        /*

diff --git a/libarchive/test/test_write_format_iso9660.c b/libarchive/test/test_write_format_iso9660.c
index dd027afa32d5b620e7385f0621dbb38a4f8bbfa5..9c5a005fd131d4a602b508685d2daec5ea102839 100644 (file)
--- a/libarchive/test/test_write_format_iso9660.c
+++ b/libarchive/test/test_write_format_iso9660.c
@@ -50,7 +50,7 @@ DEFINE_TEST(test_write_format_iso9660)
        /* Create a new archive in memory. */
        assert((a = archive_write_new()) != NULL);
        assertA(0 == archive_write_set_format_iso9660(a));
-       assertA(0 == archive_write_set_compression_none(a));
+       assertA(0 == archive_write_add_filter_none(a));
        assertA(0 == archive_write_open_memory(a, buff, buffsize, &used));
 
        /*

diff --git a/libarchive/test/test_write_format_iso9660_boot.c b/libarchive/test/test_write_format_iso9660_boot.c
index d3f8ab0e9349f6a778ed402d250172006d2f19d5..b1f185b9c45503e48d0e130fc5d30a817bb9daaf 100644 (file)
--- a/libarchive/test/test_write_format_iso9660_boot.c
+++ b/libarchive/test/test_write_format_iso9660_boot.c
@@ -104,7 +104,7 @@ _test_write_format_iso9660_boot(int write_info_tbl)
        /* ISO9660 format: Create a new archive in memory. */
        assert((a = archive_write_new()) != NULL);
        assertA(0 == archive_write_set_format_iso9660(a));
-       assertA(0 == archive_write_set_compression_none(a));
+       assertA(0 == archive_write_add_filter_none(a));
        assertA(0 == archive_write_set_option(a, NULL, "boot", "boot.img"));
        if (write_info_tbl)
                assertA(0 == archive_write_set_option(a, NULL, "boot-info-table", "1"));

diff --git a/libarchive/test/test_write_format_iso9660_empty.c b/libarchive/test/test_write_format_iso9660_empty.c
index 1c5acdbfc58bdfb0b96e4adc2f9066f3ba9b687b..c731d6ef20d8e0e65f50e37f15e22c4d2b0bb7f9 100644 (file)
--- a/libarchive/test/test_write_format_iso9660_empty.c
+++ b/libarchive/test/test_write_format_iso9660_empty.c
@@ -62,7 +62,7 @@ DEFINE_TEST(test_write_format_iso9660_empty)
        /* ISO9660 format: Create a new archive in memory. */
        assert((a = archive_write_new()) != NULL);
        assertA(0 == archive_write_set_format_iso9660(a));
-       assertA(0 == archive_write_set_compression_none(a));
+       assertA(0 == archive_write_add_filter_none(a));
        assertA(0 == archive_write_set_bytes_per_block(a, 1));
        assertA(0 == archive_write_set_bytes_in_last_block(a, 1));
        assertA(0 == archive_write_open_memory(a, buff, buffsize, &used));

diff --git a/libarchive/test/test_write_format_iso9660_filename.c b/libarchive/test/test_write_format_iso9660_filename.c
index 1565af6b37ce7150caef75b461d5ea6a1872586c..7b57ed5f0b91ae23b88a988f3af0a4e417f06b7a 100644 (file)
--- a/libarchive/test/test_write_format_iso9660_filename.c
+++ b/libarchive/test/test_write_format_iso9660_filename.c
@@ -218,7 +218,7 @@ create_iso_image(unsigned char *buff, size_t buffsize, size_t *used,
        /* ISO9660 format: Create a new archive in memory. */
        assert((a = archive_write_new()) != NULL);
        assertA(0 == archive_write_set_format_iso9660(a));
-       assertA(0 == archive_write_set_compression_none(a));
+       assertA(0 == archive_write_add_filter_none(a));
        assertA(0 == archive_write_set_option(a, NULL, "pad", NULL));
        if (opt)
                assertA(0 == archive_write_set_options(a, opt));

diff --git a/libarchive/test/test_write_format_iso9660_zisofs.c b/libarchive/test/test_write_format_iso9660_zisofs.c
index 2e3e03f15f92cd72f34c0fc10c32d1c7f8bc0762..26a30586bc981d0338307db94f89f1fca40ebf05 100644 (file)
--- a/libarchive/test/test_write_format_iso9660_zisofs.c
+++ b/libarchive/test/test_write_format_iso9660_zisofs.c
@@ -110,7 +110,7 @@ test_write_format_iso9660_zisofs_1(void)
        /* ISO9660 format: Create a new archive in memory. */
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, 0, archive_write_set_format_iso9660(a));
-       assertEqualIntA(a, 0, archive_write_set_compression_none(a));
+       assertEqualIntA(a, 0, archive_write_add_filter_none(a));
        r = archive_write_set_option(a, NULL, "zisofs", "1");
        if (r == ARCHIVE_FATAL) {
                skipping("zisofs option not supported on this platform");
@@ -339,7 +339,7 @@ test_write_format_iso9660_zisofs_2(void)
        /* ISO9660 format: Create a new archive in memory. */
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, 0, archive_write_set_format_iso9660(a));
-       assertEqualIntA(a, 0, archive_write_set_compression_none(a));
+       assertEqualIntA(a, 0, archive_write_add_filter_none(a));
        r = archive_write_set_option(a, NULL, "zisofs", "1");
        if (r == ARCHIVE_FATAL) {
                skipping("zisofs option not supported on this platform");
@@ -589,7 +589,7 @@ test_write_format_iso9660_zisofs_3(void)
        /* ISO9660 format: Create a new archive in memory. */
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, 0, archive_write_set_format_iso9660(a));
-       assertEqualIntA(a, 0, archive_write_set_compression_none(a));
+       assertEqualIntA(a, 0, archive_write_add_filter_none(a));
        r = archive_write_set_option(a, NULL, "zisofs", "1");
        if (r == ARCHIVE_FATAL) {
                skipping("zisofs option not supported on this platform");

diff --git a/libarchive/test/test_write_format_pax.c b/libarchive/test/test_write_format_pax.c
index 21517188e1da3a0002c5c804b719cd4da1eba514..d29e9adcd867f568a619a5b3f32dd4ac66b4cdbc 100644 (file)
--- a/libarchive/test/test_write_format_pax.c
+++ b/libarchive/test/test_write_format_pax.c
@@ -44,7 +44,7 @@ DEFINE_TEST(test_write_format_pax)
        /* Create a new archive in memory. */
        assert((a = archive_write_new()) != NULL);
        assertA(0 == archive_write_set_format_pax(a));
-       assertA(0 == archive_write_set_compression_none(a));
+       assertA(0 == archive_write_add_filter_none(a));
        assertA(0 == archive_write_open_memory(a, buff, buffsize, &used));
 
        /*

diff --git a/libarchive/test/test_write_format_shar_empty.c b/libarchive/test/test_write_format_shar_empty.c
index 09cfcd6b7598404e97db663cd09ba5403b52620b..03d70a3b5fa6a4517aee86bbfb43280d9ec89f9a 100644 (file)
--- a/libarchive/test/test_write_format_shar_empty.c
+++ b/libarchive/test/test_write_format_shar_empty.c
@@ -38,7 +38,7 @@ DEFINE_TEST(test_write_format_shar_empty)
        /* Create a new archive in memory. */
        assert((a = archive_write_new()) != NULL);
        assertA(0 == archive_write_set_format_shar(a));
-       assertA(0 == archive_write_set_compression_none(a));
+       assertA(0 == archive_write_add_filter_none(a));
        /* 1-byte block size ensures we see only the required bytes. */
        /* We're not testing the padding here. */
        assertA(0 == archive_write_set_bytes_per_block(a, 1));

diff --git a/libarchive/test/test_write_format_tar.c b/libarchive/test/test_write_format_tar.c
index 81aeab64b334985619f4535177e25011a7df3376..7d16bbfc6ec3c8dd20469f8a9e909d66d39bb3bd 100644 (file)
--- a/libarchive/test/test_write_format_tar.c
+++ b/libarchive/test/test_write_format_tar.c
@@ -43,7 +43,7 @@ DEFINE_TEST(test_write_format_tar)
                assertEqualIntA(a, ARCHIVE_OK,
                    archive_write_set_format_ustar(a));
                assertEqualIntA(a, ARCHIVE_OK,
-                   archive_write_set_compression_none(a));
+                   archive_write_add_filter_none(a));
                assertEqualIntA(a, ARCHIVE_OK,
                    archive_write_set_bytes_per_block(a, (int)blocksize));
                assertEqualIntA(a, ARCHIVE_OK,

diff --git a/libarchive/test/test_write_format_tar_empty.c b/libarchive/test/test_write_format_tar_empty.c
index f9e972b4064b1d39dc96b2f7530a7f48e2411319..7ccd435f1233e955258158f72b76d27769983dd7 100644 (file)
--- a/libarchive/test/test_write_format_tar_empty.c
+++ b/libarchive/test/test_write_format_tar_empty.c
@@ -39,7 +39,7 @@ DEFINE_TEST(test_write_format_tar_empty)
        /* USTAR format: Create a new archive in memory. */
        assert((a = archive_write_new()) != NULL);
        assertA(0 == archive_write_set_format_ustar(a));
-       assertA(0 == archive_write_set_compression_none(a));
+       assertA(0 == archive_write_add_filter_none(a));
        assertA(0 == archive_write_set_bytes_per_block(a, 512));
        assertA(0 == archive_write_set_bytes_in_last_block(a, 512));
        assertA(0 == archive_write_open_memory(a, buff, sizeof(buff), &used));
@@ -57,7 +57,7 @@ DEFINE_TEST(test_write_format_tar_empty)
        /* PAX format: Create a new archive in memory. */
        assert((a = archive_write_new()) != NULL);
        assertA(0 == archive_write_set_format_pax(a));
-       assertA(0 == archive_write_set_compression_none(a));
+       assertA(0 == archive_write_add_filter_none(a));
        assertA(0 == archive_write_set_bytes_per_block(a, 512));
        assertA(0 == archive_write_set_bytes_in_last_block(a, 512));
        assertA(0 == archive_write_open_memory(a, buff, sizeof(buff), &used));

diff --git a/libarchive/test/test_write_format_tar_sparse.c b/libarchive/test/test_write_format_tar_sparse.c
index 00478160df9a5281f2baef1a81c41aacb7f17689..e0f1d6fda3dc5fa3fde126a32baf98d1cc6f18fb 100644 (file)
--- a/libarchive/test/test_write_format_tar_sparse.c
+++ b/libarchive/test/test_write_format_tar_sparse.c
@@ -49,7 +49,7 @@ test_1(void)
                assertEqualIntA(a, ARCHIVE_OK,
                    archive_write_set_format_pax(a));
                assertEqualIntA(a, ARCHIVE_OK,
-                   archive_write_set_compression_none(a));
+                   archive_write_add_filter_none(a));
                assertEqualIntA(a, ARCHIVE_OK,
                    archive_write_set_bytes_per_block(a, (int)blocksize));
                assertEqualIntA(a, ARCHIVE_OK,
@@ -190,7 +190,7 @@ test_2(void)
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_set_format_pax(a));
        assertEqualIntA(a, ARCHIVE_OK,
-           archive_write_set_compression_none(a));
+           archive_write_add_filter_none(a));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_set_bytes_per_block(a, (int)blocksize));
        assertEqualIntA(a, ARCHIVE_OK,

diff --git a/libarchive/test/test_write_format_tar_ustar.c b/libarchive/test/test_write_format_tar_ustar.c
index 52b50f45197d62d7eda4613c4b20c1543a41b7e4..7bc38f7b57fdd6f56478dbef25c3cce7a37c8084 100644 (file)
--- a/libarchive/test/test_write_format_tar_ustar.c
+++ b/libarchive/test/test_write_format_tar_ustar.c
@@ -79,7 +79,7 @@ DEFINE_TEST(test_write_format_tar_ustar)
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_set_format_ustar(a));
        assertEqualIntA(a, ARCHIVE_OK,
-           archive_write_set_compression_none(a));
+           archive_write_add_filter_none(a));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_open_memory(a, buff, buffsize, &used));
 

diff --git a/libarchive/test/test_write_format_xar.c b/libarchive/test/test_write_format_xar.c
index 449e49da1a9b6304f081c614064ac36e68fbe965..7cfdbcf4d17df3bd1ece4e0613a0545564ab957d 100644 (file)
--- a/libarchive/test/test_write_format_xar.c
+++ b/libarchive/test/test_write_format_xar.c
@@ -46,7 +46,7 @@ test_xar(const char *option)
                assertEqualIntA(a, ARCHIVE_OK, archive_write_free(a));
                return;
        }
-       assertA(0 == archive_write_set_compression_none(a));
+       assertA(0 == archive_write_add_filter_none(a));
        if (option != NULL &&
            archive_write_set_options(a, option) != ARCHIVE_OK) {
                skipping("option `%s` is not supported on this platform", option);

diff --git a/libarchive/test/test_write_format_xar_empty.c b/libarchive/test/test_write_format_xar_empty.c
index c9e6c4a221f1aa65b624a97c6bf4f3b28ada5a6b..aa26d5d151c9231fbe1d87d567ef4da21672bf6f 100644 (file)
--- a/libarchive/test/test_write_format_xar_empty.c
+++ b/libarchive/test/test_write_format_xar_empty.c
@@ -45,7 +45,7 @@ DEFINE_TEST(test_write_format_xar_empty)
                assertEqualIntA(a, ARCHIVE_OK, archive_write_free(a));
                return;
        }
-       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_none(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_none(a));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_bytes_per_block(a, 1));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_bytes_in_last_block(a, 1));
        assertEqualIntA(a, ARCHIVE_OK,

diff --git a/libarchive/test/test_write_format_zip.c b/libarchive/test/test_write_format_zip.c
index f7e5ebfffbb52d2231e528735e15ddee7efdaf84..53ce3acc853756166611191b0cc40ffdcd827610 100644 (file)
--- a/libarchive/test/test_write_format_zip.c
+++ b/libarchive/test/test_write_format_zip.c
@@ -136,7 +136,7 @@ DEFINE_TEST(test_write_format_zip)
 #endif
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_set_format_option(a, "zip", "compression", compression_type));
-       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_none(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_none(a));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_open_memory(a, buff, buffsize, &used));
 

diff --git a/libarchive/test/test_write_format_zip_empty.c b/libarchive/test/test_write_format_zip_empty.c
index 15672608052014bcbc8b420d298c5eeb4c790483..2e3afec71fd33cc607ee556196c2a07c1a3b0a31 100644 (file)
--- a/libarchive/test/test_write_format_zip_empty.c
+++ b/libarchive/test/test_write_format_zip_empty.c
@@ -40,7 +40,7 @@ DEFINE_TEST(test_write_format_zip_empty)
        /* Zip format: Create a new archive in memory. */
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_zip(a));
-       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_none(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_none(a));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_bytes_per_block(a, 1));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_bytes_in_last_block(a, 1));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_open_memory(a, buff, sizeof(buff), &used));

diff --git a/libarchive/test/test_write_format_zip_no_compression.c b/libarchive/test/test_write_format_zip_no_compression.c
index 9c570c942489c5dc2c68f71cc3325dbc58842778..9d47f9b746f752466bf90be78296f216e788ab46 100644 (file)
--- a/libarchive/test/test_write_format_zip_no_compression.c
+++ b/libarchive/test/test_write_format_zip_no_compression.c
@@ -99,7 +99,7 @@ DEFINE_TEST(test_write_format_zip_no_compression)
        assert((a = archive_write_new()) != NULL);
        assertA(0 == archive_write_set_format_zip(a));
        assertA(0 == archive_write_set_options(a, "zip:compression=store"));
-       assertA(0 == archive_write_set_compression_none(a));
+       assertA(0 == archive_write_add_filter_none(a));
        assertA(0 == archive_write_set_bytes_per_block(a, 1));
        assertA(0 == archive_write_set_bytes_in_last_block(a, 1));
        assertA(0 == archive_write_open_memory(a, buff, sizeof(buff), &used));

diff --git a/libarchive/test/test_write_zip_set_compression_store.c b/libarchive/test/test_write_zip_set_compression_store.c
index 6f3f49b2b25bf7b07989e548ac41ff1f92519195..f77eb1be0685ad64807a2062d587d46573250492 100644 (file)
--- a/libarchive/test/test_write_zip_set_compression_store.c
+++ b/libarchive/test/test_write_zip_set_compression_store.c
@@ -93,7 +93,7 @@ DEFINE_TEST(test_write_zip_set_compression_store)
        /* Create new ZIP archive in memory without padding. */
        assert((a = archive_write_new()) != NULL);
        assertA(0 == archive_write_set_format_zip(a));
-       assertA(0 == archive_write_set_compression_none(a));
+       assertA(0 == archive_write_add_filter_none(a));
        assertA(0 == archive_write_set_bytes_per_block(a, 1));
        assertA(0 == archive_write_set_bytes_in_last_block(a, 1));
        assertA(0 == archive_write_open_memory(a, buff, sizeof(buff), &used));

diff --git a/tar/write.c b/tar/write.c
index 2e9bc90aabc9dc0223393f152c8ea98032ff8429..953aa9491a2eb7571148f60ad05fa2181d321ae5 100644 (file)
--- a/tar/write.c
+++ b/tar/write.c
@@ -166,35 +166,35 @@ tar_mode_c(struct bsdtar *bsdtar)
        archive_write_set_bytes_in_last_block(a, bsdtar->bytes_in_last_block);
 
        if (bsdtar->compress_program) {
-               archive_write_set_compression_program(a, bsdtar->compress_program);
+               archive_write_add_filter_program(a, bsdtar->compress_program);
        } else {
                switch (bsdtar->create_compression) {
                case 0:
                        r = ARCHIVE_OK;
                        break;
                case 'j': case 'y':
-                       r = archive_write_set_compression_bzip2(a);
+                       r = archive_write_add_filter_bzip2(a);
                        break;
                case 'J':
-                       r = archive_write_set_compression_xz(a);
+                       r = archive_write_add_filter_xz(a);
                        break;
                case OPTION_LRZIP:
                        r = archive_write_add_filter_lrzip(a);
                        break;
                case OPTION_LZIP:
-                       r = archive_write_set_compression_lzip(a);
+                       r = archive_write_add_filter_lzip(a);
                        break;
                case OPTION_LZMA:
-                       r = archive_write_set_compression_lzma(a);
+                       r = archive_write_add_filter_lzma(a);
                        break;
                case OPTION_LZOP:
                        r = archive_write_add_filter_lzop(a);
                        break;
                case 'z':
-                       r = archive_write_set_compression_gzip(a);
+                       r = archive_write_add_filter_gzip(a);
                        break;
                case 'Z':
-                       r = archive_write_set_compression_compress(a);
+                       r = archive_write_add_filter_compress(a);
                        break;
                default:
                        lafe_errc(1, 0,