emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib: drop libarchive compat macros and use non deprecated functions

Browse Source
This commit is contained in:
Duncan Overbruck
2021-06-25 18:04:15 +02:00
parent fcbd7ef042
commit 2dc22401d5
5 changed files with 13 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
include/xbps_api_impl.h
View File

@ -56,41 +56,6 @@
#define __UNCONST(a) ((void *)(uintptr_t)(const void *)(a))
#endif
/* libarchive compat */
#if ARCHIVE_VERSION_NUMBER >= 3000000
#define archive_read_support_compression_all(x) \
archive_read_support_filter_all(x)
#define archive_read_support_compression_gzip(x) \
archive_read_support_filter_gzip(x)
#define archive_read_support_compression_bzip2(x) \
archive_read_support_filter_bzip2(x)
#define archive_read_support_compression_xz(x) \
archive_read_support_filter_xz(x)
#define archive_write_set_compression_gzip(x) \
archive_write_add_filter_gzip(x)
#define archive_write_set_compression_bzip2(x) \
archive_write_add_filter_bzip2(x)
#define archive_write_set_compression_xz(x) \
archive_write_add_filter_xz(x)
#define archive_read_finish(x) \
archive_read_free(x)
#define archive_write_finish(x) \
archive_write_free(x)
#define archive_compression_name(x) \
archive_filter_name(x, 0)
#endif
#ifndef __arraycount
#define __arraycount(x) (sizeof(x) / sizeof(*x))
#endif