diff options
author | Philip Withnall <philip@tecnocode.co.uk> | 2018-07-13 12:21:13 +0000 |
---|---|---|
committer | Philip Withnall <philip@tecnocode.co.uk> | 2018-07-13 12:21:13 +0000 |
commit | b9d390dc442deb9ce2a92bc25c13c781d219240c (patch) | |
tree | 38cc8efd604ac152aa9195c8e7313ac7ace7984c | |
parent | b7f7f75bf1e016e7b77293159e177e87cd13fc3c (diff) | |
parent | 102bcaffa24b333beb11550db1b5026ed198ff3f (diff) | |
download | glib-b9d390dc442deb9ce2a92bc25c13c781d219240c.tar.gz |
Merge branch 'indentation_correction_gspawn' into 'master'
gspawn: correct indentation in do_posix_spawn
See merge request GNOME/glib!180
-rw-r--r-- | glib/gspawn.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/glib/gspawn.c b/glib/gspawn.c index dfd97b1a8..1ab33077c 100644 --- a/glib/gspawn.c +++ b/glib/gspawn.c @@ -1417,24 +1417,24 @@ do_posix_spawn (gchar **argv, GINT_TO_POINTER (child_close_fds[i])); } - r = posix_spawnattr_setflags (&attr, POSIX_SPAWN_SETSIGDEF); - if (r != 0) - goto out_free_spawnattr; - - /* Reset some signal handlers that we may use */ - sigemptyset (&mask); - sigaddset (&mask, SIGCHLD); - sigaddset (&mask, SIGINT); - sigaddset (&mask, SIGTERM); - sigaddset (&mask, SIGHUP); - - r = posix_spawnattr_setsigdefault (&attr, &mask); - if (r != 0) - goto out_free_spawnattr; - - r = posix_spawn_file_actions_init (&file_actions); - if (r != 0) - goto out_free_spawnattr; + r = posix_spawnattr_setflags (&attr, POSIX_SPAWN_SETSIGDEF); + if (r != 0) + goto out_free_spawnattr; + + /* Reset some signal handlers that we may use */ + sigemptyset (&mask); + sigaddset (&mask, SIGCHLD); + sigaddset (&mask, SIGINT); + sigaddset (&mask, SIGTERM); + sigaddset (&mask, SIGHUP); + + r = posix_spawnattr_setsigdefault (&attr, &mask); + if (r != 0) + goto out_free_spawnattr; + + r = posix_spawn_file_actions_init (&file_actions); + if (r != 0) + goto out_free_spawnattr; /* Redirect pipes as required */ |