luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-28 16:36:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

gspawn-win32: Rename a variable for consistency with the public headers

Browse Source 
I realise Windows uses handles rather than PIDs, but given that there
are multiple platform-specific implementations of the public
`g_spawn_*()` API, I think it is less confusing for them all to use the
same naming scheme.

This introduces no functional changes.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
This commit is contained in:
Philip Withnall 2021-02-15 13:32:40 +00:00
parent fd0b20d537
commit ba403908a2
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
glib/gspawn-win32.c
View File

@ -230,7 +230,7 @@ g_spawn_async (const gchar *working_directory,
GSpawnFlags flags, GSpawnFlags flags,
GSpawnChildSetupFunc child_setup, GSpawnChildSetupFunc child_setup,
gpointer user_data, gpointer user_data,
GPid *child_handle, GPid *child_pid,
GError **error) GError **error)
{ {
g_return_val_if_fail (argv != NULL, FALSE); g_return_val_if_fail (argv != NULL, FALSE);
@ -240,7 +240,7 @@ g_spawn_async (const gchar *working_directory,
flags, flags,
child_setup, child_setup,
user_data, user_data,
child_handle, child_pid,
NULL, NULL, NULL, NULL, NULL, NULL,
error); error);
} }
@ -441,7 +441,7 @@ do_spawn_directly (gint *exit_status,
gchar **argv, gchar **argv,
char **envp, char **envp,
char **protected_argv, char **protected_argv,
GPid *child_handle, GPid *child_pid,
GError **error) GError **error)
{ {
const int mode = (exit_status == NULL) ? P_NOWAIT : P_WAIT; const int mode = (exit_status == NULL) ? P_NOWAIT : P_WAIT;
@ -515,13 +515,13 @@ do_spawn_directly (gint *exit_status,
if (exit_status == NULL) if (exit_status == NULL)
{ {
if (child_handle && do_return_handle) if (child_pid && do_return_handle)
*child_handle = (GPid) rc; *child_pid = (GPid) rc;
else else
{ {
CloseHandle ((HANDLE) rc); CloseHandle ((HANDLE) rc);
if (child_handle) if (child_pid)
*child_handle = 0; *child_pid = 0;
} }
} }
else else
@ -538,7 +538,7 @@ do_spawn_with_fds (gint *exit_status,
char **envp, char **envp,
GSpawnFlags flags, GSpawnFlags flags,
GSpawnChildSetupFunc child_setup, GSpawnChildSetupFunc child_setup,
GPid *child_handle, GPid *child_pid,
gint stdin_fd, gint stdin_fd,
gint stdout_fd, gint stdout_fd,
gint stderr_fd, gint stderr_fd,
@ -581,7 +581,7 @@ do_spawn_with_fds (gint *exit_status,
gboolean retval = gboolean retval =
do_spawn_directly (exit_status, do_return_handle, flags, do_spawn_directly (exit_status, do_return_handle, flags,
argv, envp, protected_argv, argv, envp, protected_argv,
child_handle, error); child_pid, error);
g_strfreev (protected_argv); g_strfreev (protected_argv);
return retval; return retval;
} }
@ -807,23 +807,23 @@ do_spawn_with_fds (gint *exit_status,
switch (helper_report[0]) switch (helper_report[0])
{ {
case CHILD_NO_ERROR: case CHILD_NO_ERROR:
if (child_handle && do_return_handle) if (child_pid && do_return_handle)
{ {
/* rc is our HANDLE for gspawn-win32-helper. It has /* rc is our HANDLE for gspawn-win32-helper. It has
* told us the HANDLE of its child. Duplicate that into * told us the HANDLE of its child. Duplicate that into
* a HANDLE valid in this process. * a HANDLE valid in this process.
*/ */
if (!DuplicateHandle ((HANDLE) rc, (HANDLE) helper_report[1], if (!DuplicateHandle ((HANDLE) rc, (HANDLE) helper_report[1],
GetCurrentProcess (), (LPHANDLE) child_handle, GetCurrentProcess (), (LPHANDLE) child_pid,
0, TRUE, DUPLICATE_SAME_ACCESS)) 0, TRUE, DUPLICATE_SAME_ACCESS))
{ {
char *emsg = g_win32_error_message (GetLastError ()); char *emsg = g_win32_error_message (GetLastError ());
g_print("%s\n", emsg); g_print("%s\n", emsg);
*child_handle = 0; *child_pid = 0;
} }
} }
else if (child_handle) else if (child_pid)
*child_handle = 0; *child_pid = 0;
write (helper_sync_pipe[1], " ", 1); write (helper_sync_pipe[1], " ", 1);
close_and_invalidate (&helper_sync_pipe[1]); close_and_invalidate (&helper_sync_pipe[1]);
break; break;
@ -867,7 +867,7 @@ do_spawn_with_pipes (gint *exit_status,
char **envp, char **envp,
GSpawnFlags flags, GSpawnFlags flags,
GSpawnChildSetupFunc child_setup, GSpawnChildSetupFunc child_setup,
GPid *child_handle, GPid *child_pid,
gint *standard_input, gint *standard_input,
gint *standard_output, gint *standard_output,
gint *standard_error, gint *standard_error,
@ -894,7 +894,7 @@ do_spawn_with_pipes (gint *exit_status,
envp, envp,
flags, flags,
child_setup, child_setup,
child_handle, child_pid,
stdin_pipe[0], stdin_pipe[0],
stdout_pipe[1], stdout_pipe[1],
stderr_pipe[1], stderr_pipe[1],
@ -1185,7 +1185,7 @@ g_spawn_async_with_pipes (const gchar *working_directory,
GSpawnFlags flags, GSpawnFlags flags,
GSpawnChildSetupFunc child_setup, GSpawnChildSetupFunc child_setup,
gpointer user_data, gpointer user_data,
GPid *child_handle, GPid *child_pid,
gint *standard_input, gint *standard_input,
gint *standard_output, gint *standard_output,
gint *standard_error, gint *standard_error,
@ -1207,7 +1207,7 @@ g_spawn_async_with_pipes (const gchar *working_directory,
envp, envp,
flags, flags,
child_setup, child_setup,
child_handle, child_pid,
standard_input, standard_input,
standard_output, standard_output,
standard_error, standard_error,
@ -1222,7 +1222,7 @@ g_spawn_async_with_fds (const gchar *working_directory,
GSpawnFlags flags, GSpawnFlags flags,
GSpawnChildSetupFunc child_setup, GSpawnChildSetupFunc child_setup,
gpointer user_data, gpointer user_data,
GPid *child_handle, GPid *child_pid,
gint stdin_fd, gint stdin_fd,
gint stdout_fd, gint stdout_fd,
gint stderr_fd, gint stderr_fd,
@ -1244,7 +1244,7 @@ g_spawn_async_with_fds (const gchar *working_directory,
envp, envp,
flags, flags,
child_setup, child_setup,
child_handle, child_pid,
stdin_fd, stdin_fd,
stdout_fd, stdout_fd,
stderr_fd, stderr_fd,
@ -1384,7 +1384,7 @@ g_spawn_async_utf8 (const gchar *working_directory,
GSpawnFlags flags, GSpawnFlags flags,
GSpawnChildSetupFunc child_setup, GSpawnChildSetupFunc child_setup,
gpointer user_data, gpointer user_data,
GPid *child_handle, GPid *child_pid,
GError **error) GError **error)
{ {
return g_spawn_async (working_directory, return g_spawn_async (working_directory,
@ -1393,7 +1393,7 @@ g_spawn_async_utf8 (const gchar *working_directory,
flags, flags,
child_setup, child_setup,
user_data, user_data,
child_handle, child_pid,
error); error);
} }
@ -1404,7 +1404,7 @@ g_spawn_async_with_pipes_utf8 (const gchar *working_directory,
GSpawnFlags flags, GSpawnFlags flags,
GSpawnChildSetupFunc child_setup, GSpawnChildSetupFunc child_setup,
gpointer user_data, gpointer user_data,
GPid *child_handle, GPid *child_pid,
gint *standard_input, gint *standard_input,
gint *standard_output, gint *standard_output,
gint *standard_error, gint *standard_error,
@ -1416,7 +1416,7 @@ g_spawn_async_with_pipes_utf8 (const gchar *working_directory,
flags, flags,
child_setup, child_setup,
user_data, user_data,
child_handle, child_pid,
standard_input, standard_input,
standard_output, standard_output,
standard_error, standard_error,