colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dispatcher: minor cleanup error paths in script_dispatch()

Browse Source 
Handle the error case first and return early.
This commit is contained in:
Thomas Haller
2020-04-29 09:48:52 +02:00
parent 0b168f7b99
commit 259a07ae46
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
dispatcher/nm-dispatcher.c
View File

@@ -482,7 +482,7 @@ check_filename (const char *file_name)
static gboolean static gboolean
script_dispatch (ScriptInfo *script) script_dispatch (ScriptInfo *script)
{ {
GError *error = NULL; gs_free_error GError *error = NULL;
char *argv[4]; char *argv[4];
Request *request = script->request; Request *request = script->request;
@@ -502,20 +502,19 @@ script_dispatch (ScriptInfo *script)
_LOG_S_T (script, "run script%s", script->wait ? "" : " (no-wait)"); _LOG_S_T (script, "run script%s", script->wait ? "" : " (no-wait)");
if (g_spawn_async ("/", argv, request->envp, G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, &script->pid, &error)) { if (!g_spawn_async ("/", argv, request->envp, G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, &script->pid, &error)) {
script->watch_id = g_child_watch_add (script->pid, (GChildWatchFunc) script_watch_cb, script);
script->timeout_id = g_timeout_add_seconds (SCRIPT_TIMEOUT, script_timeout_cb, script);
if (!script->wait)
request->num_scripts_nowait++;
return TRUE;
} else {
_LOG_S_W (script, "complete: failed to execute script: %s", error->message); _LOG_S_W (script, "complete: failed to execute script: %s", error->message);
script->result = DISPATCH_RESULT_EXEC_FAILED; script->result = DISPATCH_RESULT_EXEC_FAILED;
script->error = g_strdup (error->message); script->error = g_strdup (error->message);
request->num_scripts_done++; request->num_scripts_done++;
g_clear_error (&error);
return FALSE; return FALSE;
} }
script->watch_id = g_child_watch_add (script->pid, (GChildWatchFunc) script_watch_cb, script);
script->timeout_id = g_timeout_add_seconds (SCRIPT_TIMEOUT, script_timeout_cb, script);
if (!script->wait)
request->num_scripts_nowait++;
return TRUE;
} }
static gboolean static gboolean