]> git.ipfire.org Git - thirdparty/vala.git/commitdiff
glib-2.0: annotate nullable GLib.Uri arguments and return values
authorMarc-André Lureau <marcandre.lureau@gmail.com>
Wed, 23 May 2012 00:24:31 +0000 (02:24 +0200)
committerJürg Billeter <j@bitron.ch>
Sat, 23 Jun 2012 15:20:45 +0000 (17:20 +0200)
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

vapi/glib-2.0.vapi

index cd4aa17d912bdaf77501a933c1934e5c7f606207..1fb177c432868ea401801095b0c74db74e9ff8a2 100644 (file)
@@ -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);
        }