Stop using deprecated functions. Much remains to be replaced.

s/archive_compression_name(/archive_filter_name(/

diff --git a/libarchive/test/test_compat_bzip2.c b/libarchive/test/test_compat_bzip2.c
index 9d9ed358a8b08efc5d6b5548f9aaf031f72e49e4..2c359914ee76b7124e85fa5f6f1d5db14823b654 100644 (file)
--- a/libarchive/test/test_compat_bzip2.c
+++ b/libarchive/test/test_compat_bzip2.c
@@ -68,12 +68,12 @@ compat_bzip2(const char *name)
 
        /* Verify that the format detection worked. */
        assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_BZIP2);
-       assertEqualString(archive_compression_name(a), "bzip2");
+       assertEqualString(archive_filter_name(a, 0), "bzip2");
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
 
        assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
        assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_BZIP2);
-       assertEqualString(archive_compression_name(a), "bzip2");
+       assertEqualString(archive_filter_name(a, 0), "bzip2");
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
 
        assertEqualInt(ARCHIVE_OK, archive_read_free(a));

diff --git a/libarchive/test/test_compat_gzip.c b/libarchive/test/test_compat_gzip.c
index 6ce458e0f7b610db2ebc94315b91d6b270b5c877..eef8fa1a74e0ce084340d560f98c16253062fed1 100644 (file)
--- a/libarchive/test/test_compat_gzip.c
+++ b/libarchive/test/test_compat_gzip.c
@@ -75,7 +75,7 @@ verify(const char *name)
 
        /* Verify that the format detection worked. */
        assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_GZIP);
-       assertEqualString(archive_compression_name(a), "gzip");
+       assertEqualString(archive_filter_name(a, 0), "gzip");
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
 
        assertEqualInt(ARCHIVE_OK, archive_read_close(a));

diff --git a/libarchive/test/test_compat_lrzip.c b/libarchive/test/test_compat_lrzip.c
index 662a170e0d5f8b35a86eeb178224c1a527d29f73..12f71e50a1face15d446b7e63d101fc52043056b 100644 (file)
--- a/libarchive/test/test_compat_lrzip.c
+++ b/libarchive/test/test_compat_lrzip.c
@@ -61,7 +61,7 @@ verify(const char *name)
 
        /* Verify that the format detection worked. */
        assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_LRZIP);
-       assertEqualString(archive_compression_name(a), "lrzip");
+       assertEqualString(archive_filter_name(a, 0), "lrzip");
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_GNUTAR);
 
        assertEqualInt(ARCHIVE_OK, archive_read_close(a));

diff --git a/libarchive/test/test_compat_lzip.c b/libarchive/test/test_compat_lzip.c
index 039838e98b27327492374c6c7f7832f5bf02737f..12cc88b1cbc6eea096fce90facee30c82910497e 100644 (file)
--- a/libarchive/test/test_compat_lzip.c
+++ b/libarchive/test/test_compat_lzip.c
@@ -122,7 +122,7 @@ compat_lzip(const char *name)
 
        /* Verify that the format detection worked. */
        assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_LZIP);
-       assertEqualString(archive_compression_name(a), "lzip");
+       assertEqualString(archive_filter_name(a, 0), "lzip");
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
 
        assertEqualInt(ARCHIVE_OK, archive_read_close(a));

diff --git a/libarchive/test/test_compat_lzma.c b/libarchive/test/test_compat_lzma.c
index c0c47913ec0cfbf690cf40f80f3b6c18d4815dad..3535744842fae9b9814e06875731117ce7f9e264 100644 (file)
--- a/libarchive/test/test_compat_lzma.c
+++ b/libarchive/test/test_compat_lzma.c
@@ -131,7 +131,7 @@ compat_lzma(const char *name)
 
        /* Verify that the format detection worked. */
        assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_LZMA);
-       assertEqualString(archive_compression_name(a), "lzma");
+       assertEqualString(archive_filter_name(a, 0), "lzma");
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
 
        assertEqualInt(ARCHIVE_OK, archive_read_close(a));

diff --git a/libarchive/test/test_compat_xz.c b/libarchive/test/test_compat_xz.c
index 3068918071b3d516050c9a06f42197e1b7affae2..089435a269110a8678da1b24172380b7c693f6c0 100644 (file)
--- a/libarchive/test/test_compat_xz.c
+++ b/libarchive/test/test_compat_xz.c
@@ -70,7 +70,7 @@ compat_xz(const char *name)
 
        /* Verify that the format detection worked. */
        assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_XZ);
-       assertEqualString(archive_compression_name(a), "xz");
+       assertEqualString(archive_filter_name(a, 0), "xz");
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
 
        assertEqualInt(ARCHIVE_OK, archive_read_close(a));

diff --git a/libarchive/test/test_read_filter_uudecode.c b/libarchive/test/test_read_filter_uudecode.c
index 44d6c8e6d4d7994cbec89f0a5001e33f33c832d6..be55fd16cd2567378f0c09dd70e2822aade16043 100644 (file)
--- a/libarchive/test/test_read_filter_uudecode.c
+++ b/libarchive/test/test_read_filter_uudecode.c
@@ -125,9 +125,9 @@ test_read_uu_sub(const char *uudata, size_t uusize, int no_nl)
                    read_open_memory(a, buff, size, 2));
                assertEqualIntA(a, ARCHIVE_OK,
                    archive_read_next_header(a, &ae));
