[glib: 1/2] Add nullable annotation for g_file_get_uri_scheme
- From: Sebastian Dröge <sdroege src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib: 1/2] Add nullable annotation for g_file_get_uri_scheme
- Date: Wed, 6 Jan 2021 08:55:48 +0000 (UTC)
commit b3740ac5b098dfb901457eb307aa1ed38463ba3f
Author: Sophie Herold <sophie hemio de>
Date: Wed Jan 6 08:55:47 2021 +0000
Add nullable annotation for g_file_get_uri_scheme
gio/gfile.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/gio/gfile.c b/gio/gfile.c
index f92c07612..b3acc25f1 100644
--- a/gio/gfile.c
+++ b/gio/gfile.c
@@ -456,11 +456,14 @@ g_file_has_uri_scheme (GFile *file,
* ]|
* Common schemes include "file", "http", "ftp", etc.
*
+ * The scheme can be different from the one used to construct the #GFile,
+ * in that it might be replaced with one that is logically equivalent to the #GFile.
+ *
* This call does no blocking I/O.
*
- * Returns: a string containing the URI scheme for the given
- * #GFile. The returned string should be freed with g_free()
- * when no longer needed.
+ * Returns: (nullable): a string containing the URI scheme for the given
+ * #GFile or %NULL if the #GFile was constructed with an invalid URI. The
+ * returned string should be freed with g_free() when no longer needed.
*/
char *
g_file_get_uri_scheme (GFile *file)
@@ -611,7 +614,8 @@ g_file_peek_path (GFile *file)
*
* This call does no blocking I/O.
*
- * Returns: a string containing the #GFile's URI.
+ * Returns: a string containing the #GFile's URI. If the #GFile was constructed
+ * with an invalid URI, an invalid URI is returned.
* The returned string should be freed with g_free()
* when no longer needed.
*/
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]