From: Evan Nemerson Date: Fri, 20 Aug 2010 06:16:39 +0000 (-0700) Subject: libsoup-2.4: Many small argument and data type fixes. X-Git-Tag: 0.11.0~159 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf207292089c9dbab130e46fa76df2b14027e806;p=thirdparty%2Fvala.git libsoup-2.4: Many small argument and data type fixes. --- diff --git a/vapi/libsoup-2.4.vapi b/vapi/libsoup-2.4.vapi index 91f53a78c..30ffe25f4 100644 --- a/vapi/libsoup-2.4.vapi +++ b/vapi/libsoup-2.4.vapi @@ -8,8 +8,8 @@ namespace Soup { public Address (string name, uint port); [CCode (has_construct_function = false)] public Address.any (Soup.AddressFamily family, uint port); - public static bool equal_by_ip (void* addr1, void* addr2); - public static bool equal_by_name (void* addr1, void* addr2); + public static bool equal_by_ip ([CCode (type = "void*")] Soup.Address addr1, [CCode (type = "void*")] Soup.Address addr2); + public static bool equal_by_name ([CCode (type = "void*")] Soup.Address addr1, [CCode (type = "void*")] Soup.Address addr2); [CCode (has_construct_function = false)] public Address.from_sockaddr (void* sa, int len); public unowned string get_name (); @@ -100,13 +100,13 @@ namespace Soup { public weak string data; public size_t length; [CCode (has_construct_function = false)] - public Buffer (Soup.MemoryUse use, void* data, size_t length); + public Buffer (Soup.MemoryUse use, [CCode (type = "void*", array_length_type = "gsize")] uint8[] data); public Soup.Buffer copy (); public void* get_owner (); [CCode (has_construct_function = false)] public Buffer.subbuffer (Soup.Buffer parent, size_t offset, size_t length); [CCode (has_construct_function = false)] - public Buffer.with_owner (void* data, size_t length, void* owner, GLib.DestroyNotify owner_dnotify); + public Buffer.with_owner ([CCode (type = "void*", array_length_type = "gsize")] uint8[] data, void* owner, GLib.DestroyNotify? owner_dnotify); } [Compact] [CCode (type_id = "SOUP_TYPE_BYTE_ARRAY", cheader_filename = "libsoup/soup.h")] @@ -241,8 +241,8 @@ namespace Soup { public void set_first_party (...); public void set_flags (Soup.MessageFlags flags); public void set_http_version (Soup.HTTPVersion version); - public void set_request (string content_type, Soup.MemoryUse req_use, [CCode (type = "char**", array_length_type = "gsize")] uint8[] req_body); - public void set_response (string content_type, Soup.MemoryUse resp_use, [CCode (type = "char**", array_length_type = "gsize")] uint8[] resp_body); + public void set_request (string content_type, Soup.MemoryUse req_use, [CCode (type = "const char*", array_length_type = "gsize")] uint8[] req_body); + public void set_response (string content_type, Soup.MemoryUse resp_use, [CCode (type = "const char*", array_length_type = "gsize")] uint8[] resp_body); public void set_status (uint status_code); public void set_status_full (uint status_code, string reason_phrase); public void set_uri (Soup.URI uri); @@ -291,7 +291,7 @@ namespace Soup { public int64 length; [CCode (has_construct_function = false)] public MessageBody (); - public void append (Soup.MemoryUse use, void* data, size_t length); + public void append (Soup.MemoryUse use, [CCode (type = "gconstpointer", array_length_type = "gsize")] uint8[] data); public void append_buffer (Soup.Buffer buffer); public void complete (); public Soup.Buffer flatten (); @@ -335,7 +335,6 @@ namespace Soup { [Compact] [CCode (cheader_filename = "libsoup/soup.h")] public class MessageHeadersIter { - public void* dummy; public void init (Soup.MessageHeaders hdrs); public bool next (out unowned string name, out unowned string value); } @@ -376,7 +375,7 @@ namespace Soup { public void run (); public void run_async (); public void unpause_message (Soup.Message msg); - public void* async_context { get; construct; } + public GLib.MainContext async_context { get; construct; } [NoAccessorMethod] public Soup.Address @interface { owned get; construct; } public uint port { get; construct; } @@ -418,7 +417,7 @@ namespace Soup { public Soup.SessionFeature add_feature { owned get; set; } [NoAccessorMethod] public GLib.Type add_feature_by_type { get; set; } - public void* async_context { get; construct; } + public GLib.MainContext async_context { get; construct; } [NoAccessorMethod] public uint idle_timeout { get; set; } [NoAccessorMethod] @@ -473,13 +472,13 @@ namespace Soup { public bool is_connected (); public bool is_ssl (); public bool listen (); - public Soup.SocketIOStatus read (void* buffer, size_t len, size_t nread, GLib.Cancellable cancellable) throws GLib.Error; - public Soup.SocketIOStatus read_until (void* buffer, size_t len, void* boundary, size_t boundary_len, size_t nread, bool got_boundary, GLib.Cancellable cancellable) throws GLib.Error; + public Soup.SocketIOStatus read ([CCode (array_length_type = "gsize")] uint8[] buffer, out size_t nread, GLib.Cancellable? cancellable = null) throws GLib.Error; + public Soup.SocketIOStatus read_until ([CCode (array_length_type = "gsize")] uint8[] buffer, [CCode (array_length_type = "gsize")] uint8[] boundary, out size_t nread, out bool got_boundary, GLib.Cancellable? cancellable = null) throws GLib.Error; public bool start_proxy_ssl (string ssl_host, GLib.Cancellable cancellable); public bool start_ssl (GLib.Cancellable cancellable); - public Soup.SocketIOStatus write (void* buffer, size_t len, size_t nwrote, GLib.Cancellable cancellable) throws GLib.Error; + public Soup.SocketIOStatus write ([CCode (array_length_type = "gsize")] uint8[] buffer, out size_t nwrote, GLib.Cancellable? cancellable = null) throws GLib.Error; [NoAccessorMethod] - public void* async_context { get; construct; } + public GLib.MainContext async_context { get; construct; } [NoAccessorMethod] public bool is_server { get; } public Soup.Address local_address { get; construct; } @@ -517,8 +516,8 @@ namespace Soup { public static string decode (string part); public static string encode (string part, string? escape_extra); public bool equal (Soup.URI uri2); - public static bool host_equal (void* v1, void* v2); - public static uint host_hash (void* key); + public static bool host_equal (Soup.URI v1, Soup.URI v2); + public static uint host_hash (Soup.URI key); public static string normalize (string part, string unescape_extra); public void set_fragment (string fragment); public void set_host (string host); @@ -750,8 +749,8 @@ namespace Soup { public delegate void LoggerPrinter (Soup.Logger logger, Soup.LoggerLogLevel level, char direction, string data); [CCode (cheader_filename = "libsoup/soup.h")] public delegate void MessageHeadersForeachFunc (string name, string value); - [CCode (cheader_filename = "libsoup/soup.h", has_target = false)] - public delegate void ProxyResolverCallback (Soup.ProxyResolver p1, Soup.Message p2, uint p3, Soup.Address p4, void* p5); + [CCode (cheader_filename = "libsoup/soup.h")] + public delegate void ProxyResolverCallback (Soup.ProxyResolver p1, Soup.Message p2, uint p3, Soup.Address p4); [CCode (cheader_filename = "libsoup/soup.h")] public delegate void ProxyURIResolverCallback (Soup.ProxyURIResolver resolver, uint status, Soup.URI proxy_uri); [CCode (cheader_filename = "libsoup/soup.h")] diff --git a/vapi/packages/libsoup-2.4/libsoup-2.4.metadata b/vapi/packages/libsoup-2.4/libsoup-2.4.metadata index c16d0abaf..ae582f46e 100644 --- a/vapi/packages/libsoup-2.4/libsoup-2.4.metadata +++ b/vapi/packages/libsoup-2.4/libsoup-2.4.metadata @@ -1,5 +1,7 @@ Soup cheader_filename="libsoup/soup.h" soup_add_io_watch hidden="1" +soup_address_equal_by_ip.addr* type_name="Address" ctype="void*" +soup_address_equal_by_name.addr* type_name="Address" ctype="void*" soup_auth_get_protection_space type_arguments="string" transfer_ownership="1" soup_auth_free_protection_space hidden="1" soup_auth_is_authenticated hidden="1" @@ -18,6 +20,11 @@ soup_auth_domain_digest_set_auth_callback.callback transfer_ownership="1" soup_auth_domain_digest_set_auth_callback.dnotify hidden="1" SoupBuffer ref_function="soup_buffer_copy" unref_function="soup_buffer_free" soup_buffer_copy transfer_ownership="1" +soup_buffer_new.data type_name="uint8" is_array="1" ctype="void*" array_length_type="gsize" +soup_buffer_new.length hidden="1" +soup_buffer_new_with_owner.data type_name="uint8" is_array="1" ctype="void*" array_length_type="gsize" +soup_buffer_new_with_owner.length hidden="1" +soup_buffer_new_with_owner.owner_dnotify nullable="1" soup_content_sniffer_sniff transfer_ownership="1" soup_content_sniffer_sniff.params is_out="1" transfer_ownership="1" nullable="1" type_arguments="string,string" soup_cookie_copy transfer_ownership="1" @@ -62,26 +69,32 @@ SoupMessage::wrote_body_data has_emitter="1" SoupMessage::wrote_chunk has_emitter="1" SoupMessage::wrote_headers has_emitter="1" SoupMessage::wrote_informational has_emitter="1" +soup_message_body_append.data type_name="uint8" is_array="1" ctype="gconstpointer" array_length_type="gsize" +soup_message_body_append.length hidden="1" soup_message_body_flatten transfer_ownership="1" soup_cookies_from_request type_arguments="Cookie" transfer_ownership="1" -soup_message_set_request.req_body type_name="uint8" ctype="char**" is_array="1" array_length_type="gsize" +soup_message_set_request.req_body type_name="uint8" ctype="const char*" is_array="1" array_length_type="gsize" soup_message_set_request.req_length hidden="1" soup_cookies_from_response type_arguments="Cookie" transfer_ownership="1" -soup_message_set_response.resp_body type_name="uint8" ctype="char**" is_array="1" array_length_type="gsize" +soup_message_set_response.resp_body type_name="uint8" ctype="const char*" is_array="1" array_length_type="gsize" soup_message_set_response.resp_length hidden="1" soup_header_parse_semi_param_list type_arguments="string,string" transfer_ownership="1" soup_message_headers_get_content_disposition.disposition transfer_ownership="1" soup_message_headers_get_content_disposition.params is_out="1" transfer_ownership="1" nullable="1" soup_message_headers_get_content_type.params is_out="1" transfer_ownership="1" nullable="1" type_arguments="string,string" +SoupMessageHeadersIter.dummy hidden="1" soup_message_set_chunk_allocator.allocator transfer_ownership="1" soup_message_set_chunk_allocator.destroy_notify hidden="1" SoupMessageBody.data type_name="uint8" is_array="1" array_length_cname="length" array_length_type="gint64" soup_message_headers_set_content_disposition.params type_arguments="string,string" nullable="1" soup_message_headers_set_content_type.params type_arguments="string,string" nullable="1" +SoupProxyResolverCallback has_target="1" +SoupProxyResolverCallback.p5 hidden="1" soup_server_new ellipsis="1" soup_server_add_handler.destroy hidden="1" soup_server_add_handler.callback transfer_ownership="1" SoupServerCallback.query type_arguments="string,string" +SoupSession:async-context type_name="GLib.MainContext" SoupSession::add_feature has_emitter="1" SoupSession::add_feature_by_type has_emitter="1" SoupSession::remove_feature_by_type has_emitter="1" @@ -90,9 +103,28 @@ soup_session_queue_message.msg transfer_ownership="1" soup_session_queue_message.callback nullable="1" soup_session_async_new_with_options ellipsis="1" soup_session_sync_new_with_options ellipsis="1" +SoupServer:async-context type_name="GLib.MainContext" +SoupSocket:async-context type_name="GLib.MainContext" +soup_socket_read.buffer type_name="uint8" is_array="1" array_length_type="gsize" +soup_socket_read.len hidden="1" +soup_socket_read.nread is_out="1" +soup_socket_read.cancellable nullable="1" default_value="null" +soup_socket_read_until.buffer type_name="uint8" is_array="1" array_length_type="gsize" +soup_socket_read_until.len hidden="1" +soup_socket_read_until.boundary type_name="uint8" is_array="1" array_length_type="gsize" +soup_socket_read_until.boundary_len hidden="1" +soup_socket_read_until.nread is_out="1" +soup_socket_read_until.got_boundary is_out="1" +soup_socket_read_until.cancellable nullable="1" default_value="null" +soup_socket_write.buffer type_name="uint8" is_array="1" array_length_type="gsize" +soup_socket_write.len hidden="1" +soup_socket_write.nwrote is_out="1" +soup_socket_write.cancellable nullable="1" default_value="null" soup_uri_decode transfer_ownership="1" soup_uri_encode transfer_ownership="1" soup_uri_encode.escape_extra nullable="1" +soup_uri_host_equal.* type_name="URI" +soup_uri_host_hash.key type_name="URI" soup_uri_copy transfer_ownership="1" soup_uri_set_query_from_form.form type_arguments="string,string" soup_uri_to_string transfer_ownership="1"