Stop using deprecated functions. Much remains to be replaced.

s/archive_compression(/archive_filter_code(/

diff --git a/libarchive/test/test_compat_bzip2.c b/libarchive/test/test_compat_bzip2.c
index d0726a1d36a0ff7ef7c3481d29f47dfceeec3c35..9d9ed358a8b08efc5d6b5548f9aaf031f72e49e4 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_compression(a), ARCHIVE_COMPRESSION_BZIP2);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_BZIP2);
        assertEqualString(archive_compression_name(a), "bzip2");
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
 
        assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
-       assertEqualInt(archive_compression(a), ARCHIVE_COMPRESSION_BZIP2);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_BZIP2);
        assertEqualString(archive_compression_name(a), "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 e1e4e13997f63146cc4e103a66e46a1449c33d5a..4433b514b0ee39aa263271093920df1de53f391d 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_compression(a), ARCHIVE_COMPRESSION_NONE);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_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 f8f3ec06d280c045deb72dae525b48ee8d5c3ce8..6cb5b88db805f24ac1a84c613fd229ba958ce845 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_compression(a), ARCHIVE_COMPRESSION_NONE);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_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 885c681415ec075c145e71c09e24957807055775..6ce458e0f7b610db2ebc94315b91d6b270b5c877 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_compression(a), ARCHIVE_COMPRESSION_GZIP);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_GZIP);
        assertEqualString(archive_compression_name(a), "gzip");
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
 

diff --git a/libarchive/test/test_compat_lrzip.c b/libarchive/test/test_compat_lrzip.c
index 76350a928ca2d39eb71f4eb4955d4788a3a451e9..662a170e0d5f8b35a86eeb178224c1a527d29f73 100644 (file)
--- a/libarchive/test/test_compat_lrzip.c
+++ b/libarchive/test/test_compat_lrzip.c
@@ -60,7 +60,7 @@ verify(const char *name)
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
 
        /* Verify that the format detection worked. */
-       assertEqualInt(archive_compression(a), ARCHIVE_COMPRESSION_LRZIP);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_LRZIP);
        assertEqualString(archive_compression_name(a), "lrzip");
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_GNUTAR);
 

diff --git a/libarchive/test/test_compat_lzip.c b/libarchive/test/test_compat_lzip.c
index f474cd49e1d7a257909226cd7fda2812ec3d6782..039838e98b27327492374c6c7f7832f5bf02737f 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_compression(a), ARCHIVE_COMPRESSION_LZIP);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_LZIP);
        assertEqualString(archive_compression_name(a), "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 8d37dd1879f693e77ae1fcec427f7a501468e2e9..c0c47913ec0cfbf690cf40f80f3b6c18d4815dad 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_compression(a), ARCHIVE_COMPRESSION_LZMA);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_LZMA);
        assertEqualString(archive_compression_name(a), "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 3cad9f37bed00f1a48bec8721c822e434b2d2363..4f2db79dcfc24cfa071c1e3e377ccb2f4afe1cab 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_compression(a), ARCHIVE_COMPRESSION_COMPRESS);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_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_compression(a), ARCHIVE_COMPRESSION_COMPRESS);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_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 21466d7c508d83ab25dcafc40dadbfa7e73d018e..38830884e66e845b7613c864c37a2b6f4a6682a8 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_compression(a), ARCHIVE_COMPRESSION_NONE);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_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 551edcc5733bd6c5eab979b54059154b5022e5db..3068918071b3d516050c9a06f42197e1b7affae2 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_compression(a), ARCHIVE_COMPRESSION_XZ);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_XZ);
        assertEqualString(archive_compression_name(a), "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 538c0b8f26852aeb96313e6c61692b585df91450..bb7231089349a91bf1c8907f29ad04b3c57e27e8 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_compression(a), ARCHIVE_COMPRESSION_NONE);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_NONE);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_ZIP);
 
 finish:

diff --git a/libarchive/test/test_read_filter_program.c b/libarchive/test/test_read_filter_program.c
index 710767b18d025605edf7d35c59d2a9581dd664bc..d6e02dd126014109e5a569ef045d15845315b20e 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_compression(a), ARCHIVE_COMPRESSION_PROGRAM);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_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_compression(a), ARCHIVE_COMPRESSION_PROGRAM);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_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_compression(a), ARCHIVE_COMPRESSION_PROGRAM);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_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 0512560ee587ab86673b15023764c40a8ea421d0..c59a88f1990763371248021183e4385d9e78a265 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_compression(a), ARCHIVE_COMPRESSION_PROGRAM);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_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_compression(a), ARCHIVE_COMPRESSION_PROGRAM);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_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_compression(a), ARCHIVE_COMPRESSION_PROGRAM);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_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 3fbe2f22fbcb384c3bf03e70bbf5c82bf401f123..44d6c8e6d4d7994cbec89f0a5001e33f33c832d6 100644 (file)
--- a/libarchive/test/test_read_filter_uudecode.c
+++ b/libarchive/test/test_read_filter_uudecode.c
@@ -128,7 +128,7 @@ test_read_uu_sub(const char *uudata, size_t uusize, int no_nl)
                failure("archive_compression_name(a)=\"%s\""
                    "extra %d, NL %d",
                    archive_compression_name(a), extra, !no_nl);
