fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-09 07:08:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

checkpoint: refactor nm_checkpoint_manager_create() to simplify creating device list

Browse source 
If no device paths are given, we can take the devices directly.
We don't need to first create a list of paths, and then
look them up by path again to add them to the list.
This commit is contained in:
Thomas Haller 2018-03-27 16:42:26 +02:00
parent daf3d5cb53
commit 63e3bff916
1 changed files with 20 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/nm-checkpoint-manager.c
View file

@ -154,53 +154,45 @@ nm_checkpoint_manager_create (NMCheckpointManager *self,
{ {
NMManager *manager; NMManager *manager;
NMCheckpoint *checkpoint; NMCheckpoint *checkpoint;
const char *const *dev_paths;
gs_unref_ptrarray GPtrArray *devices = NULL; gs_unref_ptrarray GPtrArray *devices = NULL;
NMDevice *device; NMDevice *device;
const char *path; const char *path;
gs_free const char **device_paths_free = NULL;
guint i; guint i;
g_return_val_if_fail (self, FALSE); g_return_val_if_fail (self, FALSE);
g_return_val_if_fail (!error || !*error, FALSE); g_return_val_if_fail (!error || !*error, FALSE);
manager = GET_MANAGER (self); manager = GET_MANAGER (self);
if (!device_paths || !device_paths[0]) { devices = g_ptr_array_new ();
const char *device_path;
const CList *tmp_lst; if (!device_paths || !device_paths[0]) {
GPtrArray *paths; const CList *tmp_lst;
paths = g_ptr_array_new ();
nm_manager_for_each_device (manager, device, tmp_lst) { nm_manager_for_each_device (manager, device, tmp_lst) {
if (!nm_device_is_real (device)) if (!nm_device_is_real (device))
continue; continue;
device_path = nm_dbus_object_get_path (NM_DBUS_OBJECT (device)); nm_assert (nm_dbus_object_get_path (NM_DBUS_OBJECT (device)));
if (device_path) g_ptr_array_add (devices, device);
g_ptr_array_add (paths, (gpointer) device_path);
} }
g_ptr_array_add (paths, NULL);
device_paths_free = (const char **) g_ptr_array_free (paths, FALSE);
device_paths = (const char *const *) device_paths_free;
} else if (NM_FLAGS_HAS (flags, NM_CHECKPOINT_CREATE_FLAG_DISCONNECT_NEW_DEVICES)) { } else if (NM_FLAGS_HAS (flags, NM_CHECKPOINT_CREATE_FLAG_DISCONNECT_NEW_DEVICES)) {
g_set_error_literal (error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_INVALID_ARGUMENTS, g_set_error_literal (error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_INVALID_ARGUMENTS,
"the DISCONNECT_NEW_DEVICES flag can only be used with an empty device list"); "the DISCONNECT_NEW_DEVICES flag can only be used with an empty device list");
return NULL; return NULL;
} } else {
for (; *device_paths; device_paths++) {
devices = g_ptr_array_new (); device = nm_manager_get_device_by_path (manager, *device_paths);
for (dev_paths = device_paths; *dev_paths; dev_paths++) { if (!device) {
device = nm_manager_get_device_by_path (manager, *dev_paths); g_set_error (error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_UNKNOWN_DEVICE,
if (!device) { "device %s does not exist", *device_paths);
g_set_error (error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_UNKNOWN_DEVICE, return NULL;
"device %s does not exist", *dev_paths); }
return NULL; if (!nm_device_is_real (device)) {
g_set_error (error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_UNKNOWN_DEVICE,
"device %s is not realized", *device_paths);
return NULL;
}
g_ptr_array_add (devices, device);
} }
if (!nm_device_is_real (device)) {
g_set_error (error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_UNKNOWN_DEVICE,
"device %s is not realized", *dev_paths);
return NULL;
}
g_ptr_array_add (devices, device);
} }
if (!NM_FLAGS_HAS (flags, NM_CHECKPOINT_CREATE_FLAG_DESTROY_ALL)) { if (!NM_FLAGS_HAS (flags, NM_CHECKPOINT_CREATE_FLAG_DESTROY_ALL)) {