-               failure("archive_compression_name(a)=\"%s\""
+               failure("archive_filter_name(a, 0)=\"%s\""
                    "extra %d, NL %d",
-                   archive_compression_name(a), extra, !no_nl);
+                   archive_filter_name(a, 0), extra, !no_nl);
                assertEqualInt(archive_filter_code(a, 0),
                    ARCHIVE_COMPRESSION_COMPRESS);
                failure("archive_format_name(a)=\"%s\""

diff --git a/libarchive/test/test_read_format_cpio_bin_Z.c b/libarchive/test/test_read_format_cpio_bin_Z.c
index d0b2764c5074f4d13a6d06671d530d9c71b63593..08d1afc3a7f040de3ea823a9899ed2dc37773175 100644 (file)
--- a/libarchive/test/test_read_format_cpio_bin_Z.c
+++ b/libarchive/test/test_read_format_cpio_bin_Z.c
@@ -44,10 +44,10 @@ DEFINE_TEST(test_read_format_cpio_bin_Z)
            archive_read_open_memory(a, archive, sizeof(archive)));
        assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
        assertEqualInt(1, archive_file_count(a));
-       failure("archive_compression_name(a)=\"%s\"",
-           archive_compression_name(a));
+       failure("archive_filter_name(a, 0)=\"%s\"",
+           archive_filter_name(a, 0));
        assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_COMPRESS);
-       assertEqualString(archive_compression_name(a), "compress (.Z)");
+       assertEqualString(archive_filter_name(a, 0), "compress (.Z)");
        failure("archive_format_name(a)=\"%s\"",
            archive_format_name(a));
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_CPIO_BIN_LE);

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 9b050f161320d17430a207289960d531f191a2b3..b7b83fde908b62eeabd90d621826ef2642e6876f 100644 (file)
--- a/libarchive/test/test_read_format_cpio_svr4_bzip2_rpm.c
+++ b/libarchive/test/test_read_format_cpio_svr4_bzip2_rpm.c
@@ -118,7 +118,7 @@ DEFINE_TEST(test_read_format_cpio_svr4_bzip2_rpm)
   
        /* Verify that the format detection worked. */
        assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_BZIP2);
-       assertEqualString(archive_compression_name(a), "bzip2");
+       assertEqualString(archive_filter_name(a, 0), "bzip2");
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_CPIO_SVR4_NOCRC);
  
        assertEqualInt(ARCHIVE_OK, archive_read_close(a));

diff --git a/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.c b/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.c
index 93c63743f4e7f65a4d0414b4e91abb0df345bf14..a5b74f4e009b5bd5469fe7a49082fd20a9a0d8b1 100644 (file)
--- a/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.c
+++ b/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.c
@@ -118,7 +118,7 @@ DEFINE_TEST(test_read_format_cpio_svr4_gzip_rpm)
   
        /* Verify that the format detection worked. */
        assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_GZIP);
-       assertEqualString(archive_compression_name(a), "gzip");
+       assertEqualString(archive_filter_name(a, 0), "gzip");
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_CPIO_SVR4_NOCRC);
  
        assertEqualInt(ARCHIVE_OK, archive_read_close(a));

diff --git a/libarchive/test/test_read_format_cpio_svr4c_Z.c b/libarchive/test/test_read_format_cpio_svr4c_Z.c
index afdaf03082bf59b91c5544c45a10a207bbb14a26..56abfcf57ad684e0fa36fc98666cd4c26db7fca3 100644 (file)
--- a/libarchive/test/test_read_format_cpio_svr4c_Z.c
+++ b/libarchive/test/test_read_format_cpio_svr4c_Z.c
@@ -46,8 +46,8 @@ DEFINE_TEST(test_read_format_cpio_svr4c_Z)
        assertEqualIntA(a, ARCHIVE_OK,
            archive_read_open_memory(a, archive, sizeof(archive)));
        assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
-       failure("archive_compression_name(a)=\"%s\"",
-           archive_compression_name(a));
+       failure("archive_filter_name(a, 0)=\"%s\"",
+           archive_filter_name(a, 0));
        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);

diff --git a/libarchive/test/test_read_format_tar.c b/libarchive/test/test_read_format_tar.c
index 9beebdc110ec1a64e2651ad85b31fe8e4f228dbb..82abfe416bc489597e193caf2efe5e0d588cf1f4 100644 (file)
--- a/libarchive/test/test_read_format_tar.c
+++ b/libarchive/test/test_read_format_tar.c
@@ -71,7 +71,7 @@ static void verifyEmpty(void)
        assertA(0 == archive_read_open_memory(a, archiveEmpty, 512));
        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
        assertEqualInt(archive_filter_code(a, 0), ARCHIVE_COMPRESSION_NONE);