-               assertEqualInt(archive_compression(a),
+               assertEqualInt(archive_filter_code(a, 0),
                    ARCHIVE_COMPRESSION_COMPRESS);
                failure("archive_format_name(a)=\"%s\""
                    "extra %d, NL %d",

diff --git a/libarchive/test/test_read_format_7zip.c b/libarchive/test/test_read_format_7zip.c
index 043ef9f4e5323ab8628cbba52a8906d29f2c39a3..9c40a7aab3ddd2a4090fb4c0af6d0b9de852597e 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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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 5e5cdcb8f7a41c6ec21e0bf9af64d6267576f1ea..03b88147b1e4d0a76b9df8125e11368b442f8ee5 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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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 54374deb9b3710dc665bcc8792e31d726223754d..138753667f1464ccd0a225c866555c43d6216aa6 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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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 7aec833c2302985df61ed40f535af3cee1d2b2dc..6f77991d6daa9016d85407a4157cad09af4cb48f 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_compression(a) == ARCHIVE_COMPRESSION_NONE);
+       assertA(archive_filter_code(a, 0) == ARCHIVE_COMPRESSION_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_compression(a) == ARCHIVE_COMPRESSION_NONE);
+       assertA(archive_filter_code(a, 0) == ARCHIVE_COMPRESSION_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 42ec4214f91f08232bd6c23c0bb9f0fd09988943..bd2824b700e337541ec183cb3e1cbca981f0fa2e 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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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 e818a01ac1a2dbe913b4e52a8902c53da832697c..d0b2764c5074f4d13a6d06671d530d9c71b63593 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_compression_name(a)=\"%s\"",
            archive_compression_name(a));
-       assertEqualInt(archive_compression(a), ARCHIVE_COMPRESSION_COMPRESS);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_COMPRESS);
        assertEqualString(archive_compression_name(a), "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 534471a1ca8a44ce83f8d0f5c6d3f40e999bb935..6679af4bfb65d519a6c1a4936fef84f07ff969c8 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_compression(a), ARCHIVE_COMPRESSION_NONE);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_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 c19efed88db24a7fdbda36d1643cdaedda49de4c..f383f52808bef9d6d012e0f17058db1f706711d4 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_compression(a) == ARCHIVE_COMPRESSION_BZIP2);
+       assert(archive_filter_code(a, 0) == ARCHIVE_COMPRESSION_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 a807b5b190ae7c23e5b2423e601b663e935c9ec6..d834f0c861a80880e8fb5840cc9de40c8faed22f 100644 (file)
--- a/libarchive/test/test_read_format_cpio_bin_gz.c
+++ b/libarchive/test/test_read_format_cpio_bin_gz.c
@@ -51,7 +51,7 @@ DEFINE_TEST(test_read_format_cpio_bin_gz)
        assertEqualInt(ARCHIVE_OK,
            archive_read_open_memory(a, archive, sizeof(archive)));
        assertEqualInt(ARCHIVE_OK, archive_read_next_header(a, &ae));
-       assertEqualInt(archive_compression(a),
+       assertEqualInt(archive_filter_code(a, 0),
            ARCHIVE_COMPRESSION_GZIP);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_CPIO_BIN_LE);
        assertEqualInt(ARCHIVE_OK, archive_read_close(a));

diff --git a/libarchive/test/test_read_format_cpio_bin_lzip.c b/libarchive/test/test_read_format_cpio_bin_lzip.c
index 16effb91652b0218062cda8aa5067b2505619c4c..71f6fe6720750a8a579a0bc94e71c4c95d832fde 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_compression(a), ARCHIVE_COMPRESSION_LZIP);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_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 e168e2f9c55ad4293eee1180e4ca2ee5ed7b42bb..1ac86c370bbeff1945475ab4166cd93357a3ceb3 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_compression(a), ARCHIVE_COMPRESSION_LZMA);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_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 7c65da67751dbcc3483931a374510f4b7c25634f..5f56cf4a91998b8e0528152a013d9e03468188bf 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_compression(a), ARCHIVE_COMPRESSION_XZ);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_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 e347b506844b5100452fd5e8bb1e3c53228c3fdf..7a641b5906132f49427eea1b1b325a54381c858f 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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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 cdcf0b5aff31e87d803791fd1b5c6c21ca1b3dc7..0b24b3d57cdbcc972253d8ccd98b74cd9305ff29 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_compression(a) == ARCHIVE_COMPRESSION_NONE);
+       assertA(archive_filter_code(a, 0) == ARCHIVE_COMPRESSION_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 b354b8c06b3cc112e362819ee5dff0c69116253d..9b050f161320d17430a207289960d531f191a2b3 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_compression(a), ARCHIVE_COMPRESSION_BZIP2);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_BZIP2);
        assertEqualString(archive_compression_name(a), "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 88d54d172c18701105b8cf3a11eb890c38f86518..fc191a65d25c31d389499d69136f073f46ee15d1 100644 (file)
--- a/libarchive/test/test_read_format_cpio_svr4_gzip.c
+++ b/libarchive/test/test_read_format_cpio_svr4_gzip.c
@@ -50,7 +50,7 @@ DEFINE_TEST(test_read_format_cpio_svr4_gzip)
        assertEqualInt(ARCHIVE_OK,
            archive_read_open_memory(a, archive, sizeof(archive)));
        assertEqualInt(ARCHIVE_OK, archive_read_next_header(a, &ae));
-       assertEqualInt(archive_compression(a),
+       assertEqualInt(archive_filter_code(a, 0),
            ARCHIVE_COMPRESSION_GZIP);
        assertEqualInt(archive_format(a),
            ARCHIVE_FORMAT_CPIO_SVR4_NOCRC);

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 582096bf475343899912bdcffad733348137e479..93c63743f4e7f65a4d0414b4e91abb0df345bf14 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_compression(a), ARCHIVE_COMPRESSION_GZIP);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_GZIP);
        assertEqualString(archive_compression_name(a), "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 ca3d5ce076683412779f1e9d5a3123e8ab279f0a..afdaf03082bf59b91c5544c45a10a207bbb14a26 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_compression_name(a)=\"%s\"",
            archive_compression_name(a));
