archive_read_support_compression_*() -> archive_read_support_filter_*()

maintain BC aliases (ARCHIVE_VERSION_NUMBER < 4000000).  if fact,
the new names are wrappers around the old ones as i want to switch
the tests to the new names and have the old names still tested.

the wrappers revealed a mismatch between
archive_read_support_compression_program_signature declaration in
archive.h and its definition (const void* vs void*), i'm going with
const void*.

SVN-Revision: 3113

diff --git a/libarchive/archive.h b/libarchive/archive.h
index 279c25d52cbde64a7dc0888d83c1908fb449e957..8879f8664eb9e5c98b65bb31d5416231988ffe4f 100644 (file)
--- a/libarchive/archive.h
+++ b/libarchive/archive.h
@@ -326,9 +326,8 @@ __LA_DECL struct archive    *archive_read_new(void);
  * support_compression_bzip2().  The "all" functions provide the
  * obvious shorthand.
  */
-/* TODO: Rename 'compression' here to 'filter' for libarchive 3.0, deprecate
- * the old names. */
 
+#if ARCHIVE_VERSION_NUMBER < 4000000
 __LA_DECL int archive_read_support_compression_all(struct archive *);
 __LA_DECL int archive_read_support_compression_bzip2(struct archive *);
 __LA_DECL int archive_read_support_compression_compress(struct archive *);
@@ -345,6 +344,24 @@ __LA_DECL int archive_read_support_compression_program_signature
 __LA_DECL int archive_read_support_compression_rpm(struct archive *);
 __LA_DECL int archive_read_support_compression_uu(struct archive *);
 __LA_DECL int archive_read_support_compression_xz(struct archive *);
+#endif
+
+__LA_DECL int archive_read_support_filter_all(struct archive *);
+__LA_DECL int archive_read_support_filter_bzip2(struct archive *);
+__LA_DECL int archive_read_support_filter_compress(struct archive *);
+__LA_DECL int archive_read_support_filter_gzip(struct archive *);
+__LA_DECL int archive_read_support_filter_lzip(struct archive *);
+__LA_DECL int archive_read_support_filter_lzma(struct archive *);
+__LA_DECL int archive_read_support_filter_none(struct archive *);
+__LA_DECL int archive_read_support_filter_program(struct archive *,
+                    const char *command);
+__LA_DECL int archive_read_support_filter_program_signature
+               (struct archive *, const char *,
+                                   const void * /* match */, size_t);
+
+__LA_DECL int archive_read_support_filter_rpm(struct archive *);
+__LA_DECL int archive_read_support_filter_uu(struct archive *);
+__LA_DECL int archive_read_support_filter_xz(struct archive *);
 
 __LA_DECL int archive_read_support_format_all(struct archive *);
 __LA_DECL int archive_read_support_format_ar(struct archive *);

diff --git a/libarchive/archive_read_support_filter_all.c b/libarchive/archive_read_support_filter_all.c
index 685fc8948a9270fcfd47248a5d9539d0ecc2513c..01eba82e7c7c9ab12874b5e6edee4a90e39fc169 100644 (file)
--- a/libarchive/archive_read_support_filter_all.c
+++ b/libarchive/archive_read_support_filter_all.c
@@ -28,28 +28,38 @@ __FBSDID("$FreeBSD$");
 
 #include "archive.h"
 
