luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'minor-fixes' into 'main'

Browse Source 
Minor fixes/docs changes to GFileDescriptorBased and GTask

See merge request GNOME/glib!3894
This commit is contained in:
Michael Catanzaro 2024-02-07 14:21:11 +00:00
commit d753985708
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gio/gfiledescriptorbased.c
View File

@ -63,7 +63,7 @@ g_file_descriptor_based_get_fd (GFileDescriptorBased *fd_based)
{ {
GFileDescriptorBasedIface *iface; GFileDescriptorBasedIface *iface;
g_return_val_if_fail (G_IS_FILE_DESCRIPTOR_BASED (fd_based), 0); g_return_val_if_fail (G_IS_FILE_DESCRIPTOR_BASED (fd_based), -1);
iface = G_FILE_DESCRIPTOR_BASED_GET_IFACE (fd_based); iface = G_FILE_DESCRIPTOR_BASED_GET_IFACE (fd_based);

13
gio/gtask.c
View File

@ -2454,9 +2454,18 @@ g_task_class_init (GTaskClass *klass)
* GTask:completed: * GTask:completed:
* *
* Whether the task has completed, meaning its callback (if set) has been * Whether the task has completed, meaning its callback (if set) has been
* invoked. This can only happen after g_task_return_pointer(), * invoked.
*
* This can only happen after g_task_return_pointer(),
* g_task_return_error() or one of the other return functions have been called * g_task_return_error() or one of the other return functions have been called
* on the task. * on the task. However, it is not guaranteed to happen immediately after
* those functions are called, as the task’s callback may need to be scheduled
* to run in a different thread.
*
* That means it is **not safe** to use this property to track whether a
* return function has been called on the #GTask. Callers must do that
* tracking themselves, typically by linking the lifetime of the #GTask to the
* control flow of their code.
* *
* This property is guaranteed to change from %FALSE to %TRUE exactly once. * This property is guaranteed to change from %FALSE to %TRUE exactly once.
* *