-       assertEqualInt(archive_compression(a), ARCHIVE_COMPRESSION_COMPRESS);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_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 0dafe9f6c958eb9314e3f85cdf5e05fac9a8c6ed..eb109f34510f37e8878e103509cda32cb40d7d64 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_compression(a) == ARCHIVE_COMPRESSION_NONE);
+       assertA(archive_filter_code(a, 0) == ARCHIVE_COMPRESSION_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 d688f08fec21509bdeb1cca9926a492a8ec50d0a..dd2f21e70e5eb0d37d4e9c8215360fabd00746d9 100644 (file)
--- a/libarchive/test/test_read_format_gtar_gz.c
+++ b/libarchive/test/test_read_format_gtar_gz.c
@@ -51,7 +51,7 @@ DEFINE_TEST(test_read_format_gtar_gz)
            archive_read_open_memory(a, archive, sizeof(archive)));
        assertEqualInt(ARCHIVE_OK, archive_read_next_header(a, &ae));
        assertEqualInt(1, archive_file_count(a));
-       assertEqualInt(archive_compression(a),
+       assertEqualInt(archive_filter_code(a, 0),
            ARCHIVE_COMPRESSION_GZIP);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_GNUTAR);
        assertEqualInt(ARCHIVE_OK, archive_read_close(a));

