diff options
| author | Roman Neuhauser <neuhauser@sigpipe.cz> | 2011-03-28 19:18:10 -0400 |
|---|---|---|
| committer | Roman Neuhauser <neuhauser@sigpipe.cz> | 2011-03-28 19:18:10 -0400 |
| commit | af6eb96880aaadaeb2bb694ddd7e6041ff474d18 (patch) | |
| tree | 0dbe2483bf4ee4d2505d8ea11986ffcb6998bc49 /libarchive/test | |
| parent | a58aaa4fb025ab4562fd27dcba22609ad4e6525f (diff) | |
| download | libarchive-af6eb96880aaadaeb2bb694ddd7e6041ff474d18.tar.gz | |
tests use archive_read_support_filter_*()
SVN-Revision: 3114
Diffstat (limited to 'libarchive/test')
102 files changed, 174 insertions, 174 deletions
diff --git a/libarchive/test/test_acl_pax.c b/libarchive/test/test_acl_pax.c index b73d04d9..6a7ee151 100644 --- a/libarchive/test/test_acl_pax.c +++ b/libarchive/test/test_acl_pax.c @@ -240,7 +240,7 @@ DEFINE_TEST(test_acl_pax) /* Read back each entry and check that the ACL data is right. */ assert(NULL != (a = archive_read_new())); assertA(0 == archive_read_support_format_all(a)); - assertA(0 == archive_read_support_compression_all(a)); + assertA(0 == archive_read_support_filter_all(a)); assertA(0 == archive_read_open_memory(a, buff, used)); /* First item has no ACLs */ diff --git a/libarchive/test/test_archive_read_set_filter_option.c b/libarchive/test/test_archive_read_set_filter_option.c index 0cb1adea..7ff3c267 100644 --- a/libarchive/test/test_archive_read_set_filter_option.c +++ b/libarchive/test/test_archive_read_set_filter_option.c @@ -35,7 +35,7 @@ test(int pristine) struct archive* a = archive_read_new(); if (!pristine) - archive_read_support_compression_all(a); + archive_read_support_filter_all(a); should(a, ARCHIVE_OK, NULL, NULL, NULL); should(a, ARCHIVE_OK, "", "", ""); diff --git a/libarchive/test/test_archive_read_set_option.c b/libarchive/test/test_archive_read_set_option.c index 929a9a1b..2ad5b0bd 100644 --- a/libarchive/test/test_archive_read_set_option.c +++ b/libarchive/test/test_archive_read_set_option.c @@ -36,7 +36,7 @@ test(int pristine) int known_option_rv = pristine ? ARCHIVE_FAILED : ARCHIVE_OK; if (!pristine) { - archive_read_support_compression_all(a); + archive_read_support_filter_all(a); archive_read_support_format_all(a); } diff --git a/libarchive/test/test_archive_read_set_options.c b/libarchive/test/test_archive_read_set_options.c index c71b93f6..a199afe4 100644 --- a/libarchive/test/test_archive_read_set_options.c +++ b/libarchive/test/test_archive_read_set_options.c @@ -38,7 +38,7 @@ test(int pristine) int mixed_options_rv = pristine ? ARCHIVE_FAILED : ARCHIVE_WARN; if (!pristine) { - archive_read_support_compression_all(a); + archive_read_support_filter_all(a); archive_read_support_format_all(a); } diff --git a/libarchive/test/test_bad_fd.c b/libarchive/test/test_bad_fd.c index 34331b8b..f8144a3c 100644 --- a/libarchive/test/test_bad_fd.c +++ b/libarchive/test/test_bad_fd.c @@ -30,7 +30,7 @@ DEFINE_TEST(test_bad_fd) { struct archive *a; assert((a = archive_read_new()) != NULL); - assertA(0 == archive_read_support_compression_all(a)); + assertA(0 == archive_read_support_filter_all(a)); assertA(ARCHIVE_FATAL == archive_read_open_fd(a, -1, 1024)); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); assertEqualInt(ARCHIVE_OK, archive_read_free(a)); diff --git a/libarchive/test/test_compat_bzip2.c b/libarchive/test/test_compat_bzip2.c index cdfbdd7a..d0726a1d 100644 --- a/libarchive/test/test_compat_bzip2.c +++ b/libarchive/test/test_compat_bzip2.c @@ -47,7 +47,7 @@ compat_bzip2(const char *name) int i; assert((a = archive_read_new()) != NULL); - if (ARCHIVE_OK != archive_read_support_compression_bzip2(a)) { + if (ARCHIVE_OK != archive_read_support_filter_bzip2(a)) { skipping("Unsupported bzip2"); return; } diff --git a/libarchive/test/test_compat_cpio.c b/libarchive/test/test_compat_cpio.c index 19ce48d5..e1e4e139 100644 --- a/libarchive/test/test_compat_cpio.c +++ b/libarchive/test/test_compat_cpio.c @@ -48,7 +48,7 @@ test_compat_cpio_1(void) struct archive *a; assert((a = archive_read_new()) != NULL); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); extract_reference_file(name); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, name, 17)); diff --git a/libarchive/test/test_compat_gtar.c b/libarchive/test/test_compat_gtar.c index d3c32dbb..f8f3ec06 100644 --- a/libarchive/test/test_compat_gtar.c +++ b/libarchive/test/test_compat_gtar.c @@ -46,7 +46,7 @@ test_compat_gtar_1(void) int r; assert((a = archive_read_new()) != NULL); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); extract_reference_file(name); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, name, 10240)); diff --git a/libarchive/test/test_compat_gzip.c b/libarchive/test/test_compat_gzip.c index b323e694..885c6814 100644 --- a/libarchive/test/test_compat_gzip.c +++ b/libarchive/test/test_compat_gzip.c @@ -47,7 +47,7 @@ verify(const char *name) int i,r; assert((a = archive_read_new()) != NULL); - r = archive_read_support_compression_gzip(a); + r = archive_read_support_filter_gzip(a); if (r == ARCHIVE_WARN) { skipping("gzip reading not fully supported on this platform"); assertEqualInt(ARCHIVE_OK, archive_read_free(a)); diff --git a/libarchive/test/test_compat_lzip.c b/libarchive/test/test_compat_lzip.c index 0b414e09..f474cd49 100644 --- a/libarchive/test/test_compat_lzip.c +++ b/libarchive/test/test_compat_lzip.c @@ -98,8 +98,8 @@ compat_lzip(const char *name) int i, r; assert((a = archive_read_new()) != NULL); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); - r = archive_read_support_compression_lzip(a); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); + r = archive_read_support_filter_lzip(a); if (r == ARCHIVE_WARN) { skipping("lzip reading not fully supported on this platform"); assertEqualInt(ARCHIVE_OK, archive_read_free(a)); diff --git a/libarchive/test/test_compat_lzma.c b/libarchive/test/test_compat_lzma.c index f3545633..8d37dd18 100644 --- a/libarchive/test/test_compat_lzma.c +++ b/libarchive/test/test_compat_lzma.c @@ -107,8 +107,8 @@ compat_lzma(const char *name) int i, r; assert((a = archive_read_new()) != NULL); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); - r = archive_read_support_compression_lzma(a); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); + r = archive_read_support_filter_lzma(a); if (r == ARCHIVE_WARN) { skipping("lzma reading not fully supported on this platform"); assertEqualInt(ARCHIVE_OK, archive_read_free(a)); diff --git a/libarchive/test/test_compat_mac_gnutar.c b/libarchive/test/test_compat_mac_gnutar.c index 5e6386c4..b9aa1f71 100644 --- a/libarchive/test/test_compat_mac_gnutar.c +++ b/libarchive/test/test_compat_mac_gnutar.c @@ -48,7 +48,7 @@ DEFINE_TEST(test_compat_mac_gnutar) int r; assert((a = archive_read_new()) != NULL); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); extract_reference_file(name); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, name, 10240)); diff --git a/libarchive/test/test_compat_solaris_tar_acl.c b/libarchive/test/test_compat_solaris_tar_acl.c index 0f2355c1..a0cf9a8a 100644 --- a/libarchive/test/test_compat_solaris_tar_acl.c +++ b/libarchive/test/test_compat_solaris_tar_acl.c @@ -45,7 +45,7 @@ DEFINE_TEST(test_compat_solaris_tar_acl) extract_reference_file(reference1); assert(NULL != (a = archive_read_new())); assertA(0 == archive_read_support_format_all(a)); - assertA(0 == archive_read_support_compression_all(a)); + assertA(0 == archive_read_support_filter_all(a)); assertA(0 == archive_read_open_filename(a, reference1, 512)); /* Archive has 1 entry with some ACLs set on it. */ diff --git a/libarchive/test/test_compat_tar_hardlink.c b/libarchive/test/test_compat_tar_hardlink.c index 4708cd3e..21466d7c 100644 --- a/libarchive/test/test_compat_tar_hardlink.c +++ b/libarchive/test/test_compat_tar_hardlink.c @@ -51,7 +51,7 @@ test_compat_tar_hardlink_1(void) struct archive *a; assert((a = archive_read_new()) != NULL); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); extract_reference_file(name); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, name, 10240)); diff --git a/libarchive/test/test_compat_xz.c b/libarchive/test/test_compat_xz.c index e71c0666..551edcc5 100644 --- a/libarchive/test/test_compat_xz.c +++ b/libarchive/test/test_compat_xz.c @@ -46,8 +46,8 @@ compat_xz(const char *name) int i, r; assert((a = archive_read_new()) != NULL); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); - r = archive_read_support_compression_xz(a); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); + r = archive_read_support_filter_xz(a); if (r == ARCHIVE_WARN) { skipping("xz reading not fully supported on this platform"); assertEqualInt(ARCHIVE_OK, archive_read_free(a)); diff --git a/libarchive/test/test_compat_zip.c b/libarchive/test/test_compat_zip.c index d7253eda..8a3306af 100644 --- a/libarchive/test/test_compat_zip.c +++ b/libarchive/test/test_compat_zip.c @@ -35,7 +35,7 @@ test_compat_zip_1(void) int r; assert((a = archive_read_new()) != NULL); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_zip(a)); extract_reference_file(name); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, name, 10240)); @@ -81,7 +81,7 @@ test_compat_zip_2(void) struct archive *a; assert((a = archive_read_new()) != NULL); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_zip(a)); extract_reference_file(name); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, name, 10240)); diff --git a/libarchive/test/test_filter_count.c b/libarchive/test/test_filter_count.c index d4a5a727..3f587e33 100644 --- a/libarchive/test/test_filter_count.c +++ b/libarchive/test/test_filter_count.c @@ -29,7 +29,7 @@ void read_test(const char *name) { struct archive* a = archive_read_new(); - if(ARCHIVE_OK != archive_read_support_compression_bzip2(a)) { + if(ARCHIVE_OK != archive_read_support_filter_bzip2(a)) { skipping("bzip2 unsupported"); return; } diff --git a/libarchive/test/test_fuzz.c b/libarchive/test/test_fuzz.c index c89a3dd7..449d3cbf 100644 --- a/libarchive/test/test_fuzz.c +++ b/libarchive/test/test_fuzz.c @@ -98,7 +98,7 @@ DEFINE_TEST(test_fuzz) /* Use format_raw to decompress the data. */ assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, - archive_read_support_compression_all(a)); + archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_raw(a)); r = archive_read_open_filename(a, filename, 16384); @@ -162,7 +162,7 @@ DEFINE_TEST(test_fuzz) assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, - archive_read_support_compression_all(a)); + archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); diff --git a/libarchive/test/test_open_failure.c b/libarchive/test/test_open_failure.c index f3a65d5c..cfc3062c 100644 --- a/libarchive/test/test_open_failure.c +++ b/libarchive/test/test_open_failure.c @@ -132,7 +132,7 @@ DEFINE_TEST(test_open_failure) a = archive_read_new(); assert(a != NULL); assertEqualInt(ARCHIVE_OK, - archive_read_support_compression_compress(a)); + archive_read_support_filter_compress(a)); assertEqualInt(ARCHIVE_OK, archive_read_support_format_tar(a)); assertEqualInt(ARCHIVE_FATAL, archive_read_open(a, &private, my_open, my_read, my_close)); diff --git a/libarchive/test/test_open_fd.c b/libarchive/test/test_open_fd.c index 3461535a..52b34bd1 100644 --- a/libarchive/test/test_open_fd.c +++ b/libarchive/test/test_open_fd.c @@ -87,7 +87,7 @@ DEFINE_TEST(test_open_fd) assert(lseek(fd, 0, SEEK_SET) == 0); assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_fd(a, fd, 512)); assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); @@ -119,7 +119,7 @@ DEFINE_TEST(test_open_fd) */ assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); /* FD 100 shouldn't be open. */ assertEqualIntA(a, ARCHIVE_FATAL, archive_read_open_fd(a, 100, 512)); diff --git a/libarchive/test/test_open_file.c b/libarchive/test/test_open_file.c index 5153f5a9..4308f024 100644 --- a/libarchive/test/test_open_file.c +++ b/libarchive/test/test_open_file.c @@ -79,7 +79,7 @@ DEFINE_TEST(test_open_file) return; assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_FILE(a, f)); assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); diff --git a/libarchive/test/test_open_filename.c b/libarchive/test/test_open_filename.c index e0c78522..ca3ac272 100644 --- a/libarchive/test/test_open_filename.c +++ b/libarchive/test/test_open_filename.c @@ -69,7 +69,7 @@ DEFINE_TEST(test_open_filename) */ assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, "test.tar", 512)); @@ -100,7 +100,7 @@ DEFINE_TEST(test_open_filename) */ assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_FATAL, archive_read_open_filename(a, "nonexistent.tar", 512)); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); diff --git a/libarchive/test/test_pax_filename_encoding.c b/libarchive/test/test_pax_filename_encoding.c index 85cbc45c..56729a2c 100644 --- a/libarchive/test/test_pax_filename_encoding.c +++ b/libarchive/test/test_pax_filename_encoding.c @@ -58,7 +58,7 @@ test_pax_filename_encoding_1(void) extract_reference_file(testname); a = archive_read_new(); assertEqualInt(ARCHIVE_OK, archive_read_support_format_tar(a)); - assertEqualInt(ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualInt(ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualInt(ARCHIVE_OK, archive_read_open_filename(a, testname, 10240)); /* diff --git a/libarchive/test/test_read_compress_program.c b/libarchive/test/test_read_compress_program.c index 6ef7277a..751abd54 100644 --- a/libarchive/test/test_read_compress_program.c +++ b/libarchive/test/test_read_compress_program.c @@ -43,9 +43,9 @@ DEFINE_TEST(test_read_compress_program) * program is requested. */ assert((a = archive_read_new()) != NULL); - r = archive_read_support_compression_program(a, "nonexistent"); + r = archive_read_support_filter_program(a, "nonexistent"); if (r == ARCHIVE_FATAL) { - skipping("archive_read_support_compression_program() " + skipping("archive_read_support_filter_program() " "unsupported on this platform"); return; } @@ -66,9 +66,9 @@ DEFINE_TEST(test_read_compress_program) } assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, - archive_read_support_compression_none(a)); + archive_read_support_filter_none(a)); assertEqualIntA(a, ARCHIVE_OK, - archive_read_support_compression_program(a, "gunzip")); + archive_read_support_filter_program(a, "gunzip")); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); assertEqualIntA(a, ARCHIVE_OK, diff --git a/libarchive/test/test_read_data_large.c b/libarchive/test/test_read_data_large.c index 5756d7bf..a35be825 100644 --- a/libarchive/test/test_read_data_large.c +++ b/libarchive/test/test_read_data_large.c @@ -78,7 +78,7 @@ DEFINE_TEST(test_read_data_large) /* Check that archive_read_data can handle 10*10^6 at a pop. */ assert((a = archive_read_new()) != NULL); assertA(0 == archive_read_support_format_all(a)); - assertA(0 == archive_read_support_compression_all(a)); + assertA(0 == archive_read_support_filter_all(a)); assertA(0 == archive_read_open_memory(a, buff1, sizeof(buff1))); assertA(0 == archive_read_next_header(a, &ae)); failure("Wrote 10MB, but didn't read the same amount"); @@ -91,7 +91,7 @@ DEFINE_TEST(test_read_data_large) /* Check archive_read_data_into_fd */ assert((a = archive_read_new()) != NULL); assertA(0 == archive_read_support_format_all(a)); - assertA(0 == archive_read_support_compression_all(a)); + assertA(0 == archive_read_support_filter_all(a)); assertA(0 == archive_read_open_memory(a, buff1, sizeof(buff1))); assertA(0 == archive_read_next_header(a, &ae)); #if defined(__BORLANDC__) diff --git a/libarchive/test/test_read_extract.c b/libarchive/test/test_read_extract.c index bf84055a..d7de26b6 100644 --- a/libarchive/test/test_read_extract.c +++ b/libarchive/test/test_read_extract.c @@ -117,7 +117,7 @@ DEFINE_TEST(test_read_extract) /* Extract the entries to disk. */ assert((a = archive_read_new()) != NULL); assertA(0 == archive_read_support_format_all(a)); - assertA(0 == archive_read_support_compression_all(a)); + assertA(0 == archive_read_support_filter_all(a)); assertA(0 == archive_read_open_memory(a, buff, BUFF_SIZE)); /* Restore first entry with _EXTRACT_PERM. */ failure("Error reading first entry", i); diff --git a/libarchive/test/test_read_format_ar.c b/libarchive/test/test_read_format_ar.c index 9094d106..c4694378 100644 --- a/libarchive/test/test_read_format_ar.c +++ b/libarchive/test/test_read_format_ar.c @@ -38,7 +38,7 @@ DEFINE_TEST(test_read_format_ar) extract_reference_file(reffile); assert((a = archive_read_new()) != NULL); - assertA(0 == archive_read_support_compression_all(a)); + assertA(0 == archive_read_support_filter_all(a)); assertA(0 == archive_read_support_format_all(a)); assertA(0 == archive_read_open_file(a, reffile, 7)); diff --git a/libarchive/test/test_read_format_cab.c b/libarchive/test/test_read_format_cab.c index 453f23d9..c1e6f740 100644 --- a/libarchive/test/test_read_format_cab.c +++ b/libarchive/test/test_read_format_cab.c @@ -186,7 +186,7 @@ verify(const char *refname, enum comp_type comp) memset(zero, 0, sizeof(zero)); extract_reference_file(refname); assert((a = archive_read_new()) != NULL); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, refname, 10240)); diff --git a/libarchive/test/test_read_format_cab_filename.c b/libarchive/test/test_read_format_cab_filename.c index 862cb88b..f3cf1089 100644 --- a/libarchive/test/test_read_format_cab_filename.c +++ b/libarchive/test/test_read_format_cab_filename.c @@ -42,7 +42,7 @@ test_read_format_cab_filename_CP932_eucJP(const char *refname) } assert((a = archive_read_new()) != NULL); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); if (ARCHIVE_OK != archive_read_set_options(a, "charset=CP932")) { skipping("This system cannot convert character-set" @@ -95,7 +95,7 @@ test_read_format_cab_filename_CP932_UTF8(const char *refname) } assert((a = archive_read_new()) != NULL); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); if (ARCHIVE_OK != archive_read_set_options(a, "charset=CP932")) { skipping("This system cannot convert character-set" diff --git a/libarchive/test/test_read_format_cpio_afio.c b/libarchive/test/test_read_format_cpio_afio.c index 229758ed..7aec833c 100644 --- a/libarchive/test/test_read_format_cpio_afio.c +++ b/libarchive/test/test_read_format_cpio_afio.c @@ -89,7 +89,7 @@ DEFINE_TEST(test_read_format_cpio_afio) memset(p, 0, size); memcpy(p, archive, sizeof(archive)); assert((a = archive_read_new()) != NULL); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_memory(a, p, size)); /* diff --git a/libarchive/test/test_read_format_cpio_bin.c b/libarchive/test/test_read_format_cpio_bin.c index 78146ba1..9b0a19a2 100644 --- a/libarchive/test/test_read_format_cpio_bin.c +++ b/libarchive/test/test_read_format_cpio_bin.c @@ -47,7 +47,7 @@ DEFINE_TEST(test_read_format_cpio_bin) struct archive_entry *ae; struct archive *a; assert((a = archive_read_new()) != NULL); - assertA(0 == archive_read_support_compression_all(a)); + assertA(0 == archive_read_support_filter_all(a)); assertA(0 == archive_read_support_format_all(a)); assertA(0 == archive_read_open_memory(a, archive, sizeof(archive))); assertA(0 == archive_read_next_header(a, &ae)); diff --git a/libarchive/test/test_read_format_cpio_bin_Z.c b/libarchive/test/test_read_format_cpio_bin_Z.c index 5c0765aa..99cb2620 100644 --- a/libarchive/test/test_read_format_cpio_bin_Z.c +++ b/libarchive/test/test_read_format_cpio_bin_Z.c @@ -37,7 +37,7 @@ DEFINE_TEST(test_read_format_cpio_bin_Z) struct archive *a; assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, - archive_read_support_compression_all(a)); + archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); assertEqualIntA(a, ARCHIVE_OK, diff --git a/libarchive/test/test_read_format_cpio_bin_be.c b/libarchive/test/test_read_format_cpio_bin_be.c index 11f82956..534471a1 100644 --- a/libarchive/test/test_read_format_cpio_bin_be.c +++ b/libarchive/test/test_read_format_cpio_bin_be.c @@ -33,7 +33,7 @@ DEFINE_TEST(test_read_format_cpio_bin_be) extract_reference_file(reference); assert((a = archive_read_new()) != NULL); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, reference, 10)); diff --git a/libarchive/test/test_read_format_cpio_bin_bz2.c b/libarchive/test/test_read_format_cpio_bin_bz2.c index a526ed10..c19efed8 100644 --- a/libarchive/test/test_read_format_cpio_bin_bz2.c +++ b/libarchive/test/test_read_format_cpio_bin_bz2.c @@ -39,7 +39,7 @@ DEFINE_TEST(test_read_format_cpio_bin_bz2) int r; assert((a = archive_read_new()) != NULL); - r = archive_read_support_compression_bzip2(a); + r = archive_read_support_filter_bzip2(a); if (r != ARCHIVE_OK) { skipping("bzip2 support unavailable"); archive_read_close(a); diff --git a/libarchive/test/test_read_format_cpio_bin_gz.c b/libarchive/test/test_read_format_cpio_bin_gz.c index ecb6bf12..a807b5b1 100644 --- a/libarchive/test/test_read_format_cpio_bin_gz.c +++ b/libarchive/test/test_read_format_cpio_bin_gz.c @@ -38,14 +38,14 @@ DEFINE_TEST(test_read_format_cpio_bin_gz) int r; assert((a = archive_read_new()) != NULL); - assertEqualInt(ARCHIVE_OK, archive_read_support_compression_all(a)); - r = archive_read_support_compression_gzip(a); + assertEqualInt(ARCHIVE_OK, archive_read_support_filter_all(a)); + r = archive_read_support_filter_gzip(a); if (r == ARCHIVE_WARN) { skipping("gzip reading not fully supported on this platform"); assertEqualInt(ARCHIVE_OK, archive_read_free(a)); return; } - failure("archive_read_support_compression_gzip"); + failure("archive_read_support_filter_gzip"); assertEqualInt(ARCHIVE_OK, r); assertEqualInt(ARCHIVE_OK, archive_read_support_format_all(a)); assertEqualInt(ARCHIVE_OK, diff --git a/libarchive/test/test_read_format_cpio_bin_lzip.c b/libarchive/test/test_read_format_cpio_bin_lzip.c index bb92f18e..16effb91 100644 --- a/libarchive/test/test_read_format_cpio_bin_lzip.c +++ b/libarchive/test/test_read_format_cpio_bin_lzip.c @@ -42,8 +42,8 @@ DEFINE_TEST(test_read_format_cpio_bin_lzip) int r; assert((a = archive_read_new()) != NULL); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); - r = archive_read_support_compression_lzip(a); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); + r = archive_read_support_filter_lzip(a); if (r == ARCHIVE_WARN) { skipping("lzip reading not fully supported on this platform"); 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 0c15de99..e168e2f9 100644 --- a/libarchive/test/test_read_format_cpio_bin_lzma.c +++ b/libarchive/test/test_read_format_cpio_bin_lzma.c @@ -41,8 +41,8 @@ DEFINE_TEST(test_read_format_cpio_bin_lzma) int r; assert((a = archive_read_new()) != NULL); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); - r = archive_read_support_compression_lzma(a); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); + r = archive_read_support_filter_lzma(a); if (r == ARCHIVE_WARN) { skipping("lzma reading not fully supported on this platform"); 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 4383e7f5..7c65da67 100644 --- a/libarchive/test/test_read_format_cpio_bin_xz.c +++ b/libarchive/test/test_read_format_cpio_bin_xz.c @@ -51,8 +51,8 @@ DEFINE_TEST(test_read_format_cpio_bin_xz) int r; assert((a = archive_read_new()) != NULL); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); - r = archive_read_support_compression_xz(a); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); + r = archive_read_support_filter_xz(a); if (r == ARCHIVE_WARN) { skipping("xz reading not fully supported on this platform"); assertEqualInt(ARCHIVE_OK, archive_read_free(a)); diff --git a/libarchive/test/test_read_format_cpio_odc.c b/libarchive/test/test_read_format_cpio_odc.c index 4d42e172..cdcf0b5a 100644 --- a/libarchive/test/test_read_format_cpio_odc.c +++ b/libarchive/test/test_read_format_cpio_odc.c @@ -51,7 +51,7 @@ DEFINE_TEST(test_read_format_cpio_odc) struct archive_entry *ae; struct archive *a; assert((a = archive_read_new()) != NULL); - assertA(0 == archive_read_support_compression_all(a)); + assertA(0 == archive_read_support_filter_all(a)); 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)); 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 9c0b92e0..f0d27a3d 100644 --- a/libarchive/test/test_read_format_cpio_svr4_bzip2_rpm.c +++ b/libarchive/test/test_read_format_cpio_svr4_bzip2_rpm.c @@ -90,7 +90,7 @@ DEFINE_TEST(test_read_format_cpio_svr4_bzip2_rpm) int r; assert((a = archive_read_new()) != NULL); - r = archive_read_support_compression_bzip2(a); + r = archive_read_support_filter_bzip2(a); if (r == ARCHIVE_WARN) { skipping("bzip2 reading not fully supported on this platform"); assertEqualInt(ARCHIVE_OK, archive_read_free(a)); @@ -98,7 +98,7 @@ DEFINE_TEST(test_read_format_cpio_svr4_bzip2_rpm) } assertEqualIntA(a, ARCHIVE_OK, r); assertEqualIntA(a, ARCHIVE_OK, - archive_read_support_compression_rpm(a)); + archive_read_support_filter_rpm(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); extract_reference_file(name); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, name, 2)); diff --git a/libarchive/test/test_read_format_cpio_svr4_gzip.c b/libarchive/test/test_read_format_cpio_svr4_gzip.c index c81b2e59..88d54d17 100644 --- a/libarchive/test/test_read_format_cpio_svr4_gzip.c +++ b/libarchive/test/test_read_format_cpio_svr4_gzip.c @@ -39,8 +39,8 @@ DEFINE_TEST(test_read_format_cpio_svr4_gzip) int r; assert((a = archive_read_new()) != NULL); - assertEqualInt(ARCHIVE_OK, archive_read_support_compression_all(a)); - r = archive_read_support_compression_gzip(a); + assertEqualInt(ARCHIVE_OK, archive_read_support_filter_all(a)); + r = archive_read_support_filter_gzip(a); if (r == ARCHIVE_WARN) { skipping("gzip reading not fully supported on this platform"); assertEqualInt(ARCHIVE_OK, archive_read_free(a)); diff --git a/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.c b/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.c index 1be66670..338a088a 100644 --- a/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.c +++ b/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.c @@ -90,7 +90,7 @@ DEFINE_TEST(test_read_format_cpio_svr4_gzip_rpm) int r; assert((a = archive_read_new()) != NULL); - r = archive_read_support_compression_gzip(a); + r = archive_read_support_filter_gzip(a); if (r == ARCHIVE_WARN) { skipping("gzip reading not fully supported on this platform"); assertEqualInt(ARCHIVE_OK, archive_read_free(a)); @@ -98,7 +98,7 @@ DEFINE_TEST(test_read_format_cpio_svr4_gzip_rpm) } assertEqualIntA(a, ARCHIVE_OK, r); assertEqualIntA(a, ARCHIVE_OK, - archive_read_support_compression_rpm(a)); + archive_read_support_filter_rpm(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); extract_reference_file(name); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, name, 2)); diff --git a/libarchive/test/test_read_format_cpio_svr4c_Z.c b/libarchive/test/test_read_format_cpio_svr4c_Z.c index 912824c4..ca3d5ce0 100644 --- a/libarchive/test/test_read_format_cpio_svr4c_Z.c +++ b/libarchive/test/test_read_format_cpio_svr4c_Z.c @@ -40,7 +40,7 @@ DEFINE_TEST(test_read_format_cpio_svr4c_Z) /* printf("Archive address: start=%X, end=%X\n", archive, archive+sizeof(archive)); */ assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, - archive_read_support_compression_all(a)); + archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); assertEqualIntA(a, ARCHIVE_OK, diff --git a/libarchive/test/test_read_format_empty.c b/libarchive/test/test_read_format_empty.c index c16b6bb9..0dafe9f6 100644 --- a/libarchive/test/test_read_format_empty.c +++ b/libarchive/test/test_read_format_empty.c @@ -32,7 +32,7 @@ DEFINE_TEST(test_read_format_empty) struct archive_entry *ae; struct archive *a; assert((a = archive_read_new()) != NULL); - assertA(0 == archive_read_support_compression_all(a)); + assertA(0 == archive_read_support_filter_all(a)); 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)); diff --git a/libarchive/test/test_read_format_gtar_gz.c b/libarchive/test/test_read_format_gtar_gz.c index 4140a8a8..cc95c1ae 100644 --- a/libarchive/test/test_read_format_gtar_gz.c +++ b/libarchive/test/test_read_format_gtar_gz.c @@ -39,8 +39,8 @@ DEFINE_TEST(test_read_format_gtar_gz) int r; assert((a = archive_read_new()) != NULL); - assertEqualInt(ARCHIVE_OK, archive_read_support_compression_all(a)); - r = archive_read_support_compression_gzip(a); + assertEqualInt(ARCHIVE_OK, archive_read_support_filter_all(a)); + r = archive_read_support_filter_gzip(a); if (r == ARCHIVE_WARN) { skipping("gzip reading not fully supported on this platform"); assertEqualInt(ARCHIVE_OK, archive_read_free(a)); diff --git a/libarchive/test/test_read_format_gtar_lzma.c b/libarchive/test/test_read_format_gtar_lzma.c index 9e577717..29ffae12 100644 --- a/libarchive/test/test_read_format_gtar_lzma.c +++ b/libarchive/test/test_read_format_gtar_lzma.c @@ -45,8 +45,8 @@ DEFINE_TEST(test_read_format_gtar_lzma) struct archive *a; assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, - archive_read_support_compression_all(a)); - r = archive_read_support_compression_lzma(a); + archive_read_support_filter_all(a)); + r = archive_read_support_filter_lzma(a); if (r == ARCHIVE_WARN) { skipping("lzma reading not fully supported on this platform"); assertEqualInt(ARCHIVE_OK, archive_read_free(a)); diff --git a/libarchive/test/test_read_format_gtar_sparse.c b/libarchive/test/test_read_format_gtar_sparse.c index 003771df..10e78984 100644 --- a/libarchive/test/test_read_format_gtar_sparse.c +++ b/libarchive/test/test_read_format_gtar_sparse.c @@ -190,7 +190,7 @@ verify_archive_file(const char *name, struct archive_contents *ac) extract_reference_file(name); assert((a = archive_read_new()) != NULL); - assert(0 == archive_read_support_compression_all(a)); + assert(0 == archive_read_support_filter_all(a)); assert(0 == archive_read_support_format_tar(a)); failure("Can't open %s", name); assert(0 == archive_read_open_filename(a, name, 3)); diff --git a/libarchive/test/test_read_format_iso_gz.c b/libarchive/test/test_read_format_iso_gz.c index 4b7712d8..b30320b2 100644 --- a/libarchive/test/test_read_format_iso_gz.c +++ b/libarchive/test/test_read_format_iso_gz.c @@ -35,7 +35,7 @@ DEFINE_TEST(test_read_format_iso_gz) assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, - archive_read_support_compression_all(a)); + archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); assertEqualIntA(a, ARCHIVE_OK, diff --git a/libarchive/test/test_read_format_iso_multi_extent.c b/libarchive/test/test_read_format_iso_multi_extent.c index a55527f8..3df52baa 100644 --- a/libarchive/test/test_read_format_iso_multi_extent.c +++ b/libarchive/test/test_read_format_iso_multi_extent.c @@ -42,7 +42,7 @@ DEFINE_TEST(test_read_format_iso_multi_extent) extract_reference_file(refname); assert((a = archive_read_new()) != NULL); - assertEqualInt(0, archive_read_support_compression_all(a)); + assertEqualInt(0, archive_read_support_filter_all(a)); assertEqualInt(0, archive_read_support_format_all(a)); assertEqualInt(ARCHIVE_OK, archive_read_open_filename(a, refname, 10240)); diff --git a/libarchive/test/test_read_format_iso_xorriso.c b/libarchive/test/test_read_format_iso_xorriso.c index ff326241..b4bbfed6 100644 --- a/libarchive/test/test_read_format_iso_xorriso.c +++ b/libarchive/test/test_read_format_iso_xorriso.c @@ -80,7 +80,7 @@ DEFINE_TEST(test_read_format_iso_xorriso) extract_reference_file(refname); assert((a = archive_read_new()) != NULL); - assertEqualInt(0, archive_read_support_compression_all(a)); + assertEqualInt(0, archive_read_support_filter_all(a)); assertEqualInt(0, archive_read_support_format_all(a)); assertEqualInt(ARCHIVE_OK, archive_read_open_filename(a, refname, 10240)); diff --git a/libarchive/test/test_read_format_isojoliet_bz2.c b/libarchive/test/test_read_format_isojoliet_bz2.c index a1417479..7f723b82 100644 --- a/libarchive/test/test_read_format_isojoliet_bz2.c +++ b/libarchive/test/test_read_format_isojoliet_bz2.c @@ -67,7 +67,7 @@ DEFINE_TEST(test_read_format_isojoliet_bz2) extract_reference_file(refname); assert((a = archive_read_new()) != NULL); - assertEqualInt(0, archive_read_support_compression_all(a)); + assertEqualInt(0, archive_read_support_filter_all(a)); assertEqualInt(0, archive_read_support_format_all(a)); assertEqualInt(ARCHIVE_OK, archive_read_set_option(a, "iso9660", "rockridge", NULL)); diff --git a/libarchive/test/test_read_format_isojoliet_long.c b/libarchive/test/test_read_format_isojoliet_long.c index 3fc83d32..0a84744a 100644 --- a/libarchive/test/test_read_format_isojoliet_long.c +++ b/libarchive/test/test_read_format_isojoliet_long.c @@ -75,7 +75,7 @@ DEFINE_TEST(test_read_format_isojoliet_long) pathname[i] = '0' + ((i+1) % 10); extract_reference_file(refname); assert((a = archive_read_new()) != NULL); - assertEqualInt(0, archive_read_support_compression_all(a)); + assertEqualInt(0, archive_read_support_filter_all(a)); assertEqualInt(0, archive_read_support_format_all(a)); assertEqualInt(ARCHIVE_OK, archive_read_set_options(a, "iso9660:!rockridge")); diff --git a/libarchive/test/test_read_format_isojoliet_rr.c b/libarchive/test/test_read_format_isojoliet_rr.c index 9f55751a..d1afdb5f 100644 --- a/libarchive/test/test_read_format_isojoliet_rr.c +++ b/libarchive/test/test_read_format_isojoliet_rr.c @@ -70,7 +70,7 @@ DEFINE_TEST(test_read_format_isojoliet_rr) extract_reference_file(refname); assert((a = archive_read_new()) != NULL); - assertEqualInt(0, archive_read_support_compression_all(a)); + assertEqualInt(0, archive_read_support_filter_all(a)); assertEqualInt(0, archive_read_support_format_all(a)); assertEqualInt(ARCHIVE_OK, archive_read_open_filename(a, refname, 10240)); diff --git a/libarchive/test/test_read_format_isojoliet_versioned.c b/libarchive/test/test_read_format_isojoliet_versioned.c index 6d29685b..82c5ab1f 100644 --- a/libarchive/test/test_read_format_isojoliet_versioned.c +++ b/libarchive/test/test_read_format_isojoliet_versioned.c @@ -42,7 +42,7 @@ DEFINE_TEST(test_read_format_isojoliet_versioned) extract_reference_file(refname); assert((a = archive_read_new()) != NULL); - assertEqualInt(0, archive_read_support_compression_all(a)); + assertEqualInt(0, archive_read_support_filter_all(a)); assertEqualInt(0, archive_read_support_format_all(a)); assertEqualInt(ARCHIVE_OK, archive_read_set_option(a, "iso9660", "rockridge", NULL)); diff --git a/libarchive/test/test_read_format_isorr_bz2.c b/libarchive/test/test_read_format_isorr_bz2.c index 8e83736a..7b7f7df9 100644 --- a/libarchive/test/test_read_format_isorr_bz2.c +++ b/libarchive/test/test_read_format_isorr_bz2.c @@ -68,7 +68,7 @@ DEFINE_TEST(test_read_format_isorr_bz2) extract_reference_file(refname); assert((a = archive_read_new()) != NULL); - assertEqualInt(0, archive_read_support_compression_all(a)); + assertEqualInt(0, archive_read_support_filter_all(a)); assertEqualInt(0, archive_read_support_format_all(a)); assertEqualInt(ARCHIVE_OK, archive_read_open_filename(a, refname, 10240)); diff --git a/libarchive/test/test_read_format_isorr_ce.c b/libarchive/test/test_read_format_isorr_ce.c index c20febdd..dc664837 100644 --- a/libarchive/test/test_read_format_isorr_ce.c +++ b/libarchive/test/test_read_format_isorr_ce.c @@ -104,7 +104,7 @@ DEFINE_TEST(test_read_format_isorr_ce) mkpath(path3, 153); extract_reference_file(refname); assert((a = archive_read_new()) != NULL); - assertEqualInt(0, archive_read_support_compression_all(a)); + assertEqualInt(0, archive_read_support_filter_all(a)); assertEqualInt(0, archive_read_support_format_all(a)); assertEqualInt(ARCHIVE_OK, archive_read_open_filename(a, refname, 10240)); diff --git a/libarchive/test/test_read_format_isorr_new_bz2.c b/libarchive/test/test_read_format_isorr_new_bz2.c index b8cc2c14..d71d4d23 100644 --- a/libarchive/test/test_read_format_isorr_new_bz2.c +++ b/libarchive/test/test_read_format_isorr_new_bz2.c @@ -69,7 +69,7 @@ DEFINE_TEST(test_read_format_isorr_new_bz2) extract_reference_file(refname); assert((a = archive_read_new()) != NULL); - assertEqualInt(0, archive_read_support_compression_all(a)); + assertEqualInt(0, archive_read_support_filter_all(a)); assertEqualInt(0, archive_read_support_format_all(a)); assertEqualInt(ARCHIVE_OK, archive_read_open_filename(a, refname, 10240)); diff --git a/libarchive/test/test_read_format_isorr_rr_moved.c b/libarchive/test/test_read_format_isorr_rr_moved.c index 5a64f46f..a90677f2 100644 --- a/libarchive/test/test_read_format_isorr_rr_moved.c +++ b/libarchive/test/test_read_format_isorr_rr_moved.c @@ -74,7 +74,7 @@ DEFINE_TEST(test_read_format_isorr_rr_moved) extract_reference_file(refname); assert((a = archive_read_new()) != NULL); - assertEqualInt(0, archive_read_support_compression_all(a)); + assertEqualInt(0, archive_read_support_filter_all(a)); assertEqualInt(0, archive_read_support_format_all(a)); assertEqualInt(ARCHIVE_OK, archive_read_open_filename(a, refname, 10240)); diff --git a/libarchive/test/test_read_format_isozisofs_bz2.c b/libarchive/test/test_read_format_isozisofs_bz2.c index a7c68e04..c3705bb8 100644 --- a/libarchive/test/test_read_format_isozisofs_bz2.c +++ b/libarchive/test/test_read_format_isozisofs_bz2.c @@ -67,7 +67,7 @@ DEFINE_TEST(test_read_format_isozisofs_bz2) extract_reference_file(refname); assert((a = archive_read_new()) != NULL); - assertEqualInt(0, archive_read_support_compression_all(a)); + assertEqualInt(0, archive_read_support_filter_all(a)); assertEqualInt(0, archive_read_support_format_all(a)); assertEqualInt(ARCHIVE_OK, archive_read_open_filename(a, refname, 10240)); diff --git a/libarchive/test/test_read_format_lha.c b/libarchive/test/test_read_format_lha.c index b31e245c..f295c090 100644 --- a/libarchive/test/test_read_format_lha.c +++ b/libarchive/test/test_read_format_lha.c @@ -150,7 +150,7 @@ verify(const char *refname, int posix) extract_reference_file(refname); assert((a = archive_read_new()) != NULL); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, refname, 10240)); diff --git a/libarchive/test/test_read_format_lha_filename.c b/libarchive/test/test_read_format_lha_filename.c index 214089a2..6028bc2f 100644 --- a/libarchive/test/test_read_format_lha_filename.c +++ b/libarchive/test/test_read_format_lha_filename.c @@ -58,7 +58,7 @@ test_read_format_lha_filename_CP932_eucJP(const char *refname) assertEqualInt(ARCHIVE_OK, archive_read_free(a)); assert((a = archive_read_new()) != NULL); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, refname, 10240)); @@ -117,7 +117,7 @@ test_read_format_lha_filename_CP932_UTF8(const char *refname) assertEqualInt(ARCHIVE_OK, archive_read_free(a)); assert((a = archive_read_new()) != NULL); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, refname, 10240)); @@ -172,7 +172,7 @@ test_read_format_lha_filename_CP932_Windows(const char *refname) assertEqualInt(ARCHIVE_OK, archive_read_free(a)); assert((a = archive_read_new()) != NULL); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, refname, 10240)); diff --git a/libarchive/test/test_read_format_mtree.c b/libarchive/test/test_read_format_mtree.c index 02c4be36..b23d43c3 100644 --- a/libarchive/test/test_read_format_mtree.c +++ b/libarchive/test/test_read_format_mtree.c @@ -47,7 +47,7 @@ test_read_format_mtree1(void) assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, - archive_read_support_compression_all(a)); + archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_file(a, reffile, 11)); @@ -120,7 +120,7 @@ test_read_format_mtree2(void) assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, - archive_read_support_compression_all(a)); + archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); assertEqualIntA(a, ARCHIVE_OK, @@ -154,7 +154,7 @@ test_read_format_mtree3(void) assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, - archive_read_support_compression_all(a)); + archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); assertEqualIntA(a, ARCHIVE_OK, @@ -193,7 +193,7 @@ test_read_format_mtree4(void) assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, - archive_read_support_compression_all(a)); + archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_file(a, reffile, 11)); diff --git a/libarchive/test/test_read_format_pax_bz2.c b/libarchive/test/test_read_format_pax_bz2.c index 54f6fcd0..7217082c 100644 --- a/libarchive/test/test_read_format_pax_bz2.c +++ b/libarchive/test/test_read_format_pax_bz2.c @@ -47,7 +47,7 @@ DEFINE_TEST(test_read_format_pax_bz2) int r; assert((a = archive_read_new()) != NULL); - r = archive_read_support_compression_bzip2(a); + r = archive_read_support_filter_bzip2(a); if (r != ARCHIVE_OK) { archive_read_close(a); skipping("Bzip2 unavailable"); diff --git a/libarchive/test/test_read_format_raw.c b/libarchive/test/test_read_format_raw.c index 6bc8347d..a23b9c55 100644 --- a/libarchive/test/test_read_format_raw.c +++ b/libarchive/test/test_read_format_raw.c @@ -39,7 +39,7 @@ DEFINE_TEST(test_read_format_raw) /* First, try pulling data out of an uninterpretable file. */ extract_reference_file(reffile1); assert((a = archive_read_new()) != NULL); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_raw(a)); assertEqualIntA(a, ARCHIVE_OK, @@ -65,7 +65,7 @@ DEFINE_TEST(test_read_format_raw) /* Second, try the same with a compressed file. */ extract_reference_file(reffile2); assert((a = archive_read_new()) != NULL); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_raw(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); assertEqualIntA(a, ARCHIVE_OK, diff --git a/libarchive/test/test_read_format_tar.c b/libarchive/test/test_read_format_tar.c index a8200927..31e6ae30 100644 --- a/libarchive/test/test_read_format_tar.c +++ b/libarchive/test/test_read_format_tar.c @@ -66,7 +66,7 @@ static void verifyEmpty(void) struct archive *a; assert((a = archive_read_new()) != NULL); - assertA(0 == archive_read_support_compression_all(a)); + assertA(0 == archive_read_support_filter_all(a)); 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)); @@ -433,7 +433,7 @@ static void verify(unsigned char *d, size_t s, memset(buff + s, 0, 2048); assert((a = archive_read_new()) != NULL); - assertA(0 == archive_read_support_compression_all(a)); + assertA(0 == archive_read_support_filter_all(a)); 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)); diff --git a/libarchive/test/test_read_format_tar_empty_filename.c b/libarchive/test/test_read_format_tar_empty_filename.c index 5832fc8b..b83226ba 100644 --- a/libarchive/test/test_read_format_tar_empty_filename.c +++ b/libarchive/test/test_read_format_tar_empty_filename.c @@ -35,7 +35,7 @@ DEFINE_TEST(test_read_format_tar_empty_filename) struct archive *a; assert((a = archive_read_new()) != NULL); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); extract_reference_file(name); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, name, 10240)); diff --git a/libarchive/test/test_read_format_tbz.c b/libarchive/test/test_read_format_tbz.c index f64aa7c4..dcd73cf9 100644 --- a/libarchive/test/test_read_format_tbz.c +++ b/libarchive/test/test_read_format_tbz.c @@ -40,7 +40,7 @@ DEFINE_TEST(test_read_format_tbz) int r; assert((a = archive_read_new()) != NULL); - r = archive_read_support_compression_bzip2(a); + r = archive_read_support_filter_bzip2(a); if (r != ARCHIVE_OK) { skipping("Bzip2 support"); archive_read_free(a); diff --git a/libarchive/test/test_read_format_tgz.c b/libarchive/test/test_read_format_tgz.c index e1985366..3193d978 100644 --- a/libarchive/test/test_read_format_tgz.c +++ b/libarchive/test/test_read_format_tgz.c @@ -39,8 +39,8 @@ DEFINE_TEST(test_read_format_tgz) int r; assert((a = archive_read_new()) != NULL); - assertEqualInt(ARCHIVE_OK, archive_read_support_compression_all(a)); - r = archive_read_support_compression_gzip(a); + assertEqualInt(ARCHIVE_OK, archive_read_support_filter_all(a)); + r = archive_read_support_filter_gzip(a); if (r == ARCHIVE_WARN) { skipping("gzip reading not fully supported on this platform"); assertEqualInt(ARCHIVE_OK, archive_read_free(a)); diff --git a/libarchive/test/test_read_format_tlz.c b/libarchive/test/test_read_format_tlz.c index ef1c0ab3..18660be6 100644 --- a/libarchive/test/test_read_format_tlz.c +++ b/libarchive/test/test_read_format_tlz.c @@ -42,8 +42,8 @@ DEFINE_TEST(test_read_format_tlz) int r; assert((a = archive_read_new()) != NULL); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); - r = archive_read_support_compression_lzma(a); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); + r = archive_read_support_filter_lzma(a); if (r == ARCHIVE_WARN) { skipping("lzma reading not fully supported on this platform"); 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 29fdd88c..3230083b 100644 --- a/libarchive/test/test_read_format_txz.c +++ b/libarchive/test/test_read_format_txz.c @@ -45,8 +45,8 @@ DEFINE_TEST(test_read_format_txz) int r; assert((a = archive_read_new()) != NULL); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); - r = archive_read_support_compression_xz(a); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); + r = archive_read_support_filter_xz(a); if (r == ARCHIVE_WARN) { skipping("xz reading not fully supported on this platform"); 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 b6a7bc14..905b8ffa 100644 --- a/libarchive/test/test_read_format_tz.c +++ b/libarchive/test/test_read_format_tz.c @@ -40,7 +40,7 @@ DEFINE_TEST(test_read_format_tz) struct archive *a; assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, - archive_read_support_compression_all(a)); + archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_memory(a, archive, sizeof(archive))); diff --git a/libarchive/test/test_read_format_xar.c b/libarchive/test/test_read_format_xar.c index 009b5ecb..dbc8a618 100644 --- a/libarchive/test/test_read_format_xar.c +++ b/libarchive/test/test_read_format_xar.c @@ -638,7 +638,7 @@ static void verify(unsigned char *d, size_t s, case BZIP2: /* This is only check whether bzip is supported or not. * This filter won't be used this test. */ - if (ARCHIVE_OK != archive_read_support_compression_bzip2(a)) { + if (ARCHIVE_OK != archive_read_support_filter_bzip2(a)) { skipping("Unsupported bzip2"); assertEqualInt(ARCHIVE_OK, archive_read_free(a)); return; @@ -649,7 +649,7 @@ static void verify(unsigned char *d, size_t s, * will return a warning if gzip is unsupported. */ break; } - assertA(0 == archive_read_support_compression_all(a)); + assertA(0 == archive_read_support_filter_all(a)); r = archive_read_support_format_xar(a); if (r == ARCHIVE_WARN) { skipping("xar reading not fully supported on this platform"); diff --git a/libarchive/test/test_read_format_zip.c b/libarchive/test/test_read_format_zip.c index 7c8a42f9..c1da4015 100644 --- a/libarchive/test/test_read_format_zip.c +++ b/libarchive/test/test_read_format_zip.c @@ -50,7 +50,7 @@ test_basic() extract_reference_file(refname); assert((a = archive_read_new()) != NULL); - assertA(0 == archive_read_support_compression_all(a)); + assertA(0 == archive_read_support_filter_all(a)); assertA(0 == archive_read_support_format_all(a)); assertA(0 == archive_read_open_filename(a, refname, 10240)); assertA(0 == archive_read_next_header(a, &ae)); @@ -106,7 +106,7 @@ test_info_zip_ux() extract_reference_file(refname); assert((a = archive_read_new()) != NULL); - assertA(0 == archive_read_support_compression_all(a)); + assertA(0 == archive_read_support_filter_all(a)); assertA(0 == archive_read_support_format_all(a)); assertA(0 == archive_read_open_filename(a, refname, 10240)); diff --git a/libarchive/test/test_read_format_zip_filename.c b/libarchive/test/test_read_format_zip_filename.c index 36d08c7f..f51ae279 100644 --- a/libarchive/test/test_read_format_zip_filename.c +++ b/libarchive/test/test_read_format_zip_filename.c @@ -42,7 +42,7 @@ test_read_format_zip_filename_CP932_eucJP(const char *refname) } assert((a = archive_read_new()) != NULL); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); if (ARCHIVE_OK != archive_read_set_options(a, "charset=CP932")) { skipping("This system cannot convert character-set" @@ -95,7 +95,7 @@ test_read_format_zip_filename_CP932_UTF8(const char *refname) } assert((a = archive_read_new()) != NULL); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); if (ARCHIVE_OK != archive_read_set_options(a, "charset=CP932")) { skipping("This system cannot convert character-set" @@ -158,7 +158,7 @@ test_read_format_zip_filename_UTF8_eucJP(const char *refname) assertEqualInt(ARCHIVE_OK, archive_read_free(a)); assert((a = archive_read_new()) != NULL); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, refname, 10240)); @@ -217,7 +217,7 @@ test_read_format_zip_filename_UTF8_UTF8(const char *refname) } assert((a = archive_read_new()) != NULL); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, refname, 10240)); diff --git a/libarchive/test/test_read_large.c b/libarchive/test/test_read_large.c index 342876fd..e9b1a817 100644 --- a/libarchive/test/test_read_large.c +++ b/libarchive/test/test_read_large.c @@ -62,7 +62,7 @@ DEFINE_TEST(test_read_large) assert(NULL != (a = archive_read_new())); assertA(0 == archive_read_support_format_all(a)); - assertA(0 == archive_read_support_compression_all(a)); + assertA(0 == archive_read_support_filter_all(a)); assertA(0 == archive_read_open_memory(a, buff, sizeof(buff))); assertA(0 == archive_read_next_header(a, &entry)); assertA(0 == archive_read_data_into_buffer(a, testdatacopy, sizeof(testdatacopy))); @@ -72,7 +72,7 @@ DEFINE_TEST(test_read_large) assert(NULL != (a = archive_read_new())); assertA(0 == archive_read_support_format_all(a)); - assertA(0 == archive_read_support_compression_all(a)); + assertA(0 == archive_read_support_filter_all(a)); assertA(0 == archive_read_open_memory(a, buff, sizeof(buff))); assertA(0 == archive_read_next_header(a, &entry)); #if defined(__BORLANDC__) diff --git a/libarchive/test/test_read_pax_truncated.c b/libarchive/test/test_read_pax_truncated.c index 076a7f02..7350c58a 100644 --- a/libarchive/test/test_read_pax_truncated.c +++ b/libarchive/test/test_read_pax_truncated.c @@ -68,7 +68,7 @@ DEFINE_TEST(test_read_pax_truncated) for (i = 1; i < used + 100; i += 100) { assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); /* If it's truncated very early, the file type detection should fail. */ if (i < 512) { assertEqualIntA(a, ARCHIVE_FATAL, read_open_memory2(a, buff, i, 13)); @@ -122,7 +122,7 @@ DEFINE_TEST(test_read_pax_truncated) for (i = 1; i < used + 100; i += 100) { assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); /* If it's truncated very early, file type detection should fail. */ if (i < 512) { assertEqualIntA(a, ARCHIVE_FATAL, read_open_memory(a, buff, i, 7)); @@ -172,7 +172,7 @@ DEFINE_TEST(test_read_pax_truncated) buff2[514] = 'A'; /* Non-digit in size. */ assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_memory(a, buff2, used)); assertEqualIntA(a, ARCHIVE_WARN, archive_read_next_header(a, &ae)); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); @@ -183,7 +183,7 @@ DEFINE_TEST(test_read_pax_truncated) buff2[512] = 'A'; /* First character not a digit. */ assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_memory(a, buff2, used)); assertEqualIntA(a, ARCHIVE_WARN, archive_read_next_header(a, &ae)); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); @@ -196,7 +196,7 @@ DEFINE_TEST(test_read_pax_truncated) buff2[i] = ' '; assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_memory(a, buff2, used)); assertEqualIntA(a, ARCHIVE_WARN, archive_read_next_header(a, &ae)); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); @@ -210,7 +210,7 @@ DEFINE_TEST(test_read_pax_truncated) buff2[515] = ' '; assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_memory(a, buff2, used)); assertEqualIntA(a, ARCHIVE_WARN, archive_read_next_header(a, &ae)); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); @@ -222,7 +222,7 @@ DEFINE_TEST(test_read_pax_truncated) buff2[513] = ' '; assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_memory(a, buff2, used)); assertEqualIntA(a, ARCHIVE_WARN, archive_read_next_header(a, &ae)); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); @@ -233,7 +233,7 @@ DEFINE_TEST(test_read_pax_truncated) buff2[512] = ' '; /* No size given. */ assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_memory(a, buff2, used)); assertEqualIntA(a, ARCHIVE_WARN, archive_read_next_header(a, &ae)); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); @@ -244,7 +244,7 @@ DEFINE_TEST(test_read_pax_truncated) buff2[1024]++; /* Break the checksum. */ assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_memory(a, buff2, used)); assertEqualIntA(a, ARCHIVE_FATAL, archive_read_next_header(a, &ae)); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); diff --git a/libarchive/test/test_read_truncated.c b/libarchive/test/test_read_truncated.c index e254ba58..30683412 100644 --- a/libarchive/test/test_read_truncated.c +++ b/libarchive/test/test_read_truncated.c @@ -63,7 +63,7 @@ DEFINE_TEST(test_read_truncated) for (i = 1; i < used + 100; i += 100) { assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); if (i < 512) { assertEqualIntA(a, ARCHIVE_FATAL, archive_read_open_memory(a, buff, i)); goto wrap_up; @@ -101,7 +101,7 @@ DEFINE_TEST(test_read_truncated) for (i = 1; i < used + 100; i += 100) { assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); if (i < 512) { assertEqualIntA(a, ARCHIVE_FATAL, archive_read_open_memory(a, buff, i)); goto wrap_up2; diff --git a/libarchive/test/test_read_truncated_filter.c b/libarchive/test/test_read_truncated_filter.c index f72eaba8..582f7bae 100644 --- a/libarchive/test/test_read_truncated_filter.c +++ b/libarchive/test/test_read_truncated_filter.c @@ -95,7 +95,7 @@ test_truncation(const char *compression, int (*set_compression)(struct archive * assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_memory(a, buff, used1 - used1/64)); for (i = 0; i < 100; i++) { diff --git a/libarchive/test/test_read_uu.c b/libarchive/test/test_read_uu.c index a0979a81..ac8cf160 100644 --- a/libarchive/test/test_read_uu.c +++ b/libarchive/test/test_read_uu.c @@ -104,7 +104,7 @@ test_read_uu_sub(const char *uudata, size_t uusize) assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, - archive_read_support_compression_all(a)); + archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); assertEqualIntA(a, ARCHIVE_OK, diff --git a/libarchive/test/test_tar_filenames.c b/libarchive/test/test_tar_filenames.c index aead684c..de423bbe 100644 --- a/libarchive/test/test_tar_filenames.c +++ b/libarchive/test/test_tar_filenames.c @@ -108,7 +108,7 @@ test_filename(const char *prefix, int dlen, int flen) */ assert((a = archive_read_new()) != NULL); assertA(0 == archive_read_support_format_all(a)); - assertA(0 == archive_read_support_compression_all(a)); + assertA(0 == archive_read_support_filter_all(a)); assertA(0 == archive_read_open_memory(a, buff, used)); /* Read the file and check the filename. */ diff --git a/libarchive/test/test_ustar_filenames.c b/libarchive/test/test_ustar_filenames.c index ffd263c0..55665bb6 100644 --- a/libarchive/test/test_ustar_filenames.c +++ b/libarchive/test/test_ustar_filenames.c @@ -118,7 +118,7 @@ test_filename(const char *prefix, int dlen, int flen) */ assert((a = archive_read_new()) != NULL); assertA(0 == archive_read_support_format_all(a)); - assertA(0 == archive_read_support_compression_all(a)); + assertA(0 == archive_read_support_filter_all(a)); assertA(0 == archive_read_open_memory(a, buff, used)); if (flen <= 100) { diff --git a/libarchive/test/test_write_compress.c b/libarchive/test/test_write_compress.c index b9c26640..bb81c4f3 100644 --- a/libarchive/test/test_write_compress.c +++ b/libarchive/test/test_write_compress.c @@ -78,7 +78,7 @@ DEFINE_TEST(test_write_compress) */ assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_memory(a, buff, used)); diff --git a/libarchive/test/test_write_compress_bzip2.c b/libarchive/test/test_write_compress_bzip2.c index 54deef56..b9e92369 100644 --- a/libarchive/test/test_write_compress_bzip2.c +++ b/libarchive/test/test_write_compress_bzip2.c @@ -84,7 +84,7 @@ DEFINE_TEST(test_write_compress_bzip2) assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_memory(a, buff, used1)); for (i = 0; i < 999; i++) { sprintf(path, "file%03d", i); @@ -137,7 +137,7 @@ DEFINE_TEST(test_write_compress_bzip2) assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_memory(a, buff, used2)); for (i = 0; i < 999; i++) { sprintf(path, "file%03d", i); @@ -182,7 +182,7 @@ DEFINE_TEST(test_write_compress_bzip2) assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_memory(a, buff, used2)); for (i = 0; i < 999; i++) { sprintf(path, "file%03d", i); diff --git a/libarchive/test/test_write_compress_gzip.c b/libarchive/test/test_write_compress_gzip.c index 265c5724..c8281e7b 100644 --- a/libarchive/test/test_write_compress_gzip.c +++ b/libarchive/test/test_write_compress_gzip.c @@ -86,7 +86,7 @@ DEFINE_TEST(test_write_compress_gzip) assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); - r = archive_read_support_compression_gzip(a); + r = archive_read_support_filter_gzip(a); if (r == ARCHIVE_WARN) { skipping("Can't verify gzip writing by reading back;" " gzip reading not fully supported on this platform"); @@ -150,12 +150,12 @@ DEFINE_TEST(test_write_compress_gzip) assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); - r = archive_read_support_compression_gzip(a); + r = archive_read_support_filter_gzip(a); if (r == ARCHIVE_WARN) { skipping("gzip reading not fully supported on this platform"); } else { assertEqualIntA(a, ARCHIVE_OK, - archive_read_support_compression_all(a)); + archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_memory(a, buff, used2)); for (i = 0; i < 100; i++) { @@ -203,8 +203,8 @@ DEFINE_TEST(test_write_compress_gzip) assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); - r = archive_read_support_compression_gzip(a); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); + r = archive_read_support_filter_gzip(a); if (r == ARCHIVE_WARN) { skipping("gzip reading not fully supported on this platform"); } else { diff --git a/libarchive/test/test_write_compress_lzip.c b/libarchive/test/test_write_compress_lzip.c index e07533dd..7dd8bcf2 100644 --- a/libarchive/test/test_write_compress_lzip.c +++ b/libarchive/test/test_write_compress_lzip.c @@ -85,13 +85,13 @@ DEFINE_TEST(test_write_compress_lzip) assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); - r = archive_read_support_compression_lzip(a); + r = archive_read_support_filter_lzip(a); if (r == ARCHIVE_WARN) { skipping("Can't verify lzip writing by reading back;" " lzip reading not fully supported on this platform"); } else { assertEqualIntA(a, ARCHIVE_OK, - archive_read_support_compression_all(a)); + archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_memory(a, buff, used1)); for (i = 0; i < 100; i++) { @@ -140,12 +140,12 @@ DEFINE_TEST(test_write_compress_lzip) assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); - r = archive_read_support_compression_lzip(a); + r = archive_read_support_filter_lzip(a); if (r == ARCHIVE_WARN) { skipping("lzip reading not fully supported on this platform"); } else { assertEqualIntA(a, ARCHIVE_OK, - archive_read_support_compression_all(a)); + archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_memory(a, buff, used2)); for (i = 0; i < 100; i++) { @@ -194,8 +194,8 @@ DEFINE_TEST(test_write_compress_lzip) assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); - r = archive_read_support_compression_lzip(a); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); + r = archive_read_support_filter_lzip(a); if (r == ARCHIVE_WARN) { skipping("lzip reading not fully supported on this platform"); } else { diff --git a/libarchive/test/test_write_compress_lzma.c b/libarchive/test/test_write_compress_lzma.c index b9653d36..f3b9de36 100644 --- a/libarchive/test/test_write_compress_lzma.c +++ b/libarchive/test/test_write_compress_lzma.c @@ -84,13 +84,13 @@ DEFINE_TEST(test_write_compress_lzma) assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); - r = archive_read_support_compression_lzma(a); + r = archive_read_support_filter_lzma(a); if (r == ARCHIVE_WARN) { skipping("Can't verify lzma writing by reading back;" " lzma reading not fully supported on this platform"); } else { assertEqualIntA(a, ARCHIVE_OK, - archive_read_support_compression_all(a)); + archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_memory(a, buff, used1)); for (i = 0; i < 100; i++) { @@ -139,12 +139,12 @@ DEFINE_TEST(test_write_compress_lzma) assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); - r = archive_read_support_compression_lzma(a); + r = archive_read_support_filter_lzma(a); if (r == ARCHIVE_WARN) { skipping("lzma reading not fully supported on this platform"); } else { assertEqualIntA(a, ARCHIVE_OK, - archive_read_support_compression_all(a)); + archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_memory(a, buff, used2)); for (i = 0; i < 100; i++) { @@ -198,8 +198,8 @@ DEFINE_TEST(test_write_compress_lzma) assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); - r = archive_read_support_compression_lzma(a); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); + r = archive_read_support_filter_lzma(a); if (r == ARCHIVE_WARN) { skipping("lzma reading not fully supported on this platform"); } else { diff --git a/libarchive/test/test_write_compress_program.c b/libarchive/test/test_write_compress_program.c index 304f4051..ba005a68 100644 --- a/libarchive/test/test_write_compress_program.c +++ b/libarchive/test/test_write_compress_program.c @@ -80,8 +80,8 @@ DEFINE_TEST(test_write_compress_program) */ assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); - r = archive_read_support_compression_gzip(a); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); + r = archive_read_support_filter_gzip(a); /* The compression_gzip() handler will fall back to gunzip * automatically, but if we know gunzip isn't available, then * skip the rest. */ diff --git a/libarchive/test/test_write_compress_xz.c b/libarchive/test/test_write_compress_xz.c index 32c81a01..281dbcf5 100644 --- a/libarchive/test/test_write_compress_xz.c +++ b/libarchive/test/test_write_compress_xz.c @@ -84,13 +84,13 @@ DEFINE_TEST(test_write_compress_xz) assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); - r = archive_read_support_compression_xz(a); + r = archive_read_support_filter_xz(a); if (r == ARCHIVE_WARN) { skipping("Can't verify xz writing by reading back;" " xz reading not fully supported on this platform"); } else { assertEqualIntA(a, ARCHIVE_OK, - archive_read_support_compression_all(a)); + archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_memory(a, buff, used1)); for (i = 0; i < 100; i++) { @@ -146,12 +146,12 @@ DEFINE_TEST(test_write_compress_xz) assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); - r = archive_read_support_compression_xz(a); + r = archive_read_support_filter_xz(a); if (r == ARCHIVE_WARN) { skipping("xz reading not fully supported on this platform"); } else { assertEqualIntA(a, ARCHIVE_OK, - archive_read_support_compression_all(a)); + archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_memory(a, buff, used2)); for (i = 0; i < 100; i++) { @@ -204,8 +204,8 @@ DEFINE_TEST(test_write_compress_xz) assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); - r = archive_read_support_compression_xz(a); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); + r = archive_read_support_filter_xz(a); if (r == ARCHIVE_WARN) { skipping("xz reading not fully supported on this platform"); } else { diff --git a/libarchive/test/test_write_format_ar.c b/libarchive/test/test_write_format_ar.c index 6bdbfb2a..1c1b2a71 100644 --- a/libarchive/test/test_write_format_ar.c +++ b/libarchive/test/test_write_format_ar.c @@ -108,7 +108,7 @@ DEFINE_TEST(test_write_format_ar) */ assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_memory(a, buff, used)); assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); @@ -170,7 +170,7 @@ DEFINE_TEST(test_write_format_ar) /* Now, Read the data back */ assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_memory(a, buff, used)); assertEqualIntA(a, 0, archive_read_next_header(a, &ae)); diff --git a/libarchive/test/test_write_format_cpio.c b/libarchive/test/test_write_format_cpio.c index 31b57cb5..b8c1d648 100644 --- a/libarchive/test/test_write_format_cpio.c +++ b/libarchive/test/test_write_format_cpio.c @@ -169,7 +169,7 @@ test_format(int (*set_format)(struct archive *)) */ assert((a = archive_read_new()) != NULL); assertA(0 == archive_read_support_format_all(a)); - assertA(0 == archive_read_support_compression_all(a)); + assertA(0 == archive_read_support_filter_all(a)); assertA(0 == archive_read_open_memory(a, buff, used)); if (!assertEqualIntA(a, 0, archive_read_next_header(a, &ae))) { diff --git a/libarchive/test/test_write_format_gnutar.c b/libarchive/test/test_write_format_gnutar.c index ecae367b..42063e9c 100644 --- a/libarchive/test/test_write_format_gnutar.c +++ b/libarchive/test/test_write_format_gnutar.c @@ -182,7 +182,7 @@ DEFINE_TEST(test_write_format_gnutar) */ assert((a = archive_read_new()) != NULL); assertEqualIntA(a, 0, archive_read_support_format_all(a)); - assertEqualIntA(a, 0, archive_read_support_compression_all(a)); + assertEqualIntA(a, 0, archive_read_support_filter_all(a)); assertEqualIntA(a, 0, archive_read_open_memory(a, buff, used)); /* diff --git a/libarchive/test/test_write_format_iso9660.c b/libarchive/test/test_write_format_iso9660.c index 2be9ed76..02c35c53 100644 --- a/libarchive/test/test_write_format_iso9660.c +++ b/libarchive/test/test_write_format_iso9660.c @@ -192,7 +192,7 @@ DEFINE_TEST(test_write_format_iso9660) */ assert((a = archive_read_new()) != NULL); assertEqualIntA(a, 0, archive_read_support_format_all(a)); - assertEqualIntA(a, 0, archive_read_support_compression_all(a)); + assertEqualIntA(a, 0, archive_read_support_filter_all(a)); assertEqualIntA(a, 0, archive_read_open_memory(a, buff, used)); /* @@ -446,7 +446,7 @@ DEFINE_TEST(test_write_format_iso9660) */ assert((a = archive_read_new()) != NULL); assertEqualIntA(a, 0, archive_read_support_format_all(a)); - assertEqualIntA(a, 0, archive_read_support_compression_all(a)); + assertEqualIntA(a, 0, archive_read_support_filter_all(a)); /* Disable Rockridge extensions support. */ assertEqualInt(ARCHIVE_OK, archive_read_set_option(a, NULL, "rockridge", NULL)); @@ -683,7 +683,7 @@ DEFINE_TEST(test_write_format_iso9660) */ assert((a = archive_read_new()) != NULL); assertEqualIntA(a, 0, archive_read_support_format_all(a)); - assertEqualIntA(a, 0, archive_read_support_compression_all(a)); + assertEqualIntA(a, 0, archive_read_support_filter_all(a)); /* Disable Rockridge and Joliet extensions support. */ assertEqualInt(ARCHIVE_OK, archive_read_set_option(a, NULL, "rockridge", NULL)); diff --git a/libarchive/test/test_write_format_iso9660_boot.c b/libarchive/test/test_write_format_iso9660_boot.c index 8c738f3a..d3f8ab0e 100644 --- a/libarchive/test/test_write_format_iso9660_boot.c +++ b/libarchive/test/test_write_format_iso9660_boot.c @@ -208,7 +208,7 @@ _test_write_format_iso9660_boot(int write_info_tbl) */ assert((a = archive_read_new()) != NULL); assertEqualIntA(a, 0, archive_read_support_format_all(a)); - assertEqualIntA(a, 0, archive_read_support_compression_all(a)); + assertEqualIntA(a, 0, archive_read_support_filter_all(a)); assertEqualIntA(a, 0, archive_read_open_memory(a, buff, used)); /* diff --git a/libarchive/test/test_write_format_iso9660_empty.c b/libarchive/test/test_write_format_iso9660_empty.c index 06e92640..c302c555 100644 --- a/libarchive/test/test_write_format_iso9660_empty.c +++ b/libarchive/test/test_write_format_iso9660_empty.c @@ -117,7 +117,7 @@ DEFINE_TEST(test_write_format_iso9660_empty) */ assert((a = archive_read_new()) != NULL); assertEqualIntA(a, 0, archive_read_support_format_all(a)); - assertEqualIntA(a, 0, archive_read_support_compression_all(a)); + assertEqualIntA(a, 0, archive_read_support_filter_all(a)); assertEqualIntA(a, 0, archive_read_open_memory(a, buff, used)); /* diff --git a/libarchive/test/test_write_format_iso9660_filename.c b/libarchive/test/test_write_format_iso9660_filename.c index 9f1338e9..337233e5 100644 --- a/libarchive/test/test_write_format_iso9660_filename.c +++ b/libarchive/test/test_write_format_iso9660_filename.c @@ -149,7 +149,7 @@ verify(unsigned char *buff, size_t used, enum vtype type, struct fns *fns) */ assert((a = archive_read_new()) != NULL); assertEqualIntA(a, 0, archive_read_support_format_all(a)); - assertEqualIntA(a, 0, archive_read_support_compression_all(a)); + assertEqualIntA(a, 0, archive_read_support_filter_all(a)); if (type >= 1) assertA(0 == archive_read_set_option(a, NULL, "rockridge", NULL)); diff --git a/libarchive/test/test_write_format_iso9660_zisofs.c b/libarchive/test/test_write_format_iso9660_zisofs.c index dd1e86a9..5ab23bbf 100644 --- a/libarchive/test/test_write_format_iso9660_zisofs.c +++ b/libarchive/test/test_write_format_iso9660_zisofs.c @@ -200,7 +200,7 @@ DEFINE_TEST(test_write_format_iso9660_zisofs) */ assert((a = archive_read_new()) != NULL); assertEqualIntA(a, 0, archive_read_support_format_all(a)); - assertEqualIntA(a, 0, archive_read_support_compression_all(a)); + assertEqualIntA(a, 0, archive_read_support_filter_all(a)); assertEqualIntA(a, 0, archive_read_open_memory(a, buff, used)); /* diff --git a/libarchive/test/test_write_format_mtree.c b/libarchive/test/test_write_format_mtree.c index 57159dc0..ee436d08 100644 --- a/libarchive/test/test_write_format_mtree.c +++ b/libarchive/test/test_write_format_mtree.c @@ -116,7 +116,7 @@ test_write_format_mtree_sub(int use_set, int dironly) */ assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_memory(a, buff, used)); /* Read entries */ diff --git a/libarchive/test/test_write_format_mtree_fflags.c b/libarchive/test/test_write_format_mtree_fflags.c index 2998a9bc..18689fe8 100644 --- a/libarchive/test/test_write_format_mtree_fflags.c +++ b/libarchive/test/test_write_format_mtree_fflags.c @@ -102,7 +102,7 @@ test_write_format_mtree_sub(int use_set) */ assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); - assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_memory(a, buff, used)); /* Read entries */ diff --git a/libarchive/test/test_write_format_pax.c b/libarchive/test/test_write_format_pax.c index 78c27ccf..21517188 100644 --- a/libarchive/test/test_write_format_pax.c +++ b/libarchive/test/test_write_format_pax.c @@ -115,7 +115,7 @@ DEFINE_TEST(test_write_format_pax) */ assert((a = archive_read_new()) != NULL); assertEqualIntA(a, 0, archive_read_support_format_all(a)); - assertEqualIntA(a, 0, archive_read_support_compression_all(a)); + assertEqualIntA(a, 0, archive_read_support_filter_all(a)); assertEqualIntA(a, 0, archive_read_open_memory(a, buff, used)); /* diff --git a/libarchive/test/test_write_format_tar.c b/libarchive/test/test_write_format_tar.c index 57fee78f..81aeab64 100644 --- a/libarchive/test/test_write_format_tar.c +++ b/libarchive/test/test_write_format_tar.c @@ -91,7 +91,7 @@ DEFINE_TEST(test_write_format_tar) assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); assertEqualIntA(a, ARCHIVE_OK, - archive_read_support_compression_all(a)); + archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_memory(a, buff, used)); diff --git a/libarchive/test/test_write_format_xar.c b/libarchive/test/test_write_format_xar.c index ff58beac..d1dd8e31 100644 --- a/libarchive/test/test_write_format_xar.c +++ b/libarchive/test/test_write_format_xar.c @@ -165,7 +165,7 @@ test_xar(const char *option) */ assert((a = archive_read_new()) != NULL); assertEqualIntA(a, 0, archive_read_support_format_all(a)); - assertEqualIntA(a, 0, archive_read_support_compression_all(a)); + assertEqualIntA(a, 0, archive_read_support_filter_all(a)); assertEqualIntA(a, 0, archive_read_open_memory(a, buff, used)); /* diff --git a/libarchive/test/test_write_format_zip.c b/libarchive/test/test_write_format_zip.c index ba45a42d..e4a54003 100644 --- a/libarchive/test/test_write_format_zip.c +++ b/libarchive/test/test_write_format_zip.c @@ -120,7 +120,7 @@ DEFINE_TEST(test_write_format_zip) assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); assertEqualIntA(a, ARCHIVE_OK, - archive_read_support_compression_all(a)); + archive_read_support_filter_all(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_memory(a, buff, used)); |