From: Tim Kientzle <kientzle@gmail.com>
Date: Wed, 17 Aug 2011 06:06:45 +0000 (-0400)
Subject: Fix screw-up with r3624.  Thanks to Michihiro for pointing it out.
X-Git-Tag: v3.0.0a~110
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf2a30317450df198afa041e3f0986dc6dbfab99;p=thirdparty%2Flibarchive.git

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 3170f452c..35466a59b 100644
--- 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 f0286fcbc..c0fc475df 100644
--- 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 76b6e8f09..8776b7a9a 100644
--- 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 4702b5e0c..95e5cfdb1 100644
--- 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 df82a9281..a4bb0d0fa 100644
--- 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 34c0b1447..bcb7755de 100644
--- 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 4a3dd9d24..e20b98bff 100644
--- 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;