diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-12-07 16:34:48 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-12-07 16:34:48 +0100 |
| commit | 229ea4547cbc9dc9c81b54e4a1a3f8dcf9ff4fcf (patch) | |
| tree | 60f78a50502ea7b38c85cc1ad5a54846a9cc7c98 | |
| parent | 14bb9419a0886e4bcbbef3851084b614cd6f5790 (diff) | |
| download | NetworkManager-229ea4547cbc9dc9c81b54e4a1a3f8dcf9ff4fcf.tar.gz | |
device: don't pass void* pointer to NM_DEVICE_GET_PRIVATE()
| -rw-r--r-- | src/devices/nm-device.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 2eed430df0..cf59a5adff 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -3019,9 +3019,14 @@ nm_device_can_assume_active_connection (NMDevice *self) } static gboolean -nm_device_emit_recheck_assume (gpointer self) +nm_device_emit_recheck_assume (gpointer user_data) { - NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); + NMDevice *self = user_data; + NMDevicePrivate *priv; + + g_return_val_if_fail (NM_IS_DEVICE (self), G_SOURCE_REMOVE); + + priv = NM_DEVICE_GET_PRIVATE (self); priv->recheck_assume_id = 0; if (!nm_device_get_act_request (self)) { @@ -6389,10 +6394,14 @@ send_arps (NMDevice *self, const char *mode_arg) } static gboolean -arp_announce_round2 (gpointer self) +arp_announce_round2 (gpointer user_data) { - NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); + NMDevice *self = user_data; + NMDevicePrivate *priv; + g_return_val_if_fail (NM_IS_DEVICE (self), G_SOURCE_REMOVE); + + priv = NM_DEVICE_GET_PRIVATE (self); priv->arp_round2_id = 0; if ( priv->state >= NM_DEVICE_STATE_IP_CONFIG |