+#if ARCHIVE_VERSION_NUMBER >= 4000000
+#warning archive_read_support_compression_all
+#endif
+
+int
+archive_read_support_filter_all(struct archive *a)
+{
+       return archive_read_support_compression_all(a);
+}
+
 int
 archive_read_support_compression_all(struct archive *a)
 {
        /* Bzip falls back to "bunzip2" command-line */
-       archive_read_support_compression_bzip2(a);
+       archive_read_support_filter_bzip2(a);
        /* The decompress code doesn't use an outside library. */
-       archive_read_support_compression_compress(a);
+       archive_read_support_filter_compress(a);
        /* Gzip decompress falls back to "gunzip" command-line. */
-       archive_read_support_compression_gzip(a);
+       archive_read_support_filter_gzip(a);
        /* Lzip falls back to "unlzip" command-line program. */
-       archive_read_support_compression_lzip(a);
+       archive_read_support_filter_lzip(a);
        /* The LZMA file format has a very weak signature, so it
         * may not be feasible to keep this here, but we'll try.
         * This will come back out if there are problems. */
        /* Lzma falls back to "unlzma" command-line program. */
-       archive_read_support_compression_lzma(a);
+       archive_read_support_filter_lzma(a);
        /* Xz falls back to "unxz" command-line program. */
-       archive_read_support_compression_xz(a);
+       archive_read_support_filter_xz(a);
        /* The decode code doesn't use an outside library. */
-       archive_read_support_compression_uu(a);
+       archive_read_support_filter_uu(a);
        /* The decode code doesn't use an outside library. */
-       archive_read_support_compression_rpm(a);
+       archive_read_support_filter_rpm(a);
 
        /* Note: We always return ARCHIVE_OK here, even if some of the
         * above return ARCHIVE_WARN.  The intent here is to enable

diff --git a/libarchive/archive_read_support_filter_bzip2.c b/libarchive/archive_read_support_filter_bzip2.c
index 4c71c0bbee69ceae03e13a31010dcaa9ad451d69..6a068469b0821ff9bb24c5aa79945bba6fafecbc 100644 (file)
--- a/libarchive/archive_read_support_filter_bzip2.c
+++ b/libarchive/archive_read_support_filter_bzip2.c
@@ -72,6 +72,16 @@ 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
+
+int
+archive_read_support_filter_bzip2(struct archive *a)
+{
+       return archive_read_support_compression_bzip2(a);
+}
+
 int
 archive_read_support_compression_bzip2(struct archive *_a)
 {

diff --git a/libarchive/archive_read_support_filter_compress.c b/libarchive/archive_read_support_filter_compress.c
index b0967c4c962def4cfbc244a47c443a65612ede7e..902912d143b65dff986ab41c30772f26f566c8b6 100644 (file)
--- a/libarchive/archive_read_support_filter_compress.c
+++ b/libarchive/archive_read_support_filter_compress.c
@@ -141,6 +141,16 @@ 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
+
+int
+archive_read_support_filter_compress(struct archive *a)
+{
+       return archive_read_support_compression_compress(a);
+}
+
 int
 archive_read_support_compression_compress(struct archive *_a)
 {

diff --git a/libarchive/archive_read_support_filter_gzip.c b/libarchive/archive_read_support_filter_gzip.c
index cc67a98c9fb0fe6d75d309795968410df474fd53..74af48200992daaaee0cad58303ce1aaf54852a7 100644 (file)
--- a/libarchive/archive_read_support_filter_gzip.c
+++ b/libarchive/archive_read_support_filter_gzip.c
@@ -78,6 +78,16 @@ 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
+
+int
+archive_read_support_filter_gzip(struct archive *a)
+{
+       return archive_read_support_compression_gzip(a);
+}
+
 int
 archive_read_support_compression_gzip(struct archive *_a)
 {

diff --git a/libarchive/archive_read_support_filter_none.c b/libarchive/archive_read_support_filter_none.c
index e05614f9699c43519e771df97a42a7ddeba1b65c..9530ccb771cbeaf31b5476d07457238612fe04af 100644 (file)
--- a/libarchive/archive_read_support_filter_none.c
+++ b/libarchive/archive_read_support_filter_none.c
@@ -28,6 +28,16 @@ __FBSDID("$FreeBSD$");
 
 #include "archive.h"
 
+#if ARCHIVE_VERSION_NUMBER >= 4000000
+#warning archive_read_support_compression_none
+#endif
+
+int
+archive_read_support_filter_none(struct archive *a)
+{
+       return archive_read_support_compression_none(a);
+}
+
 /*
  * Uncompressed streams are handled implicitly by the read core,
  * so this is now a no-op.

diff --git a/libarchive/archive_read_support_filter_program.c b/libarchive/archive_read_support_filter_program.c
index 676c99ff9ff333d020c3aafc48d4e6f1b00e9d0a..a7799726443ccddc545f3862acf9581bb22645c5 100644 (file)
--- a/libarchive/archive_read_support_filter_program.c
+++ b/libarchive/archive_read_support_filter_program.c
@@ -55,6 +55,25 @@ __FBSDID("$FreeBSD$");
 #include "archive_private.h"
 #include "archive_read_private.h"
 
+#if ARCHIVE_VERSION_NUMBER >= 4000000
+#warning archive_read_support_compression_program
+#endif
+
+int
+archive_read_support_filter_program(struct archive *a, const char *cmd)
+{
+       return archive_read_support_compression_program(a, cmd);
+}
+
+int
+archive_read_support_filter_program_signature(struct archive *a,
+    const char *cmd, const void *signature, size_t signature_len)
+{
+       return archive_read_support_compression_program_signature(a,
+           cmd, signature, signature_len);
+}
+
+
 int
 archive_read_support_compression_program(struct archive *a, const char *cmd)
 {
@@ -72,7 +91,7 @@ archive_read_support_compression_program(struct archive *a, const char *cmd)
  */
 int
 archive_read_support_compression_program_signature(struct archive *_a,
-    const char *cmd, void *signature, size_t signature_len)
+    const char *cmd, const void *signature, size_t signature_len)
 {
        (void)_a; /* UNUSED */
        (void)cmd; /* UNUSED */

diff --git a/libarchive/archive_read_support_filter_rpm.c b/libarchive/archive_read_support_filter_rpm.c
index 051baa5e1229c85d9ac926788cf517e37b9d838d..ddbde5c904f2a5a4f50db1c54461e8bdaa33e09d 100644 (file)
--- a/libarchive/archive_read_support_filter_rpm.c
+++ b/libarchive/archive_read_support_filter_rpm.c
@@ -63,6 +63,16 @@ 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
+
+int
+archive_read_support_filter_rpm(struct archive *a)
+{
+       return archive_read_support_compression_rpm(a);
+}
+
 int
 archive_read_support_compression_rpm(struct archive *_a)
 {

diff --git a/libarchive/archive_read_support_filter_uu.c b/libarchive/archive_read_support_filter_uu.c
index 8e99e15ca67ec46b78c6f8e759735882451337b5..a8babc40bbc806726d7d0da7075542696e35497c 100644 (file)
--- a/libarchive/archive_read_support_filter_uu.c
+++ b/libarchive/archive_read_support_filter_uu.c
@@ -63,6 +63,16 @@ 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
+
+int
+archive_read_support_filter_uu(struct archive *a)
+{
+       return archive_read_support_compression_uu(a);
+}
+
 int
 archive_read_support_compression_uu(struct archive *_a)
 {

diff --git a/libarchive/archive_read_support_filter_xz.c b/libarchive/archive_read_support_filter_xz.c
index f1146f4143a16d3367bac67cb6a4940d963774b2..df53cb391913e8bf4c40034ed164e36c20c9c06a 100644 (file)
--- a/libarchive/archive_read_support_filter_xz.c
+++ b/libarchive/archive_read_support_filter_xz.c
@@ -114,6 +114,16 @@ 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
+
+int
+archive_read_support_filter_xz(struct archive *a)
+{
+       return archive_read_support_compression_xz(a);
+}
+
 int
 archive_read_support_compression_xz(struct archive *_a)
 {
@@ -138,6 +148,16 @@ archive_read_support_compression_xz(struct archive *_a)
 #endif
 }
 
+#if ARCHIVE_VERSION_NUMBER >= 4000000
+#warning archive_read_support_compression_lzma
+#endif
+
+int
+archive_read_support_filter_lzma(struct archive *a)
+{
+       return archive_read_support_compression_lzma(a);
+}
+
 int
 archive_read_support_compression_lzma(struct archive *_a)
 {
@@ -164,6 +184,16 @@ archive_read_support_compression_lzma(struct archive *_a)
 #endif
 }
 
+#if ARCHIVE_VERSION_NUMBER >= 4000000
+#warning archive_read_support_compression_lzip
+#endif
+
+int
+archive_read_support_filter_lzip(struct archive *a)
+{
+       return archive_read_support_compression_lzip(a);
+}
+
 int
 archive_read_support_compression_lzip(struct archive *_a)
 {