-       assertEqualString(archive_compression_name(a), "none");
+       assertEqualString(archive_filter_name(a, 0), "none");
        failure("512 zero bytes should be recognized as a tar archive.");
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR);
 

diff --git a/libarchive/test/test_read_format_tz.c b/libarchive/test/test_read_format_tz.c
index ff09ae44da99beaf2d6bca8e4d4b801d960d0196..b1e5f5e9f5e952f703abc11e981208334381b2f1 100644 (file)
--- a/libarchive/test/test_read_format_tz.c
+++ b/libarchive/test/test_read_format_tz.c
@@ -46,8 +46,8 @@ DEFINE_TEST(test_read_format_tz)
            archive_read_open_memory(a, archive, sizeof(archive)));
        assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
        assertEqualInt(1, archive_file_count(a));
-       failure("archive_compression_name(a)=\"%s\"",
-           archive_compression_name(a));
+       failure("archive_filter_name(a, 0)=\"%s\"",
+           archive_filter_name(a, 0));
        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);

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

diff --git a/libarchive/test/test_write_compress_gzip.c b/libarchive/test/test_write_compress_gzip.c
index 2a0a93eff2282c0487b2f3338609bea5a7880632..10afbb609ef23465a6682b85610dba056d4ecd3b 100644 (file)
--- a/libarchive/test/test_write_compress_gzip.c
+++ b/libarchive/test/test_write_compress_gzip.c
@@ -64,7 +64,7 @@ DEFINE_TEST(test_write_compress_gzip)
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_set_bytes_per_block(a, 10));
        assertEqualInt(ARCHIVE_COMPRESSION_GZIP, archive_filter_code(a, 0));
-       assertEqualString("gzip", archive_compression_name(a));
+       assertEqualString("gzip", archive_filter_name(a, 0));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_open_memory(a, buff, buffsize, &used1));
        assert((ae = archive_entry_new()) != NULL);
        archive_entry_set_filetype(ae, AE_IFREG);

diff --git a/libarchive/test/test_write_compress_lzip.c b/libarchive/test/test_write_compress_lzip.c
index 142c8af4c0e5792e81fa7fd96c86ef2d8b9158f6..147761c5bfc9c173005636223d8122c92ffb91fe 100644 (file)
--- a/libarchive/test/test_write_compress_lzip.c
+++ b/libarchive/test/test_write_compress_lzip.c
@@ -64,11 +64,11 @@ DEFINE_TEST(test_write_compress_lzip)
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_set_bytes_per_block(a, 10));
        assertEqualInt(ARCHIVE_COMPRESSION_LZIP, archive_filter_code(a, 0));
-       assertEqualString("lzip", archive_compression_name(a));
+       assertEqualString("lzip", archive_filter_name(a, 0));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_open_memory(a, buff, buffsize, &used1));
        assertEqualInt(ARCHIVE_COMPRESSION_LZIP, archive_filter_code(a, 0));
-       assertEqualString("lzip", archive_compression_name(a));
+       assertEqualString("lzip", archive_filter_name(a, 0));
        assert((ae = archive_entry_new()) != NULL);
        archive_entry_set_filetype(ae, AE_IFREG);
        archive_entry_set_size(ae, datasize);

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

diff --git a/libarchive/test/test_write_compress_xz.c b/libarchive/test/test_write_compress_xz.c
index 366bd7690d038b940fe470dd91978fb86431aeb9..d19e33226fe7b2da5bc255eb9041fd5a434c4957 100644 (file)
--- a/libarchive/test/test_write_compress_xz.c
+++ b/libarchive/test/test_write_compress_xz.c
@@ -64,10 +64,10 @@ DEFINE_TEST(test_write_compress_xz)
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_set_bytes_per_block(a, 10));
        assertEqualInt(ARCHIVE_COMPRESSION_XZ, archive_filter_code(a, 0));
-       assertEqualString("xz", archive_compression_name(a));
+       assertEqualString("xz", archive_filter_name(a, 0));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_open_memory(a, buff, buffsize, &used1));
        assertEqualInt(ARCHIVE_COMPRESSION_XZ, archive_filter_code(a, 0));
-       assertEqualString("xz", archive_compression_name(a));
+       assertEqualString("xz", archive_filter_name(a, 0));
        assert((ae = archive_entry_new()) != NULL);
        archive_entry_set_filetype(ae, AE_IFREG);
        archive_entry_set_size(ae, datasize);

diff --git a/tar/read.c b/tar/read.c
index 676ea0aa381b8765d3e5617a1a826373b5d66379..b2af08cfe27a2c6fded0cdb8cc899c1e42c184de 100644 (file)
--- a/tar/read.c
+++ b/tar/read.c
@@ -338,7 +338,7 @@ read_archive(struct bsdtar *bsdtar, char mode, struct archive *writer)
 
        if (bsdtar->verbose > 2)
                fprintf(stdout, "Archive Format: %s,  Compression: %s\n",
-                   archive_format_name(a), archive_compression_name(a));
+                   archive_format_name(a), archive_filter_name(a, 0));
 
        archive_read_free(a);
 }