From: Michihiro NAKAJIMA Date: Sun, 7 Oct 2012 04:53:18 +0000 (+0900) Subject: Stop using deprecated functions. Much remains to be replaced. X-Git-Tag: v3.1.0~40^2~87 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ef6dae82df073b6f2bedbcfc58a70e172376391;p=thirdparty%2Flibarchive.git 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 9d9ed358a..2c359914e 100644 --- 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 6ce458e0f..eef8fa1a7 100644 --- 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 662a170e0..12f71e50a 100644 --- 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 039838e98..12cc88b1c 100644 --- 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 c0c47913e..353574484 100644 --- 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 306891807..089435a26 100644 --- 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 44d6c8e6d..be55fd16c 100644 --- 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 d0b2764c5..08d1afc3a 100644 --- 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 9b050f161..b7b83fde9 100644 --- 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 93c63743f..a5b74f4e0 100644 --- 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 afdaf0308..56abfcf57 100644 --- 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 9beebdc11..82abfe416 100644 --- 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 ff09ae44d..b1e5f5e9f 100644 --- 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 5f4fcb8ba..c8f684604 100644 --- 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 2a0a93eff..10afbb609 100644 --- 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 142c8af4c..147761c5b 100644 --- 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 c43e68b06..68d289764 100644 --- 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 366bd7690..d19e33226 100644 --- 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 676ea0aa3..b2af08cfe 100644 --- 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); }