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

cli: refactor cleanup in do_device_reapply()

Browse Source
This commit is contained in:
Thomas Haller
2016-04-30 13:46:18 +02:00
parent c71bd9df82
commit b217b68b80
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
clients/cli/devices.c
View File

@@ -1855,11 +1855,12 @@ reapply_device_cb (GObject *object, GAsyncResult *result, gpointer user_data)
static NMCResultCode static NMCResultCode
do_device_reapply (NmCli *nmc, int argc, char **argv) do_device_reapply (NmCli *nmc, int argc, char **argv)
{ {
NMDevice **devices; gs_free NMDevice **devices = NULL;
NMDevice *device; NMDevice *device;
DeviceCbInfo *info = NULL; DeviceCbInfo *info = NULL;
GSList *queue = NULL, *iter; gs_free_slist GSList *queue = NULL;
char **arg_arr = NULL; GSList *iter;
gs_strfreev char **arg_arr = NULL;
char **arg_ptr = argv; char **arg_ptr = argv;
int arg_num = argc; int arg_num = argc;
int i; int i;
@@ -1878,7 +1879,7 @@ do_device_reapply (NmCli *nmc, int argc, char **argv)
if (arg_num == 0) { if (arg_num == 0) {
g_string_printf (nmc->return_text, _("Error: No interface specified.")); g_string_printf (nmc->return_text, _("Error: No interface specified."));
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; 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 */ /* Take next argument */
next_arg (&arg_num, &arg_ptr); next_arg (&arg_num, &arg_ptr);
} }
g_free (devices);
if (!queue) { if (!queue) {
g_string_printf (nmc->return_text, _("Error: no valid device provided.")); g_string_printf (nmc->return_text, _("Error: no valid device provided."));
nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND;
goto error; return nmc->return_value;
} }
queue = g_slist_reverse (queue); 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); 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; return nmc->return_value;
} }