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

gutils, gspawn: fix introspection annotations

Browse Source 
Fix various (out) arguments, (allow-none) and (array zero-terminated=1)
for g_spawn_*() and some others.

Some additional fixes by Colin Walters <walters@verbum.org>

https://bugzilla.gnome.org/show_bug.cgi?id=646635
This commit is contained in:
Giovanni Campagna 2011-04-03 18:53:04 +02:00 committed by Colin Walters
parent f0620902b2
commit 37c9775b82
2 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
glib/gspawn.c
View File

@ -84,13 +84,13 @@ g_spawn_error_quark (void)
/** /**
* g_spawn_async: * g_spawn_async:
* @working_directory: child's current working directory, or %NULL to inherit parent's * @working_directory: (allow-none): child's current working directory, or %NULL to inherit parent's
* @argv: child's argument vector * @argv: (array zero-terminated=1): child's argument vector
* @envp: child's environment, or %NULL to inherit parent's * @envp: (array zero-terminated=1) (allow-none): child's environment, or %NULL to inherit parent's
* @flags: flags from #GSpawnFlags * @flags: flags from #GSpawnFlags
* @child_setup: function to run in the child just before exec() * @child_setup: (scope async) (allow-none): function to run in the child just before exec()
* @user_data: user data for @child_setup * @user_data: (closure): user data for @child_setup
* @child_pid: return location for child process reference, or %NULL * @child_pid: (out) (allow-none): return location for child process reference, or %NULL
* @error: return location for error * @error: return location for error
* *
* See g_spawn_async_with_pipes() for a full description; this function * See g_spawn_async_with_pipes() for a full description; this function
@ -204,15 +204,15 @@ read_data (GString *str,
/** /**
* g_spawn_sync: * g_spawn_sync:
* @working_directory: child's current working directory, or %NULL to inherit parent's * @working_directory: (allow-none): child's current working directory, or %NULL to inherit parent's
* @argv: child's argument vector * @argv: (array zero-terminated=1): child's argument vector
* @envp: child's environment, or %NULL to inherit parent's * @envp: (array zero-terminated=1) (allow-none): child's environment, or %NULL to inherit parent's
* @flags: flags from #GSpawnFlags * @flags: flags from #GSpawnFlags
* @child_setup: function to run in the child just before exec() * @child_setup: (scope async) (allow-none): function to run in the child just before exec()
* @user_data: user data for @child_setup * @user_data: (closure): user data for @child_setup
* @standard_output: return location for child output, or %NULL * @standard_output: (out) (array zero-terminated=1) (element-type uint8) (allow-none): return location for child output, or %NULL
* @standard_error: return location for child error messages, or %NULL * @standard_error: (out) (array zero-terminated=1) (element-type uint8) (allow-none): return location for child error messages, or %NULL
* @exit_status: return location for child exit status, as returned by waitpid(), or %NULL * @exit_status: (out) (allow-none): return location for child exit status, as returned by waitpid(), or %NULL
* @error: return location for error, or %NULL * @error: return location for error, or %NULL
* *
* Executes a child synchronously (waits for the child to exit before returning). * Executes a child synchronously (waits for the child to exit before returning).
@ -449,16 +449,16 @@ g_spawn_sync (const gchar *working_directory,
/** /**
* g_spawn_async_with_pipes: * g_spawn_async_with_pipes:
* @working_directory: child's current working directory, or %NULL to inherit parent's, in the GLib file name encoding * @working_directory: (allow-none): child's current working directory, or %NULL to inherit parent's, in the GLib file name encoding
* @argv: child's argument vector, in the GLib file name encoding * @argv: (array zero-terminated=1): child's argument vector, in the GLib file name encoding
* @envp: child's environment, or %NULL to inherit parent's, in the GLib file name encoding * @envp: (array zero-terminated=1) (allow-none): 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: function to run in the child just before exec() * @child_setup: (scope async) (allow-none): function to run in the child just before exec()
* @user_data: user data for @child_setup * @user_data: (closure): user data for @child_setup
* @child_pid: return location for child process ID, or %NULL * @child_pid: (out) (allow-none): return location for child process ID, or %NULL
* @standard_input: return location for file descriptor to write to child's stdin, or %NULL * @standard_input: (out) (allow-none): return location for file descriptor to write to child's stdin, or %NULL
* @standard_output: return location for file descriptor to read child's stdout, or %NULL * @standard_output: (out) (allow-none): return location for file descriptor to read child's stdout, or %NULL
* @standard_error: return location for file descriptor to read child's stderr, or %NULL * @standard_error: (out) (allow-none): return location for file descriptor to read child's stderr, or %NULL
* @error: return location for error * @error: return location for error
* *
* Executes a child program asynchronously (your program will not * Executes a child program asynchronously (your program will not
@ -656,9 +656,9 @@ g_spawn_async_with_pipes (const gchar *working_directory,
/** /**
* g_spawn_command_line_sync: * g_spawn_command_line_sync:
* @command_line: a command line * @command_line: a command line
* @standard_output: return location for child output * @standard_output: (out) (array zero-terminated=1) (element-type uint8) (allow-none): return location for child output
* @standard_error: return location for child errors * @standard_error: (out) (array zero-terminated=1) (element-type uint8) (allow-none): return location for child errors
* @exit_status: return location for child exit status, as returned by waitpid() * @exit_status: (out) (allow-none): return location for child exit status, as returned by waitpid()
* @error: return location for errors * @error: return location for errors
* *
* A simple version of g_spawn_sync() with little-used parameters * A simple version of g_spawn_sync() with little-used parameters

6
glib/gutils.c
View File

@ -293,7 +293,7 @@ g_memmove (gpointer dest,
/** /**
* g_atexit: * g_atexit:
* @func: the function to call on normal program termination. * @func: (scope async): the function to call on normal program termination.
* *
* Specifies a function to be called at normal program termination. * Specifies a function to be called at normal program termination.
* *
@ -628,9 +628,9 @@ debug_key_matches (const gchar *key,
/** /**
* g_parse_debug_string: * g_parse_debug_string:
* @string: a list of debug options separated by colons, spaces, or * @string: (allow-none): a list of debug options separated by colons, spaces, or
* commas, or %NULL. * commas, or %NULL.
* @keys: pointer to an array of #GDebugKey which associate * @keys: (array length=nkeys): pointer to an array of #GDebugKey which associate
* strings with bit flags. * strings with bit flags.
* @nkeys: the number of #GDebugKey<!-- -->s in the array. * @nkeys: the number of #GDebugKey<!-- -->s in the array.
* *