bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove pre libarchive 3.0 code

Browse source 
Pacman has required libarchive 3.0 or later for quite some time mow.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Emil Velikov 2020-12-23 22:43:56 +00:00 • committed by Allan McRae
parent 95ffdd68b2
commit 831fc568fc
1 changed files with 0 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/libalpm/libarchive-compat.h
View file

@ -24,48 +24,28 @@
static inline int _alpm_archive_read_free(struct archive *archive) static inline int _alpm_archive_read_free(struct archive *archive)
{ {
#if ARCHIVE_VERSION_NUMBER >= 3000000
return archive_read_free(archive); return archive_read_free(archive);
#else
return archive_read_finish(archive);
#endif
} }
static inline int64_t _alpm_archive_compressed_ftell(struct archive *archive) static inline int64_t _alpm_archive_compressed_ftell(struct archive *archive)
{ {
#if ARCHIVE_VERSION_NUMBER >= 3000000
return archive_filter_bytes(archive, -1); return archive_filter_bytes(archive, -1);
#else
return archive_position_compressed(archive);
#endif
} }
static inline int _alpm_archive_read_open_file(struct archive *archive, static inline int _alpm_archive_read_open_file(struct archive *archive,
const char *filename, size_t block_size) const char *filename, size_t block_size)
{ {
#if ARCHIVE_VERSION_NUMBER >= 3000000
return archive_read_open_filename(archive, filename, block_size); return archive_read_open_filename(archive, filename, block_size);
#else
return archive_read_open_file(archive, filename, block_size);
#endif
} }
static inline int _alpm_archive_filter_code(struct archive *archive) static inline int _alpm_archive_filter_code(struct archive *archive)
{ {
#if ARCHIVE_VERSION_NUMBER >= 3000000
return archive_filter_code(archive, 0); return archive_filter_code(archive, 0);
#else
return archive_compression(archive);
#endif
} }
static inline int _alpm_archive_read_support_filter_all(struct archive *archive) static inline int _alpm_archive_read_support_filter_all(struct archive *archive)
{ {
#if ARCHIVE_VERSION_NUMBER >= 3000000
return archive_read_support_filter_all(archive); return archive_read_support_filter_all(archive);
#else
return archive_read_support_compression_all(archive);
#endif
} }
#endif /* LIBARCHIVE_COMPAT_H */ #endif /* LIBARCHIVE_COMPAT_H */