From 4809898e087f810d873fb9a78e76e9e1f4356793 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 20 May 2014 16:56:29 -0500 Subject: [PATCH] trivial: simplify nm_device_set_is_nm_owned() Nothing used its return value or passed FALSE. --- src/devices/nm-device.c | 18 ++++-------------- src/devices/nm-device.h | 3 +-- src/nm-manager.c | 2 +- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 4f368807ae..e3ef0c8691 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -4722,22 +4722,12 @@ nm_device_get_is_nm_owned (NMDevice *device) return NM_DEVICE_GET_PRIVATE (device)->is_nm_owned; } -gboolean -nm_device_set_is_nm_owned (NMDevice *device, - gboolean is_nm_owned) +void +nm_device_set_nm_owned (NMDevice *device) { - NMDevicePrivate *priv; + g_return_if_fail (NM_IS_DEVICE (device)); - g_return_val_if_fail (NM_IS_DEVICE (device), FALSE); - - priv = NM_DEVICE_GET_PRIVATE (device); - - if (is_nm_owned == priv->is_nm_owned) - return TRUE; - if (!is_nm_owned) - return FALSE; - priv->is_nm_owned = TRUE; - return TRUE; + NM_DEVICE_GET_PRIVATE (device)->is_nm_owned = TRUE; } /* diff --git a/src/devices/nm-device.h b/src/devices/nm-device.h index 404324f43e..d63faecd0a 100644 --- a/src/devices/nm-device.h +++ b/src/devices/nm-device.h @@ -317,8 +317,7 @@ void nm_device_set_initial_unmanaged_flag (NMDevice *device, gboolean unmanaged); gboolean nm_device_get_is_nm_owned (NMDevice *device); -gboolean nm_device_set_is_nm_owned (NMDevice *device, - gboolean is_nm_owned); +void nm_device_set_nm_owned (NMDevice *device); gboolean nm_device_get_autoconnect (NMDevice *device); diff --git a/src/nm-manager.c b/src/nm-manager.c index 4fd8957f88..c1a116b29b 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -1086,7 +1086,7 @@ system_create_virtual_device (NMManager *self, NMConnection *connection) } if (device) { - nm_device_set_is_nm_owned (device, TRUE); + nm_device_set_nm_owned (device); add_device (self, device, FALSE); g_object_unref (device); }