diff --git a/libarchive/test/test_read_format_gtar_lzma.c b/libarchive/test/test_read_format_gtar_lzma.c
index 29ffae12fcf792173f892328b0842cfea5728b84..9fc5d72d11f107a8788c7fc9b62cecdf0d999267 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_compression(a), ARCHIVE_COMPRESSION_LZMA);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_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 61b2abdc16c277128652f5ef4e81a760ebfe5f19..1e7fc0df5b742fbf95bd3373d1976b80f6ebbfe4 100644 (file)
--- a/libarchive/test/test_read_format_iso_Z.c
+++ b/libarchive/test/test_read_format_iso_Z.c
@@ -44,7 +44,7 @@ test1(void)
        assertEqualIntA(a, ARCHIVE_OK,
            archive_read_next_header(a, &ae));
        assertEqualInt(1, archive_file_count(a));
-       assertEqualInt(archive_compression(a),
+       assertEqualInt(archive_filter_code(a, 0),
            ARCHIVE_COMPRESSION_COMPRESS);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_ISO9660);
        assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
@@ -85,7 +85,7 @@ test2(void)
        assertEqualIntA(a, ARCHIVE_EOF,
            archive_read_next_header(a, &ae));
        assertEqualInt(5, archive_file_count(a));
-       assertEqualInt(archive_compression(a),
+       assertEqualInt(archive_filter_code(a, 0),
            ARCHIVE_COMPRESSION_COMPRESS);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_ISO9660);
        assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));

