The old "compression" terminology will be retired in libarchive 4.0.

Make this automatic and document it correctly.

SVN-Revision: 3624

diff --git a/libarchive/archive_read_support_filter_all.c b/libarchive/archive_read_support_filter_all.c
index 98f019aa7bcee296007942ec46912802e6ffe1be..733d8629843455d14501786d7f259e7a026ac54c 100644 (file)
--- a/libarchive/archive_read_support_filter_all.c
+++ b/libarchive/archive_read_support_filter_all.c
@@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$");
 #include "archive_private.h"
 
 #if ARCHIVE_VERSION_NUMBER < 4000000
+/* Deprecated; remove in libarchive 4.0 */
 int
 archive_read_support_compression_all(struct archive *a)
 {

diff --git a/libarchive/archive_read_support_filter_bzip2.c b/libarchive/archive_read_support_filter_bzip2.c
index 35f66d8b444203809fc2f3395eb738a73434d4b3..3170f452c83fa6c3d281e6e466d2addbde39ddf0 100644 (file)
--- a/libarchive/archive_read_support_filter_bzip2.c
+++ b/libarchive/archive_read_support_filter_bzip2.c
@@ -72,18 +72,17 @@ static int  bzip2_reader_bid(struct archive_read_filter_bidder *, struct archive_
 static int     bzip2_reader_init(struct archive_read_filter *);
 static int     bzip2_reader_free(struct archive_read_filter_bidder *);
 
-#if ARCHIVE_VERSION_NUMBER >= 4000000
-#warning archive_read_support_compression_bzip2
-#endif
-
+#if ARCHIVE_VERSION_NUMBER < 4000000
+/* Deprecated; remove in libarchive 4.0 */
 int
-archive_read_support_filter_bzip2(struct archive *a)
+archive_read_support_compression_bzip2(struct archive *a)
 {
        return archive_read_support_compression_bzip2(a);
 }
+#endif
 
 int
-archive_read_support_compression_bzip2(struct archive *_a)
+archive_read_support_filter_bzip2(struct archive *_a)
 {
        struct archive_read *a = (struct archive_read *)_a;
        struct archive_read_filter_bidder *reader;

diff --git a/libarchive/archive_read_support_filter_compress.c b/libarchive/archive_read_support_filter_compress.c
index aafd7f27108877d41f3e0d7ec2c6f475cbccb6c8..f0286fcbc54a487e239607ef00df8fdfcd6234a6 100644 (file)
--- a/libarchive/archive_read_support_filter_compress.c
+++ b/libarchive/archive_read_support_filter_compress.c
@@ -141,18 +141,17 @@ static int        compress_filter_close(struct archive_read_filter *);
 static int     getbits(struct archive_read_filter *, int n);
 static int     next_code(struct archive_read_filter *);
 
-#if ARCHIVE_VERSION_NUMBER >= 4000000
-#warning archive_read_support_compression_compress
-#endif
-
+#if ARCHIVE_VERSION_NUMBER < 4000000
+/* Deprecated; remove in libarchive 4.0 */
 int
-archive_read_support_filter_compress(struct archive *a)
+archive_read_support_compression_compress(struct archive *a)
 {
        return archive_read_support_compression_compress(a);
 }
+#endif
 
 int
-archive_read_support_compression_compress(struct archive *_a)
+archive_read_support_filter_compress(struct archive *_a)
 {
        struct archive_read *a = (struct archive_read *)_a;
        struct archive_read_filter_bidder *bidder;

diff --git a/libarchive/archive_read_support_filter_gzip.c b/libarchive/archive_read_support_filter_gzip.c
index c66280425b194ee0eebcabf297b4750871ba01ba..76b6e8f0920deffec15b1df1cb7d4ce5b1f2b009 100644 (file)
--- a/libarchive/archive_read_support_filter_gzip.c
+++ b/libarchive/archive_read_support_filter_gzip.c
@@ -78,18 +78,17 @@ static int  gzip_bidder_bid(struct archive_read_filter_bidder *,
                    struct archive_read_filter *);
 static int     gzip_bidder_init(struct archive_read_filter *);
 
-#if ARCHIVE_VERSION_NUMBER >= 4000000
-#warning archive_read_support_compression_gzip
-#endif
-
+#if ARCHIVE_VERSION_NUMBER < 4000000
+/* Deprecated; remove in libarchive 4.0 */
 int
-archive_read_support_filter_gzip(struct archive *a)
+archive_read_support_compression_gzip(struct archive *a)
 {
        return archive_read_support_compression_gzip(a);
 }
+#endif
 
 int
-archive_read_support_compression_gzip(struct archive *_a)
+archive_read_support_filter_gzip(struct archive *_a)
 {
        struct archive_read *a = (struct archive_read *)_a;
        struct archive_read_filter_bidder *bidder;

diff --git a/libarchive/archive_read_support_filter_none.c b/libarchive/archive_read_support_filter_none.c
index 92ddf25c225f256ebd2430fbe96a8a76055b3569..4702b5e0cdbddd10161f4db07b29b1beaa189b1b 100644 (file)
--- a/libarchive/archive_read_support_filter_none.c
+++ b/libarchive/archive_read_support_filter_none.c
@@ -29,22 +29,21 @@ __FBSDID("$FreeBSD$");
 #include "archive.h"
 #include "archive_private.h"
 
-#if ARCHIVE_VERSION_NUMBER >= 4000000
-#warning archive_read_support_compression_none
-#endif
-
+#if ARCHIVE_VERSION_NUMBER < 4000000
+/* Deprecated; remove in libarchive 4.0 */
 int
-archive_read_support_filter_none(struct archive *a)
+archive_read_support_compression_none(struct archive *a)
 {
        return archive_read_support_compression_none(a);
 }
+#endif
 
 /*
  * Uncompressed streams are handled implicitly by the read core,
  * so this is now a no-op.
  */
 int
-archive_read_support_compression_none(struct archive *a)
+archive_read_support_filter_none(struct archive *a)
 {
        archive_check_magic(a, ARCHIVE_READ_MAGIC,
            ARCHIVE_STATE_NEW, "archive_read_support_filter_none");

diff --git a/libarchive/archive_read_support_filter_program.c b/libarchive/archive_read_support_filter_program.c
index 1a9089cdf28feb0da7a1a4a3a71a887953ea744f..b05eb03424d727a6e0561c3f89f8c555a176347c 100644 (file)
--- a/libarchive/archive_read_support_filter_program.c
+++ b/libarchive/archive_read_support_filter_program.c
@@ -55,29 +55,28 @@ __FBSDID("$FreeBSD$");
 #include "archive_private.h"
 #include "archive_read_private.h"
 
-#if ARCHIVE_VERSION_NUMBER >= 4000000
-#warning archive_read_support_compression_program
-#endif
 
+#if ARCHIVE_VERSION_NUMBER < 4000000
+/* Deprecated; remove in libarchive 4.0 */
 int
-archive_read_support_filter_program(struct archive *a, const char *cmd)
+archive_read_support_compression_program(struct archive *a, const char *cmd)
 {
-       return archive_read_support_compression_program(a, cmd);
+       return archive_read_support_filter_program(a, cmd);
 }
 
 int
-archive_read_support_filter_program_signature(struct archive *a,
+archive_read_support_compression_program_signature(struct archive *a,
     const char *cmd, const void *signature, size_t signature_len)
 {
-       return archive_read_support_compression_program_signature(a,
+       return archive_read_support_filter_program_signature(a,
            cmd, signature, signature_len);
 }
-
+#endif
 
 int
-archive_read_support_compression_program(struct archive *a, const char *cmd)
+archive_read_support_filter_program(struct archive *a, const char *cmd)
 {
-       return (archive_read_support_compression_program_signature(a, cmd, NULL, 0));
+       return (archive_read_support_filter_program_signature(a, cmd, NULL, 0));
 }
 
 
@@ -90,7 +89,7 @@ archive_read_support_compression_program(struct archive *a, const char *cmd)
  * this function is actually invoked.
  */
 int
-archive_read_support_compression_program_signature(struct archive *_a,
+archive_read_support_filter_program_signature(struct archive *_a,
     const char *cmd, const void *signature, size_t signature_len)
 {
        (void)_a; /* UNUSED */
@@ -154,7 +153,7 @@ static ssize_t      program_filter_read(struct archive_read_filter *,
 static int     program_filter_close(struct archive_read_filter *);
 
 int
-archive_read_support_compression_program_signature(struct archive *_a,
+archive_read_support_filter_program_signature(struct archive *_a,
     const char *cmd, const void *signature, size_t signature_len)
 {
        struct archive_read *a = (struct archive_read *)_a;

diff --git a/libarchive/archive_read_support_filter_rpm.c b/libarchive/archive_read_support_filter_rpm.c
index 6d249ef1f85234cc99682a7d48f527e8f5ecad26..df82a92819b3b80e712ec7e9a2be82962acce807 100644 (file)
--- a/libarchive/archive_read_support_filter_rpm.c
+++ b/libarchive/archive_read_support_filter_rpm.c
@@ -63,18 +63,17 @@ static ssize_t      rpm_filter_read(struct archive_read_filter *,
                    const void **);
 static int     rpm_filter_close(struct archive_read_filter *);
 
-#if ARCHIVE_VERSION_NUMBER >= 4000000
-#warning archive_read_support_compression_rpm
-#endif
-
+#if ARCHIVE_VERSION_NUMBER < 4000000
+/* Deprecated; remove in libarchive 4.0 */
 int
-archive_read_support_filter_rpm(struct archive *a)
+archive_read_support_compression_rpm(struct archive *a)
 {
        return archive_read_support_compression_rpm(a);
 }
+#endif
 
 int
-archive_read_support_compression_rpm(struct archive *_a)
+archive_read_support_filter_rpm(struct archive *_a)
 {
        struct archive_read *a = (struct archive_read *)_a;
        struct archive_read_filter_bidder *bidder;

diff --git a/libarchive/archive_read_support_filter_uu.c b/libarchive/archive_read_support_filter_uu.c
index b5cb8edf3c7e6a9538a3a2bcc03d9845100057d5..34c0b1447bce879fe6808c7bf1c0820c2ff529dc 100644 (file)
--- a/libarchive/archive_read_support_filter_uu.c
+++ b/libarchive/archive_read_support_filter_uu.c
@@ -66,18 +66,17 @@ static ssize_t      uudecode_filter_read(struct archive_read_filter *,
                    const void **);
 static int     uudecode_filter_close(struct archive_read_filter *);
 
-#if ARCHIVE_VERSION_NUMBER >= 4000000
-#warning archive_read_support_compression_uu
-#endif
-
+#if ARCHIVE_VERSION_NUMBER < 4000000
+/* Deprecated; remove in libarchive 4.0 */
 int
-archive_read_support_filter_uu(struct archive *a)
+archive_read_support_compression_uu(struct archive *a)
 {
        return archive_read_support_compression_uu(a);
 }
+#endif
 
 int
-archive_read_support_compression_uu(struct archive *_a)
+archive_read_support_filter_uu(struct archive *_a)
 {
        struct archive_read *a = (struct archive_read *)_a;
        struct archive_read_filter_bidder *bidder;

diff --git a/libarchive/archive_read_support_filter_xz.c b/libarchive/archive_read_support_filter_xz.c
index 929b5968bbd04be1c937daee440b72428d2b4bf0..4a3dd9d247830634b74fcd9728fd472e25edbdb7 100644 (file)
--- a/libarchive/archive_read_support_filter_xz.c
+++ b/libarchive/archive_read_support_filter_xz.c
@@ -114,18 +114,17 @@ static int        lzip_bidder_bid(struct archive_read_filter_bidder *,
                    struct archive_read_filter *);
 static int     lzip_bidder_init(struct archive_read_filter *);
 
-#if ARCHIVE_VERSION_NUMBER >= 4000000
-#warning archive_read_support_compression_xz
-#endif
-
+#if ARCHIVE_VERSION_NUMBER < 4000000
+/* Deprecated; remove in libarchive 4.0 */
 int
-archive_read_support_filter_xz(struct archive *a)
+archive_read_support_compression_xz(struct archive *a)
 {
        return archive_read_support_compression_xz(a);
 }
+#endif
 
 int
-archive_read_support_compression_xz(struct archive *_a)
+archive_read_support_filter_xz(struct archive *_a)
 {
        struct archive_read *a = (struct archive_read *)_a;
        struct archive_read_filter_bidder *bidder;