client and example programs use archive_read_support_filter_*()

the archive_read_support_compression_* -> archive_read_support_filter
change should now be complete.

SVN-Revision: 3115

diff --git a/cpio/cpio.c b/cpio/cpio.c
index 163bdd6c7470aeee74034d448ed5c5477a3fb169..f41ad40181d44353cf8c45bd0061a752f3e24824 100644 (file)
--- a/cpio/cpio.c
+++ b/cpio/cpio.c
@@ -835,7 +835,7 @@ mode_in(struct cpio *cpio)
        a = archive_read_new();
        if (a == NULL)
                lafe_errc(1, 0, "Couldn't allocate archive object");
-       archive_read_support_compression_all(a);
+       archive_read_support_filter_all(a);
        archive_read_support_format_all(a);
 
        if (archive_read_open_file(a, cpio->filename, cpio->bytes_per_block))
@@ -940,7 +940,7 @@ mode_list(struct cpio *cpio)
        a = archive_read_new();
        if (a == NULL)
                lafe_errc(1, 0, "Couldn't allocate archive object");
-       archive_read_support_compression_all(a);
+       archive_read_support_filter_all(a);
        archive_read_support_format_all(a);
 
        if (archive_read_open_file(a, cpio->filename, cpio->bytes_per_block))

diff --git a/examples/minitar/minitar.c b/examples/minitar/minitar.c
index b1575c9bedbece2b49044aa0dfb3b8bd12b9db31..2d6d4208a22acc62ec25a81cecb8ba65b2cb12e9 100644 (file)
--- a/examples/minitar/minitar.c
+++ b/examples/minitar/minitar.c
@@ -342,13 +342,13 @@ extract(const char *filename, int do_extract, int flags)
        ext = archive_write_disk_new();
        archive_write_disk_set_options(ext, flags);
 #ifndef NO_BZIP2_EXTRACT
-       archive_read_support_compression_bzip2(a);
+       archive_read_support_filter_bzip2(a);
 #endif
 #ifndef NO_GZIP_EXTRACT
-       archive_read_support_compression_gzip(a);
+       archive_read_support_filter_gzip(a);
 #endif
 #ifndef NO_COMPRESS_EXTRACT
-       archive_read_support_compression_compress(a);
+       archive_read_support_filter_compress(a);
 #endif
 #ifndef NO_TAR_EXTRACT
        archive_read_support_format_tar(a);

diff --git a/examples/tarfilter.c b/examples/tarfilter.c
index 976dd056e5335fc2263e35e4deac36434b77f1da..0d323e1cb2cb324bba094c4f1c2245f17a497ae4 100644 (file)
--- a/examples/tarfilter.c
+++ b/examples/tarfilter.c
@@ -49,7 +49,7 @@ main(int argc, char **argv)
        ina = archive_read_new();
        if (ina == NULL)
                die("Couldn't create archive reader.");
-       if (archive_read_support_compression_all(ina) != ARCHIVE_OK)
+       if (archive_read_support_filter_all(ina) != ARCHIVE_OK)
                die("Couldn't enable decompression");
        if (archive_read_support_format_all(ina) != ARCHIVE_OK)
                die("Couldn't enable read formats");

diff --git a/tar/read.c b/tar/read.c
index b4bb31d959e582096f318be93a429f7ee3e52f5e..5969ff6b2d9699ad8a76b4d92f778749c11d0b3d 100644 (file)
--- a/tar/read.c
+++ b/tar/read.c
@@ -166,9 +166,9 @@ read_archive(struct bsdtar *bsdtar, char mode, struct archive *writer)
 
        a = archive_read_new();
        if (bsdtar->compress_program != NULL)
-               archive_read_support_compression_program(a, bsdtar->compress_program);
+               archive_read_support_filter_program(a, bsdtar->compress_program);
        else
-               archive_read_support_compression_all(a);
+               archive_read_support_filter_all(a);
        archive_read_support_format_all(a);
        if (ARCHIVE_OK != archive_read_set_options(a, bsdtar->option_options))
                lafe_errc(1, 0, "%s", archive_error_string(a));

diff --git a/tar/write.c b/tar/write.c
index 7806eca83ae4823f2aebdee354bbde1f81873091..f13bc7857b5433403b47d7a371f5e695b79d75ef 100644 (file)
--- a/tar/write.c
+++ b/tar/write.c
@@ -267,7 +267,7 @@ tar_mode_r(struct bsdtar *bsdtar)
                    "Cannot open %s", bsdtar->filename);
 
        a = archive_read_new();
-       archive_read_support_compression_all(a);
+       archive_read_support_filter_all(a);
        archive_read_support_format_tar(a);
        archive_read_support_format_gnutar(a);
        r = archive_read_open_fd(a, bsdtar->fd, 10240);
@@ -357,7 +357,7 @@ tar_mode_u(struct bsdtar *bsdtar)
                    "Cannot open %s", bsdtar->filename);
 
        a = archive_read_new();
-       archive_read_support_compression_all(a);
+       archive_read_support_filter_all(a);
        archive_read_support_format_tar(a);
        archive_read_support_format_gnutar(a);
        if (archive_read_open_fd(a, bsdtar->fd, bsdtar->bytes_per_block)
@@ -560,7 +560,7 @@ append_archive_filename(struct bsdtar *bsdtar, struct archive *a,
 
        ina = archive_read_new();
        archive_read_support_format_all(ina);
-       archive_read_support_compression_all(ina);
+       archive_read_support_filter_all(ina);
        if (archive_read_open_file(ina, filename, bsdtar->bytes_per_block)) {
                lafe_warnc(0, "%s", archive_error_string(ina));
                bsdtar->return_value = 1;