Permalink
Browse files

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

SVN-Revision: 3635
  • Loading branch information...
1 parent 2a3d2aa commit cf2a30317450df198afa041e3f0986dc6dbfab99 @kientzle kientzle committed Aug 17, 2011
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;

0 comments on commit cf2a303

Please sign in to comment.