diff --git a/libarchive/test/test_read_format_iso_multi_extent.c b/libarchive/test/test_read_format_iso_multi_extent.c
index 2230d8e2089cd029ccb03472765fcf3bcdc592f1..30bce54d3da444cd091aa1e2b1568151028cab77 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_compression(a), ARCHIVE_COMPRESSION_COMPRESS);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_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 bb53e3b675371fc608e5ba9f4f6d392ae3881916..5971240a029950bb61d8b36159696a0acb09fbd9 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_compression(a), ARCHIVE_COMPRESSION_COMPRESS);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_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 f42372675af224526a3a15e6819565a630a6762a..64e0184908690ac6fc32ada7faa973681d719a89 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_compression(a), ARCHIVE_COMPRESSION_COMPRESS);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_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 d15face79bd5f6b1d675e01410273ff60f15b751..22cbb23ba42471a8e6cced85ee3145f1184b39f7 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_compression(a), ARCHIVE_COMPRESSION_COMPRESS);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_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 f2e0ea35f6498335699c1b0920826fccddad8466..66980d00cb928cf677f32e86671c1bb222b47811 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_compression(a), ARCHIVE_COMPRESSION_COMPRESS);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_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 82c5ab1f3b7bd4ce76695ce471cb2ec2fa31beb7..ac7227feaa71abbdafd0aa9f96e42a6aa612cad8 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_compression(a), ARCHIVE_COMPRESSION_COMPRESS);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_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 bc502e270645343db7bfb5a4838e2f15eb7277a3..93aaae7dbff877e9a50c9035074566b4dfcf6ffa 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_compression(a), ARCHIVE_COMPRESSION_COMPRESS);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_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 d4ca160243aa16d57461b41c1429d29ab28042c9..8f86b18c82d8fd11236426ff148e48528215181a 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_compression(a), ARCHIVE_COMPRESSION_COMPRESS);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_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 997b63746335ec9876fddb7292167247c17db70d..9418a5f5bcb27884762dfbef4685df75ca9de78a 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_compression(a), ARCHIVE_COMPRESSION_COMPRESS);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_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 05aa97e62df7103d0290c2275b3b7eebb5df5bc5..9c9526e0d6706f8e88590ffbba5e6c7faaa8659c 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_compression(a), ARCHIVE_COMPRESSION_COMPRESS);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_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 60204258926b64fedc362a4324f6b39e979549cf..75b6bec27e187c7e1d89c9af7d6d4e4ced5d5917 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_compression(a), ARCHIVE_COMPRESSION_COMPRESS);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_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 a01386eafd0a14e14866effdd1e800daf5ff51b0..0f7085f94552f9e50491907adec45ccc10d336d3 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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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 e39dfac41ac128130e7d3d829b294d80b396d96c..89c8bf78acc395834eda1141f0b6be9fec202979 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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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 826f878dbb409bb81c4cd4437685ab47e606aa24..39fc7930d9332fdecee3a2e31afe79d67bb6c551 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_compression(a), ARCHIVE_COMPRESSION_BZIP2);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_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 31e6ae303daeae83c90ed69386315cf7c24653d4..9beebdc110ec1a64e2651ad85b31fe8e4f228dbb 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_compression(a), ARCHIVE_COMPRESSION_NONE);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_NONE);
        assertEqualString(archive_compression_name(a), "none");
        failure("512 zero bytes should be recognized as a tar archive.");
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR);
@@ -437,7 +437,7 @@ 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_compression(a), compression);
+       assertEqualInt(archive_filter_code(a, 0), compression);
        assertEqualInt(archive_format(a), format);
 
        /* Verify the only entry. */

diff --git a/libarchive/test/test_read_format_tar_empty_filename.c b/libarchive/test/test_read_format_tar_empty_filename.c
index b83226ba3d80068aafeef4219c57930b5ea62149..5f98fe1bdaea530e6bd7dbaef12ea49728536979 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_compression(a), ARCHIVE_COMPRESSION_NONE);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_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 ec38d5a9f8f9f330177e9cd7d9cd7bc6c9435d18..ae007af732d782216e012b2ab9955348dc77b11c 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_compression(a), ARCHIVE_COMPRESSION_BZIP2);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_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 f8526771977f097ea5e347c1802c85e55d89b08f..2fad691fc9ecf7735dbf9cf2505d0c31979d5e86 100644 (file)
--- a/libarchive/test/test_read_format_tgz.c
+++ b/libarchive/test/test_read_format_tgz.c
@@ -51,7 +51,7 @@ DEFINE_TEST(test_read_format_tgz)
            archive_read_open_memory(a, archive, sizeof(archive)));
        assertEqualInt(ARCHIVE_OK, archive_read_next_header(a, &ae));
        assertEqualInt(1, archive_file_count(a));
-       assertEqualInt(archive_compression(a),
+       assertEqualInt(archive_filter_code(a, 0),
            ARCHIVE_COMPRESSION_GZIP);
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
        assertEqualInt(ARCHIVE_OK, archive_read_close(a));

diff --git a/libarchive/test/test_read_format_tlz.c b/libarchive/test/test_read_format_tlz.c
index 9054fa6b49dcc8722db844589c4ef483a7ad2ca3..cf9a067d4350c0805f759b405d91aba225c0ebd0 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_compression(a), ARCHIVE_COMPRESSION_LZMA);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_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 6a9ba2091b7d6d44239fd73084feadcd9bc4a9ff..a00ddd7cfa026b7004db215a37f71e71efe4a163 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_compression(a), ARCHIVE_COMPRESSION_XZ);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_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 3a1dcec04666cc2631de41b4ade2bed5d572bf65..ff09ae44da99beaf2d6bca8e4d4b801d960d0196 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_compression_name(a)=\"%s\"",
            archive_compression_name(a));
