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

checkpoint: simplify device_checkpoint_create() to never fail

Browse source 
It never failed already. Don't pretend it could.
This commit is contained in:
Thomas Haller 2018-03-27 19:26:11 +02:00
parent e6e0eb92b9
commit 6f28749ad4
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/nm-checkpoint.c
View file

@ -365,8 +365,7 @@ next_dev:
}
static DeviceCheckpoint *
device_checkpoint_create (NMDevice *device,
GError **error)
device_checkpoint_create (NMDevice *device)
{
DeviceCheckpoint *dev_checkpoint;
NMConnection *applied_connection;
@ -374,6 +373,8 @@ device_checkpoint_create (NMDevice *device,
const char *path;
NMActRequest *act_request;
nm_assert (NM_IS_DEVICE (device));
path = nm_dbus_object_get_path (NM_DBUS_OBJECT (device));
dev_checkpoint = g_slice_new0 (DeviceCheckpoint);
@ -471,8 +472,6 @@ nm_checkpoint_new (NMManager *manager, GPtrArray *devices, guint32 rollback_time
NMCheckpoint *self;
NMCheckpointPrivate *priv;
NMSettingsConnection *const *con;
DeviceCheckpoint *dev_checkpoint;
NMDevice *device;
guint i;
g_return_val_if_fail (manager, NULL);
@ -508,13 +507,11 @@ nm_checkpoint_new (NMManager *manager, GPtrArray *devices, guint32 rollback_time
}
for (i = 0; i < devices->len; i++) {
device = (NMDevice *) devices->pdata[i];
dev_checkpoint = device_checkpoint_create (device, error);
if (!dev_checkpoint) {
g_object_unref (self);
return NULL;
}
g_hash_table_insert (priv->devices, device, dev_checkpoint);
NMDevice *device = devices->pdata[i];
g_hash_table_insert (priv->devices,
device,
device_checkpoint_create (device));
}
return self;