From c130c25fee1b22e607cccddd2a9df5d3de27cd4e Mon Sep 17 00:00:00 2001 From: Stoiko Ivanov Date: Wed, 2 Jun 2021 06:30:32 +0000 Subject: [PATCH] fix deprecation warnings libarchive has deprecated a few functions in version 3.x.y and will remove them in 4.0 - change to the new ones and provide wrappers for those used by pmg-api Signed-off-by: Stoiko Ivanov --- LibArchive/LibArchive.xs | 42 +++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/LibArchive/LibArchive.xs b/LibArchive/LibArchive.xs index 36ceb53..1032502 100644 --- a/LibArchive/LibArchive.xs +++ b/LibArchive/LibArchive.xs @@ -19,12 +19,14 @@ archive_clear_error(arg0) struct archive * arg0 int -archive_compression(arg0) +archive_filter_code(arg0, num) struct archive * arg0 + int num const char * -archive_compression_name(arg0) +archive_filter_name(arg0, num) struct archive * arg0 + int num int archive_errno(arg0) @@ -68,9 +70,19 @@ archive_read_extract(arg0, arg1, flags) struct archive_entry * arg1 int flags +int +archive_read_free(arg0) + struct archive * arg0 + +# archive_read_finish is deprecated in favor of archive_read_free +# can be dropped after changing all call-sites int archive_read_finish(arg0) struct archive * arg0 + CODE: + RETVAL = archive_read_free(arg0); + OUTPUT: + RETVAL struct archive * archive_read_new() @@ -97,40 +109,44 @@ archive_read_open_fd(arg0, _fd, _block_size) int _fd size_t _block_size -int -archive_read_open_file(arg0, _filename, _block_size) - struct archive * arg0 - const char * _filename - size_t _block_size - int archive_read_open_filename(arg0, _filename, _block_size) struct archive * arg0 const char * _filename size_t _block_size +int +archive_read_support_filter_all(arg0) + struct archive * arg0 + +# archive_read_finish is deprecated in favor of archive_read_support_filter_all +# can be dropped after changing all call-sites int archive_read_support_compression_all(arg0) struct archive * arg0 + CODE: + RETVAL = archive_read_support_filter_all(arg0); + OUTPUT: + RETVAL int -archive_read_support_compression_bzip2(arg0) +archive_read_support_filter_bzip2(arg0) struct archive * arg0 int -archive_read_support_compression_compress(arg0) +archive_read_support_filter_compress(arg0) struct archive * arg0 int -archive_read_support_compression_gzip(arg0) +archive_read_support_filter_gzip(arg0) struct archive * arg0 int -archive_read_support_compression_none(arg0) +archive_read_support_filter_none(arg0) struct archive * arg0 int -archive_read_support_compression_program(arg0, command) +archive_read_support_filter_program(arg0, command) struct archive * arg0 const char * command