-       assertEqualInt(archive_compression(a), ARCHIVE_COMPRESSION_COMPRESS);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_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 4dc55c21d7e05347fad4bfdafc170ab75f3d8f1c..bb148c6ebc490df0cf07d1fa27ff313ede784cc0 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_compression(a), ARCHIVE_COMPRESSION_NONE);
+       assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_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_compression(a), ARCHIVE_COMPRESSION_NONE);
+               assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_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 8c8c92ae45450c8274b18fd3984b34424fae7b18..61e4e18b54887b5418dc4161b233d3fcbad20014 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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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 701fe05e8300e9f5f59de6af8c10fd666347637e..e207c777464d618c98aacb3e9e0a1ba22c65cf96 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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_NONE, archive_filter_code(a, 0));
        assertEqualIntA(a, ARCHIVE_FORMAT_ZIP, archive_format(a));
 
        /* Close the archive. */

diff --git a/libarchive/test/test_write_compress_bzip2.c b/libarchive/test/test_write_compress_bzip2.c
index 98cda704674f52ff67062cb8af71d092e58bec5f..5f4fcb8ba6bc5eda6cc91ff9c0d30de05d44b483 100644 (file)
--- a/libarchive/test/test_write_compress_bzip2.c
+++ b/libarchive/test/test_write_compress_bzip2.c
@@ -63,10 +63,10 @@ DEFINE_TEST(test_write_compress_bzip2)
        }
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_set_bytes_per_block(a, 10));
-       assertEqualInt(ARCHIVE_COMPRESSION_BZIP2, archive_compression(a));
+       assertEqualInt(ARCHIVE_COMPRESSION_BZIP2, archive_filter_code(a, 0));
        assertEqualString("bzip2", archive_compression_name(a));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_open_memory(a, buff, buffsize, &used1));
-       assertEqualInt(ARCHIVE_COMPRESSION_BZIP2, archive_compression(a));
+       assertEqualInt(ARCHIVE_COMPRESSION_BZIP2, archive_filter_code(a, 0));
        assertEqualString("bzip2", archive_compression_name(a));
        assert((ae = archive_entry_new()) != NULL);
        archive_entry_set_filetype(ae, AE_IFREG);

diff --git a/libarchive/test/test_write_compress_gzip.c b/libarchive/test/test_write_compress_gzip.c
index 0ab88a4bc47320e927bbfde3f5aedd2086b9f165..2a0a93eff2282c0487b2f3338609bea5a7880632 100644 (file)
--- a/libarchive/test/test_write_compress_gzip.c
+++ b/libarchive/test/test_write_compress_gzip.c
@@ -63,7 +63,7 @@ DEFINE_TEST(test_write_compress_gzip)
        }
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_set_bytes_per_block(a, 10));
-       assertEqualInt(ARCHIVE_COMPRESSION_GZIP, archive_compression(a));
+       assertEqualInt(ARCHIVE_COMPRESSION_GZIP, archive_filter_code(a, 0));
        assertEqualString("gzip", archive_compression_name(a));
        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_compress_lzip.c b/libarchive/test/test_write_compress_lzip.c
index d53920341076cfaa3f79ea48f0103a38cce8cbf1..142c8af4c0e5792e81fa7fd96c86ef2d8b9158f6 100644 (file)
--- a/libarchive/test/test_write_compress_lzip.c
+++ b/libarchive/test/test_write_compress_lzip.c
@@ -63,11 +63,11 @@ DEFINE_TEST(test_write_compress_lzip)
        }
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_set_bytes_per_block(a, 10));
-       assertEqualInt(ARCHIVE_COMPRESSION_LZIP, archive_compression(a));
+       assertEqualInt(ARCHIVE_COMPRESSION_LZIP, archive_filter_code(a, 0));
        assertEqualString("lzip", archive_compression_name(a));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_open_memory(a, buff, buffsize, &used1));
