summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2018-03-28 16:59:39 +0200
committerThomas Haller <thaller@redhat.com>2018-03-29 11:24:32 +0200
commit14da3b9c442f3474f475776279f96d399f2286aa (patch)
tree4288e2dd38d2ace8879cd5b24a441e24ef7c7df8
parent6d3c345fc855c23c59ed756543e81fbc8359e1ba (diff)
downloadNetworkManager-14da3b9c442f3474f475776279f96d399f2286aa.tar.gz
libnm: minor cleanup of nm_manager_get_device_by_path()
-rw-r--r--libnm/nm-manager.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/libnm/nm-manager.c b/libnm/nm-manager.c
index 6ad5ad9d38..7c65f3906b 100644
--- a/libnm/nm-manager.c
+++ b/libnm/nm-manager.c
@@ -790,8 +790,7 @@ NMDevice *
nm_manager_get_device_by_path (NMManager *manager, const char *object_path)
{
const GPtrArray *devices;
- int i;
- NMDevice *device = NULL;
+ guint i;
g_return_val_if_fail (NM_IS_MANAGER (manager), NULL);
g_return_val_if_fail (object_path, NULL);
@@ -800,12 +799,11 @@ nm_manager_get_device_by_path (NMManager *manager, const char *object_path)
for (i = 0; i < devices->len; i++) {
NMDevice *candidate = g_ptr_array_index (devices, i);
if (!strcmp (nm_object_get_path (NM_OBJECT (candidate)), object_path)) {
- device = candidate;
- break;
+ return candidate;
}
}
- return device;
+ return NULL;
}
NMDevice *