Fix screw-up with r3624. Thanks to Michihiro for pointing it out.

SVN-Revision: 3635

diff --git a/libarchive/archive_read_support_filter_bzip2.c b/libarchive/archive_read_support_filter_bzip2.c
index 3170f452c83fa6c3d281e6e466d2addbde39ddf0..35466a59b8516f73e0e6057a891a14770e7d44ef 100644 (file)
--- a/libarchive/archive_read_support_filter_bzip2.c
+++ b/libarchive/archive_read_support_filter_bzip2.c
@@ -77,7 +77,7 @@ static int    bzip2_reader_free(struct archive_read_filter_bidder *);
 int
 archive_read_support_compression_bzip2(struct archive *a)
 {
-       return archive_read_support_compression_bzip2(a);
+       return archive_read_support_filter_bzip2(a);
 }
 #endif
 

diff --git a/libarchive/archive_read_support_filter_compress.c b/libarchive/archive_read_support_filter_compress.c
index f0286fcbc54a487e239607ef00df8fdfcd6234a6..c0fc475dfb463341793b7a0f40422f1177aa0256 100644 (file)
--- a/libarchive/archive_read_support_filter_compress.c
+++ b/libarchive/archive_read_support_filter_compress.c
@@ -146,7 +146,7 @@ static int  next_code(struct archive_read_filter *);
 int
 archive_read_support_compression_compress(struct archive *a)
 {
-       return archive_read_support_compression_compress(a);
+       return archive_read_support_filter_compress(a);
 }
 #endif
 

diff --git a/libarchive/archive_read_support_filter_gzip.c b/libarchive/archive_read_support_filter_gzip.c
index 76b6e8f0920deffec15b1df1cb7d4ce5b1f2b009..8776b7a9a9bc7c725dfafc94569a2ff938301e95 100644 (file)
--- a/libarchive/archive_read_support_filter_gzip.c
+++ b/libarchive/archive_read_support_filter_gzip.c
@@ -83,7 +83,7 @@ static int    gzip_bidder_init(struct archive_read_filter *);
 int
 archive_read_support_compression_gzip(struct archive *a)
 {
-       return archive_read_support_compression_gzip(a);
+       return archive_read_support_filter_gzip(a);
 }
 #endif
 

diff --git a/libarchive/archive_read_support_filter_none.c b/libarchive/archive_read_support_filter_none.c
index 4702b5e0cdbddd10161f4db07b29b1beaa189b1b..95e5cfdb15dc44c82857460d56e895bd758d17e5 100644 (file)
--- a/libarchive/archive_read_support_filter_none.c
+++ b/libarchive/archive_read_support_filter_none.c
@@ -34,7 +34,7 @@ __FBSDID("$FreeBSD$");
 int
 archive_read_support_compression_none(struct archive *a)
 {
-       return archive_read_support_compression_none(a);
+       return archive_read_support_filter_none(a);
 }
 #endif
 

diff --git a/libarchive/archive_read_support_filter_rpm.c b/libarchive/archive_read_support_filter_rpm.c
index df82a92819b3b80e712ec7e9a2be82962acce807..a4bb0d0fa8e72f582a7a04ded50b07ee58a74efb 100644 (file)
--- a/libarchive/archive_read_support_filter_rpm.c
+++ b/libarchive/archive_read_support_filter_rpm.c
@@ -68,7 +68,7 @@ static int    rpm_filter_close(struct archive_read_filter *);
 int
 archive_read_support_compression_rpm(struct archive *a)
 {
-       return archive_read_support_compression_rpm(a);
+       return archive_read_support_filter_rpm(a);
 }
 #endif
 

diff --git a/libarchive/archive_read_support_filter_uu.c b/libarchive/archive_read_support_filter_uu.c
index 34c0b1447bce879fe6808c7bf1c0820c2ff529dc..bcb7755de388d567b8aaa15ff68501e459077e2d 100644 (file)
--- a/libarchive/archive_read_support_filter_uu.c
+++ b/libarchive/archive_read_support_filter_uu.c
@@ -71,7 +71,7 @@ static int    uudecode_filter_close(struct archive_read_filter *);
 int
 archive_read_support_compression_uu(struct archive *a)
 {
-       return archive_read_support_compression_uu(a);
+       return archive_read_support_filter_uu(a);
 }
 #endif
 

diff --git a/libarchive/archive_read_support_filter_xz.c b/libarchive/archive_read_support_filter_xz.c
index 4a3dd9d247830634b74fcd9728fd472e25edbdb7..e20b98bfff18e79df29b9ef81c4017068a9f400d 100644 (file)
--- a/libarchive/archive_read_support_filter_xz.c
+++ b/libarchive/archive_read_support_filter_xz.c
@@ -119,7 +119,7 @@ static int  lzip_bidder_init(struct archive_read_filter *);
 int
 archive_read_support_compression_xz(struct archive *a)
 {
-       return archive_read_support_compression_xz(a);
+       return archive_read_support_filter_xz(a);
 }
 #endif
 
@@ -149,18 +149,16 @@ archive_read_support_filter_xz(struct archive *_a)
 #endif
 }
 
-#if ARCHIVE_VERSION_NUMBER >= 4000000
-#warning archive_read_support_compression_lzma
-#endif
-
+#if ARCHIVE_VERSION_NUMBER < 4000000
 int
-archive_read_support_filter_lzma(struct archive *a)
+archive_read_support_compression_lzma(struct archive *a)
 {
-       return archive_read_support_compression_lzma(a);
+       return archive_read_support_filter_lzma(a);
 }
+#endif
 
 int
-archive_read_support_compression_lzma(struct archive *_a)
+archive_read_support_filter_lzma(struct archive *_a)
 {
        struct archive_read *a = (struct archive_read *)_a;
        struct archive_read_filter_bidder *bidder;
@@ -187,18 +185,17 @@ archive_read_support_compression_lzma(struct archive *_a)
 #endif
 }
 
-#if ARCHIVE_VERSION_NUMBER >= 4000000
-#warning archive_read_support_compression_lzip
-#endif
 
+#if ARCHIVE_VERSION_NUMBER < 4000000
 int
-archive_read_support_filter_lzip(struct archive *a)
+archive_read_support_compression_lzip(struct archive *a)
 {
-       return archive_read_support_compression_lzip(a);
+       return archive_read_support_filter_lzip(a);
 }
+#endif
 
 int
-archive_read_support_compression_lzip(struct archive *_a)
+archive_read_support_filter_lzip(struct archive *_a)
 {
        struct archive_read *a = (struct archive_read *)_a;
        struct archive_read_filter_bidder *bidder;