Merge branch 'optional_inet_address' into 'master'

ginetaddress, ginetsocketaddress: Add missing (nullable) annotations

See merge request GNOME/glib!1418
This commit is contained in:
Philip Withnall 2020-03-17 13:06:41 +00:00
commit 2e23b9edbd
2 changed files with 4 additions and 4 deletions

View File

@ -382,8 +382,8 @@ g_inet_address_init (GInetAddress *address)
*
* Parses @string as an IP address and creates a new #GInetAddress.
*
* Returns: a new #GInetAddress corresponding to @string, or %NULL if
* @string could not be parsed.
* Returns: (nullable) (transfer full): a new #GInetAddress corresponding
* to @string, or %NULL if @string could not be parsed.
* Free the returned object with g_object_unref().
*
* Since: 2.22

View File

@ -398,8 +398,8 @@ g_inet_socket_address_new (GInetAddress *address,
* If @address is an IPv6 address, it can also contain a scope ID
* (separated from the address by a `%`).
*
* Returns: a new #GInetSocketAddress, or %NULL if @address cannot be
* parsed.
* Returns: (nullable) (transfer full): a new #GInetSocketAddress,
* or %NULL if @address cannot be parsed.
*
* Since: 2.40
*/