diff options
| author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2012-05-23 02:24:31 +0200 |
|---|---|---|
| committer | Jürg Billeter <j@bitron.ch> | 2012-06-23 17:20:45 +0200 |
| commit | 554e653f2117f4a20b7ba1fd55983043521ad02a (patch) | |
| tree | c5ffb8310b27696e8d5e57e89627d3755c47b26e | |
| parent | 04cf8b91ee0160519515b0d88d51c5669c2bef38 (diff) | |
| download | vala-554e653f2117f4a20b7ba1fd55983043521ad02a.tar.gz | |
glib-2.0: annotate nullable GLib.Uri arguments and return values
g_uri_*() functions can take null values, return null as a normal
operation, ex: parse_scheme() returns null when no scheme...
https://bugzilla.gnome.org/show_bug.cgi?id=676609
| -rw-r--r-- | vapi/glib-2.0.vapi | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi index cd4aa17d9..1fb177c43 100644 --- a/vapi/glib-2.0.vapi +++ b/vapi/glib-2.0.vapi @@ -3310,10 +3310,10 @@ namespace GLib { public const string RESERVED_CHARS_GENERIC_DELIMITERS; public const string RESERVED_CHARS_SUBCOMPONENT_DELIMITERS; - public static string parse_scheme (string uri); - public static string escape_string (string unescaped, string reserved_chars_allowed, bool allow_utf8); - public static string unescape_string (string escaped_string, string? illegal_characters = null); - public static string unescape_segment (string escaped_string, string escaped_string_end, string? illegal_characters = null); + public static string? parse_scheme (string uri); + public static string escape_string (string unescaped, string? reserved_chars_allowed = null, bool allow_utf8 = true); + public static string? unescape_string (string escaped_string, string? illegal_characters = null); + public static string? unescape_segment (string? escaped_string, string? escaped_string_end, string? illegal_characters = null); [CCode (array_length = false, array_null_terminated = true)] public static string[] list_extract_uris (string uri_list); } |