diff options
author | Roman Neuhauser <neuhauser@sigpipe.cz> | 2011-03-28 19:18:00 -0400 |
---|---|---|
committer | Roman Neuhauser <neuhauser@sigpipe.cz> | 2011-03-28 19:18:00 -0400 |
commit | a58aaa4fb025ab4562fd27dcba22609ad4e6525f (patch) | |
tree | ef817aa16950d07e5e80576858777ca06d94d50f /libarchive/archive_read_support_filter_all.c | |
parent | 77fc5b1e0e5be5aab8b540965cf63dae8b915260 (diff) | |
download | libarchive-a58aaa4fb025ab4562fd27dcba22609ad4e6525f.tar.gz |
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
Diffstat (limited to 'libarchive/archive_read_support_filter_all.c')
-rw-r--r-- | libarchive/archive_read_support_filter_all.c | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/libarchive/archive_read_support_filter_all.c b/libarchive/archive_read_support_filter_all.c index 685fc894..01eba82e 100644 --- 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 |