luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-26 12:12:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'gfile-etag-nullable' into 'master'

Browse Source 
The ETag returned by various GFile functions is nullable

See merge request GNOME/glib!1956
This commit is contained in:
Philip Withnall 2021-02-17 09:21:44 +00:00
commit 49d5c4f859
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gio/gfile.c
View File

@ -7057,7 +7057,7 @@ g_file_query_default_handler_finish (GFile *file,
* @contents: (out) (transfer full) (element-type guint8) (array length=length): a location to place the contents of the file * @contents: (out) (transfer full) (element-type guint8) (array length=length): a location to place the contents of the file
* @length: (out) (optional): a location to place the length of the contents of the file, * @length: (out) (optional): a location to place the length of the contents of the file,
* or %NULL if the length is not needed * or %NULL if the length is not needed
* @etag_out: (out) (optional): a location to place the current entity tag for the file, * @etag_out: (out) (optional) (nullable): a location to place the current entity tag for the file,
* or %NULL if the entity tag is not needed * or %NULL if the entity tag is not needed
* @error: a #GError, or %NULL * @error: a #GError, or %NULL
* *
@ -7345,7 +7345,7 @@ g_file_load_partial_contents_async (GFile *file,
* @contents: (out) (transfer full) (element-type guint8) (array length=length): a location to place the contents of the file * @contents: (out) (transfer full) (element-type guint8) (array length=length): a location to place the contents of the file
* @length: (out) (optional): a location to place the length of the contents of the file, * @length: (out) (optional): a location to place the length of the contents of the file,
* or %NULL if the length is not needed * or %NULL if the length is not needed
* @etag_out: (out) (optional): a location to place the current entity tag for the file, * @etag_out: (out) (optional) (nullable): a location to place the current entity tag for the file,
* or %NULL if the entity tag is not needed * or %NULL if the entity tag is not needed
* @error: a #GError, or %NULL * @error: a #GError, or %NULL
* *
@ -7443,7 +7443,7 @@ g_file_load_contents_async (GFile *file,
* @contents: (out) (transfer full) (element-type guint8) (array length=length): a location to place the contents of the file * @contents: (out) (transfer full) (element-type guint8) (array length=length): a location to place the contents of the file
* @length: (out) (optional): a location to place the length of the contents of the file, * @length: (out) (optional): a location to place the length of the contents of the file,
* or %NULL if the length is not needed * or %NULL if the length is not needed
* @etag_out: (out) (optional): a location to place the current entity tag for the file, * @etag_out: (out) (optional) (nullable): a location to place the current entity tag for the file,
* or %NULL if the entity tag is not needed * or %NULL if the entity tag is not needed
* @error: a #GError, or %NULL * @error: a #GError, or %NULL
* *
@ -7481,7 +7481,7 @@ g_file_load_contents_finish (GFile *file,
* or %NULL * or %NULL
* @make_backup: %TRUE if a backup should be created * @make_backup: %TRUE if a backup should be created
* @flags: a set of #GFileCreateFlags * @flags: a set of #GFileCreateFlags
* @new_etag: (out) (optional): a location to a new [entity tag][gfile-etag] * @new_etag: (out) (optional) (nullable): a location to a new [entity tag][gfile-etag]
* for the document. This should be freed with g_free() when no longer * for the document. This should be freed with g_free() when no longer
* needed, or %NULL * needed, or %NULL
* @cancellable: optional #GCancellable object, %NULL to ignore * @cancellable: optional #GCancellable object, %NULL to ignore
@ -7789,7 +7789,7 @@ g_file_replace_contents_bytes_async (GFile *file,
* g_file_replace_contents_finish: * g_file_replace_contents_finish:
* @file: input #GFile * @file: input #GFile
* @res: a #GAsyncResult * @res: a #GAsyncResult
* @new_etag: (out) (optional): a location of a new [entity tag][gfile-etag] * @new_etag: (out) (optional) (nullable): a location of a new [entity tag][gfile-etag]
* for the document. This should be freed with g_free() when it is no * for the document. This should be freed with g_free() when it is no
* longer needed, or %NULL * longer needed, or %NULL
* @error: a #GError, or %NULL * @error: a #GError, or %NULL