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

Merge branch 'closure-annotation-fixes' into 'main'

Browse Source 
gspawn, gdataset: Restore nullable callback functions

See merge request GNOME/glib!3523
This commit is contained in:
Philip Withnall 2023-08-12 18:32:43 +00:00
commit 528e3270e1
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glib/gdataset.c
View File

@ -935,7 +935,8 @@ g_datalist_id_get_data (GData **datalist,
* g_datalist_id_dup_data: (skip) * g_datalist_id_dup_data: (skip)
* @datalist: location of a datalist * @datalist: location of a datalist
* @key_id: the #GQuark identifying a data element * @key_id: the #GQuark identifying a data element
* @dup_func: (scope call) (closure user_data): function to duplicate the old value * @dup_func: (scope call) (closure user_data) (nullable): function to
* duplicate the old value
* @user_data: passed as user_data to @dup_func * @user_data: passed as user_data to @dup_func
* *
* This is a variant of g_datalist_id_get_data() which * This is a variant of g_datalist_id_get_data() which

15
glib/gspawn.c
View File

@ -218,7 +218,8 @@ G_DEFINE_QUARK (g-spawn-exit-error-quark, g_spawn_exit_error)
* @envp: (array zero-terminated=1) (element-type filename) (nullable): * @envp: (array zero-terminated=1) (element-type filename) (nullable):
* child's environment, or %NULL to inherit parent's * child's environment, or %NULL to inherit parent's
* @flags: flags from #GSpawnFlags * @flags: flags from #GSpawnFlags
* @child_setup: (scope async): function to run in the child just before exec() * @child_setup: (scope async) (closure user_data) (nullable): function to run
* in the child just before `exec()`
* @user_data: user data for @child_setup * @user_data: user data for @child_setup
* @child_pid: (out) (optional): return location for child process reference, or %NULL * @child_pid: (out) (optional): return location for child process reference, or %NULL
* @error: return location for error * @error: return location for error
@ -332,7 +333,8 @@ read_data (GString *str,
* @envp: (array zero-terminated=1) (element-type filename) (nullable): * @envp: (array zero-terminated=1) (element-type filename) (nullable):
* child's environment, or %NULL to inherit parent's * child's environment, or %NULL to inherit parent's
* @flags: flags from #GSpawnFlags * @flags: flags from #GSpawnFlags
* @child_setup: (scope async): function to run in the child just before exec() * @child_setup: (scope call) (closure user_data) (nullable): function to run
* in the child just before `exec()`
* @user_data: user data for @child_setup * @user_data: user data for @child_setup
* @standard_output: (out) (array zero-terminated=1) (element-type guint8) (optional): return location for child output, or %NULL * @standard_output: (out) (array zero-terminated=1) (element-type guint8) (optional): return location for child output, or %NULL
* @standard_error: (out) (array zero-terminated=1) (element-type guint8) (optional): return location for child error messages, or %NULL * @standard_error: (out) (array zero-terminated=1) (element-type guint8) (optional): return location for child error messages, or %NULL
@ -593,7 +595,8 @@ g_spawn_sync (const gchar *working_directory,
* child's environment, or %NULL to inherit parent's, in the GLib file * child's environment, or %NULL to inherit parent's, in the GLib file
* name encoding * name encoding
* @flags: flags from #GSpawnFlags * @flags: flags from #GSpawnFlags
* @child_setup: (scope async): function to run in the child just before exec() * @child_setup: (scope async) (closure user_data) (nullable): function to run
* in the child just before `exec()`
* @user_data: user data for @child_setup * @user_data: user data for @child_setup
* @child_pid: (out) (optional): return location for child process ID, or %NULL * @child_pid: (out) (optional): return location for child process ID, or %NULL
* @standard_input: (out) (optional): return location for file descriptor to write to child's stdin, or %NULL * @standard_input: (out) (optional): return location for file descriptor to write to child's stdin, or %NULL
@ -643,7 +646,8 @@ g_spawn_async_with_pipes (const gchar *working_directory,
* child's environment, or %NULL to inherit parent's, in the GLib file * child's environment, or %NULL to inherit parent's, in the GLib file
* name encoding * name encoding
* @flags: flags from #GSpawnFlags * @flags: flags from #GSpawnFlags
* @child_setup: (scope async) (closure user_data): function to run in the child just before `exec()` * @child_setup: (scope async) (closure user_data) (nullable): function to run
* in the child just before `exec()`
* @user_data: user data for @child_setup * @user_data: user data for @child_setup
* @stdin_fd: file descriptor to use for child's stdin, or `-1` * @stdin_fd: file descriptor to use for child's stdin, or `-1`
* @stdout_fd: file descriptor to use for child's stdout, or `-1` * @stdout_fd: file descriptor to use for child's stdout, or `-1`
@ -929,7 +933,8 @@ g_spawn_async_with_pipes_and_fds (const gchar *working_directory,
* it must be non-empty and %NULL-terminated * it must be non-empty and %NULL-terminated
* @envp: (array zero-terminated=1) (nullable): child's environment, or %NULL to inherit parent's, in the GLib file name encoding * @envp: (array zero-terminated=1) (nullable): child's environment, or %NULL to inherit parent's, in the GLib file name encoding
* @flags: flags from #GSpawnFlags * @flags: flags from #GSpawnFlags
* @child_setup: (scope async) (closure user_data): function to run in the child just before exec() * @child_setup: (scope async) (closure user_data) (nullable): function to run
* in the child just before `exec()`
* @user_data: user data for @child_setup * @user_data: user data for @child_setup
* @child_pid: (out) (optional): return location for child process ID, or %NULL * @child_pid: (out) (optional): return location for child process ID, or %NULL
* @stdin_fd: file descriptor to use for child's stdin, or `-1` * @stdin_fd: file descriptor to use for child's stdin, or `-1`