diff options
author | Thomas Haller <thaller@redhat.com> | 2016-04-30 13:46:18 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2016-05-03 11:52:40 +0200 |
commit | b217b68b8084d68d1b1a72b7a0a1d4382a1587ec (patch) | |
tree | 2f1dcbe980ae25d2a7ec4e210cb73bcbad493f07 | |
parent | c71bd9df82531e00940602ac91c78675336fecbe (diff) | |
download | NetworkManager-b217b68b8084d68d1b1a72b7a0a1d4382a1587ec.tar.gz |
cli: refactor cleanup in do_device_reapply()
-rw-r--r-- | clients/cli/devices.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/clients/cli/devices.c b/clients/cli/devices.c index ec8d235b9c..0ffaa2b899 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -1847,7 +1847,7 @@ reapply_device_cb (GObject *object, GAsyncResult *result, gpointer user_data) if (nmc->print_output == NMC_PRINT_PRETTY) nmc_terminal_erase_line (); g_print (_("Connection successfully reapplied to device '%s'.\n"), - nm_device_get_iface (device)); + nm_device_get_iface (device)); device_cb_info_finish (info, device); } } @@ -1855,11 +1855,12 @@ reapply_device_cb (GObject *object, GAsyncResult *result, gpointer user_data) static NMCResultCode do_device_reapply (NmCli *nmc, int argc, char **argv) { - NMDevice **devices; + gs_free NMDevice **devices = NULL; NMDevice *device; DeviceCbInfo *info = NULL; - GSList *queue = NULL, *iter; - char **arg_arr = NULL; + gs_free_slist GSList *queue = NULL; + GSList *iter; + gs_strfreev char **arg_arr = NULL; char **arg_ptr = argv; int arg_num = argc; int i; @@ -1878,7 +1879,7 @@ do_device_reapply (NmCli *nmc, int argc, char **argv) if (arg_num == 0) { g_string_printf (nmc->return_text, _("Error: No interface specified.")); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + return nmc->return_value; } } @@ -1906,12 +1907,11 @@ do_device_reapply (NmCli *nmc, int argc, char **argv) /* Take next argument */ next_arg (&arg_num, &arg_ptr); } - g_free (devices); if (!queue) { g_string_printf (nmc->return_text, _("Error: no valid device provided.")); nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; - goto error; + return nmc->return_value; } queue = g_slist_reverse (queue); @@ -1930,9 +1930,6 @@ do_device_reapply (NmCli *nmc, int argc, char **argv) nm_device_reapply_async (device, NULL, 0, 0, NULL, reapply_device_cb, info); } -error: - g_strfreev (arg_arr); - g_slist_free (queue); return nmc->return_value; } |