-       assertEqualInt(ARCHIVE_COMPRESSION_LZIP, archive_compression(a));
+       assertEqualInt(ARCHIVE_COMPRESSION_LZIP, archive_filter_code(a, 0));
        assertEqualString("lzip", archive_compression_name(a));
        assert((ae = archive_entry_new()) != NULL);
        archive_entry_set_filetype(ae, AE_IFREG);

diff --git a/libarchive/test/test_write_compress_lzma.c b/libarchive/test/test_write_compress_lzma.c
index 38b604760fcbb66621f52dd6a11070b1734cbd80..c43e68b06066b0910ddd1e33a0576ba1667f0ddf 100644 (file)
--- a/libarchive/test/test_write_compress_lzma.c
+++ b/libarchive/test/test_write_compress_lzma.c
@@ -62,11 +62,11 @@ DEFINE_TEST(test_write_compress_lzma)
        }
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_set_bytes_per_block(a, 10));
-       assertEqualInt(ARCHIVE_COMPRESSION_LZMA, archive_compression(a));
+       assertEqualInt(ARCHIVE_COMPRESSION_LZMA, archive_filter_code(a, 0));
        assertEqualString("lzma", archive_compression_name(a));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_open_memory(a, buff, buffsize, &used1));
-       assertEqualInt(ARCHIVE_COMPRESSION_LZMA, archive_compression(a));
+       assertEqualInt(ARCHIVE_COMPRESSION_LZMA, archive_filter_code(a, 0));
        assertEqualString("lzma", archive_compression_name(a));
        assert((ae = archive_entry_new()) != NULL);
        archive_entry_set_filetype(ae, AE_IFREG);

diff --git a/libarchive/test/test_write_compress_xz.c b/libarchive/test/test_write_compress_xz.c
index 16332630cf905ba58525c95514674bb6d1eb548a..366bd7690d038b940fe470dd91978fb86431aeb9 100644 (file)
--- a/libarchive/test/test_write_compress_xz.c
+++ b/libarchive/test/test_write_compress_xz.c
@@ -63,10 +63,10 @@ DEFINE_TEST(test_write_compress_xz)
        }
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_set_bytes_per_block(a, 10));
-       assertEqualInt(ARCHIVE_COMPRESSION_XZ, archive_compression(a));
+       assertEqualInt(ARCHIVE_COMPRESSION_XZ, archive_filter_code(a, 0));
        assertEqualString("xz", archive_compression_name(a));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_open_memory(a, buff, buffsize, &used1));
-       assertEqualInt(ARCHIVE_COMPRESSION_XZ, archive_compression(a));
+       assertEqualInt(ARCHIVE_COMPRESSION_XZ, archive_filter_code(a, 0));
        assertEqualString("xz", archive_compression_name(a));
        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 c92b753ef47442e1a64bb9d1a9ce1588114921d2..b9150460a96b82ba5043e665904e90ea29088628 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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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_compression(a));
+       assertEqualIntA(a, ARCHIVE_COMPRESSION_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 953aa9491a2eb7571148f60ad05fa2181d321ae5..1a24bdfcd754c11365fec5917674fde15c918a12 100644 (file)
--- a/tar/write.c
+++ b/tar/write.c
@@ -253,7 +253,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_compression(a) != ARCHIVE_COMPRESSION_NONE) {
+               if (archive_filter_code(a, 0) != ARCHIVE_COMPRESSION_NONE) {
                        archive_read_free(a);
                        close(bsdtar->fd);
                        lafe_errc(1, 0,
@@ -346,7 +346,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_compression(a) != ARCHIVE_COMPRESSION_NONE) {
+               if (archive_filter_code(a, 0) != ARCHIVE_COMPRESSION_NONE) {
                        archive_read_free(a);
                        close(bsdtar->fd);
                        lafe_errc(1, 0,