diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-03-27 19:26:11 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-03-29 11:24:32 +0200 |
| commit | 26d296d2fe93d0f62cdf39989f80b8104a72b575 (patch) | |
| tree | e245f5a8d34131116f295b9aafe35b7125237d13 | |
| parent | fe9e18b515a99a227ae90ec12670f5b1e19933b6 (diff) | |
| download | NetworkManager-26d296d2fe93d0f62cdf39989f80b8104a72b575.tar.gz | |
checkpoint: simplify device_checkpoint_create() to never fail
It never failed already. Don't pretend it could.
| -rw-r--r-- | src/nm-checkpoint.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/nm-checkpoint.c b/src/nm-checkpoint.c index ce36c7c9aa..a202c0639f 100644 --- a/src/nm-checkpoint.c +++ b/src/nm-checkpoint.c @@ -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; |