diff options
author | Thomas Haller <thaller@redhat.com> | 2016-01-10 14:56:05 +0100 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2016-01-11 14:05:49 +0100 |
commit | 633e105455516f0f8a53a59d6ea15e5abe6d03cd (patch) | |
tree | ec662e27449402573e646148bfd006da7d9a7808 /src/devices | |
parent | 169c5b7a525d3ebf6f203db5a248fd92438b6040 (diff) | |
download | NetworkManager-633e105455516f0f8a53a59d6ea15e5abe6d03cd.tar.gz |
device/trivial: rename realize/setup function in NMDevice
Diffstat (limited to 'src/devices')
-rw-r--r-- | src/devices/nm-device.c | 20 | ||||
-rw-r--r-- | src/devices/nm-device.h | 6 |
2 files changed, 13 insertions, 13 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 9b65afee74..a2db743b56 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -1700,23 +1700,23 @@ link_type_compatible (NMDevice *self, } /** - * nm_device_realize(): + * nm_device_realize_start(): * @self: the #NMDevice * @plink: an existing platform link or %NULL * @out_compatible: %TRUE on return if @self is compatible with @plink * @error: location to store error, or %NULL * * Initializes and sets up the device using existing backing resources. Before - * the device is ready for use nm_device_setup_finish() must be called. + * the device is ready for use nm_device_realize_finish() must be called. * @out_compatible will only be set if @plink is not %NULL, and * * Returns: %TRUE on success, %FALSE on error */ gboolean -nm_device_realize (NMDevice *self, - NMPlatformLink *plink, - gboolean *out_compatible, - GError **error) +nm_device_realize_start (NMDevice *self, + NMPlatformLink *plink, + gboolean *out_compatible, + GError **error) { NM_SET_OUT (out_compatible, TRUE); @@ -1771,7 +1771,7 @@ nm_device_create_and_realize (NMDevice *self, } realize_start_setup (self, plink); - nm_device_setup_finish (self, plink); + nm_device_realize_finish (self, plink); g_return_val_if_fail (nm_device_check_connection_compatible (self, connection), TRUE); return TRUE; @@ -1869,7 +1869,7 @@ realize_start_setup (NMDevice *self, const NMPlatformLink *plink) klass = NM_DEVICE_GET_CLASS (self); - /* Balanced by a thaw in nm_device_setup_finish() */ + /* Balanced by a thaw in nm_device_realize_finish() */ g_object_freeze_notify (G_OBJECT (self)); if (plink) { @@ -1949,7 +1949,7 @@ realize_start_setup (NMDevice *self, const NMPlatformLink *plink) } /** - * nm_device_setup_finish(): + * nm_device_realize_finish(): * @self: the #NMDevice * @plink: the #NMPlatformLink if backed by a kernel netdevice * @@ -1958,7 +1958,7 @@ realize_start_setup (NMDevice *self, const NMPlatformLink *plink) * is ready for network connectivity. */ void -nm_device_setup_finish (NMDevice *self, const NMPlatformLink *plink) +nm_device_realize_finish (NMDevice *self, const NMPlatformLink *plink) { g_return_if_fail (!plink || link_type_compatible (self, plink->type, NULL, NULL)); diff --git a/src/devices/nm-device.h b/src/devices/nm-device.h index 6b004a48ca..997dd2d456 100644 --- a/src/devices/nm-device.h +++ b/src/devices/nm-device.h @@ -467,16 +467,16 @@ gboolean nm_device_get_is_nm_owned (NMDevice *device); gboolean nm_device_has_capability (NMDevice *self, NMDeviceCapabilities caps); -gboolean nm_device_realize (NMDevice *device, +gboolean nm_device_realize_start (NMDevice *device, NMPlatformLink *plink, gboolean *out_compatible, GError **error); +void nm_device_realize_finish (NMDevice *self, + const NMPlatformLink *plink); gboolean nm_device_create_and_realize (NMDevice *self, NMConnection *connection, NMDevice *parent, GError **error); -void nm_device_setup_finish (NMDevice *self, - const NMPlatformLink *plink); gboolean nm_device_unrealize (NMDevice *device, gboolean remove_resources, GError **error); |