[vala/wip/tintou/libarchive-v3] libarchive: update handcrafted vapi to libarchive 3.0
- From: Corentin Noël <corentinnoel src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala/wip/tintou/libarchive-v3] libarchive: update handcrafted vapi to libarchive 3.0
- Date: Sun, 8 Apr 2018 20:22:23 +0000 (UTC)
commit c196b005e67d178f05789c13727a10b018d74dc6
Author: Corentin Noël <corentin elementary io>
Date: Sun Apr 8 19:27:31 2018 +0100
libarchive: update handcrafted vapi to libarchive 3.0
vapi/libarchive.vapi | 82 +++++++++++---------------------------------------
1 files changed, 18 insertions(+), 64 deletions(-)
---
diff --git a/vapi/libarchive.vapi b/vapi/libarchive.vapi
index 750e118..2b5db02 100644
--- a/vapi/libarchive.vapi
+++ b/vapi/libarchive.vapi
@@ -1,4 +1,4 @@
-/* libarchive.vapi - Bindings for libarchive(3) (version 2).
+/* libarchive.vapi - Bindings for libarchive(3) (version 3).
*
* Copyright (C) 2009 Julian Andres Klode <jak jak-linux org>
*
@@ -30,11 +30,11 @@ namespace Archive {
public unowned string version_string ();
[CCode (instance_pos = 1.9, cname="archive_read_callback")]
- public delegate ssize_t ReadCallback (Archive archive, out void* buffer);
+ public delegate ssize_t ReadCallback (Archive archive,[CCode (array_length = false)] out uint8[]
buffer);
[CCode (instance_pos = 1.9, cname="archive_skip_callback")]
- public delegate Posix.off_t SkipCallback (Archive archive, Posix.off_t request);
+ public delegate int64 SkipCallback (Archive archive, int64 request);
[CCode (instance_pos = 1.9, cname="archive_write_callback")]
- public delegate ssize_t WriteCallback (Archive archive, void* buffer, size_t length);
+ public delegate ssize_t WriteCallback (Archive archive,[CCode (array_length_type = "size_t")] uint8[]
buffer);
[CCode (instance_pos = 1.9, cname="archive_open_callback")]
public delegate int OpenCallback (Archive archive);
@@ -72,22 +72,6 @@ namespace Archive {
}
[CCode (cname="int", has_type_id = false)]
- [Version (deprecated_since="3.0", replacement="Filter")]
- public enum Compression {
- NONE,
- GZIP,
- BZIP2,
- COMPRESS,
- PROGRAM,
- LZMA,
- XZ,
- UU,
- RPM,
- LZIP,
- LRZIP
- }
-
- [CCode (cname="int", has_type_id = false)]
public enum Format {
BASE_MASK,
CPIO,
@@ -137,8 +121,6 @@ namespace Archive {
public int64 position_compressed ();
public int64 position_uncompressed ();
- [Version (deprecated_since="3.0", replacement="Archive.filter_code (0)")]
- public Compression compression ();
public Format format ();
// Filter #0 is the one closest to the format, -1 is a synonym
// for the last filter, which is always the pseudo-filter that
@@ -147,7 +129,7 @@ namespace Archive {
public unowned string compression_name ();
public unowned string format_name ();
- public unowned string filter_name (int filter_no);
+ public unowned string filter_name (int filter_no = 0);
public int filter_count ();
public int file_count ();
@@ -161,24 +143,9 @@ namespace Archive {
[Compact]
- [CCode (cname="struct archive", free_function="archive_read_finish")]
+ [CCode (cname="struct archive", free_function="archive_read_free")]
public class Read : Archive {
public Read ();
- // see
https://github.com/libarchive/libarchive/wiki/Libarchive3#functions-that-are-being-renamed
- [Version (deprecated_since="3.0", replacement="Archive.Read.support_filter_all ()")]
- public Result support_compression_all ();
- [Version (deprecated_since="3.0", replacement="Archive.Read.support_filter_bzip2 ()")]
- public Result support_compression_bzip2 ();
- [Version (deprecated_since="3.0", replacement="Archive.Read.support_filter_compress ()")]
- public Result support_compression_compress ();
- [Version (deprecated_since="3.0", replacement="Archive.Read.support_filter_gzip ()")]
- public Result support_compression_gzip ();
- [Version (deprecated_since="3.0", replacement="Archive.Read.support_filter_lzma ()")]
- public Result support_compression_lzma ();
- [Version (deprecated_since="3.0", replacement="Archive.Read.support_filter_none ()")]
- public Result support_compression_none ();
- [Version (deprecated_since="3.0", replacement="Archive.Read.support_filter_program (string
command)")]
- public Result support_compression_program (string command);
public Result support_filter_all ();
public Result support_filter_bzip2 ();
public Result support_filter_compress ();
@@ -231,21 +198,19 @@ namespace Archive {
[CCode (delegate_target_pos = 0.9)] CloseCallback ccb
);
- public Result open_filename (string filename, size_t _block_size);
- public Result open_memory (void* buff, size_t size);
+ public Result open_filename (string filename, size_t block_size);
+ public Result open_memory ([CCode (array_length_type = "size_t")] uint8[] buffer);
public Result open_fd (int fd, size_t block_size);
public Result open_FILE (GLib.FileStream file);
public Result next_header (out unowned Entry entry);
public int64 header_position ();
[CCode (cname="archive_read_data")]
- public ssize_t read_data (void* buffer, size_t size);
+ public ssize_t read_data ([CCode (array_length_type = "size_t")] uint8[] buffer);
[CCode (cname="archive_read_data_block")]
- public Result read_data_block (out void* buff, out size_t size, out Posix.off_t offset);
+ public Result read_data_block ([CCode (array_length_type = "size_t")] out uint8[] buffer, out
int64 offset);
[CCode (cname="archive_read_data_skip")]
public Result read_data_skip ();
- [CCode (cname="archive_read_data_into_buffer")]
- public Result read_data_into_buffer (void* buffer, ssize_t len);
[CCode (cname="archive_read_data_into_fd")]
public Result read_data_into_fd (int fd);
@@ -257,7 +222,7 @@ namespace Archive {
}
[Compact]
- [CCode (cname = "struct archive", free_function="archive_read_finish")]
+ [CCode (cname = "struct archive", free_function="archive_read_free")]
public class ReadDisk : Read {
public ReadDisk ();
public Result set_symlink_logical ();
@@ -287,21 +252,9 @@ namespace Archive {
);
}
- [CCode (cname = "struct archive", free_function="archive_write_finish")]
+ [CCode (cname = "struct archive", free_function="archive_write_free")]
public class Write : Archive {
public Write ();
- // see
https://github.com/libarchive/libarchive/wiki/Libarchive3#functions-that-are-being-renamed
- [Version (deprecated_since="3.0", replacement="Archive.Write.add_filter_bzip2 ()")]
- public Result set_compression_bzip2 ();
- [Version (deprecated_since="3.0", replacement="Archive.Write.add_filter_compress ()")]
- public Result set_compression_compress ();
- [Version (deprecated_since="3.0", replacement="Archive.Write.add_filter_gzip ()")]
- public Result set_compression_gzip ();
- [Version (deprecated_since="3.0", replacement="Archive.Write.add_filter_lzma ()")]
- public Result set_compression_lzma ();
- [Version (deprecated_since="3.0", replacement="Archive.Write.add_filter_none ()")]
- public Result set_compression_none ();
- public Result set_compression_program (string cmd);
public Result add_filter (Filter filter_code);
public Result add_filter_by_name (string name);
public Result add_filter_b64encode ();
@@ -352,21 +305,21 @@ namespace Archive {
public Result open_fd (int fd);
public Result open_filename (string filename);
public Result open_FILE (GLib.FileStream file);
- public Result open_memory (void* buffer, size_t buff_size, out size_t used);
+ public Result open_memory ([CCode (array_length_type = "size_t")] uint8[] buffer, out size_t
used);
[CCode (cname="archive_write_header")]
public Result write_header (Entry entry);
[CCode (cname="archive_write_data")]
- public ssize_t write_data (void* data, size_t size);
+ public ssize_t write_data ([CCode (array_length_type = "size_t")] uint8[] data);
[CCode (cname="archive_write_data_block")]
- public ssize_t write_data_block (void* data, size_t size, Posix.off_t offset);
+ public ssize_t write_data_block ([CCode (array_length_type = "size_t")] uint8[] data, int64
offset);
public Result finish_entry ();
public Result close ();
}
[Compact]
- [CCode (cname = "struct archive", free_function="archive_write_finish")]
+ [CCode (cname = "struct archive", free_function="archive_write_free")]
public class WriteDisk : Write {
public WriteDisk ();
@@ -396,7 +349,8 @@ namespace Archive {
[Compact]
[CCode (cname = "struct archive_entry", cheader_filename = "archive_entry.h")]
public class Entry {
- public Entry ();
+ [CCode (cname="archive_entry_new2")]
+ public Entry (Archive? archive = null);
public time_t atime ();
public long atime_nsec ();
public bool atime_is_set ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]