fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-26 11:10:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: pass const NMPlatformLink instance to setup_start()/setup_finish()

Browse source 
NMPlatformLink is a plain struct (not a GObject, for which we usually
don't use const). We certainly don't want the functions to modify the
passed-in data.
This commit is contained in:
Thomas Haller 2015-12-09 17:00:14 +01:00
parent 590b9a830d
commit 2a14a28fe0
10 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/devices/nm-device-ethernet.c
View file

@ -305,7 +305,7 @@ nm_device_ethernet_init (NMDeviceEthernet *self)
}
static void
setup_start (NMDevice *device, NMPlatformLink *plink)
setup_start (NMDevice *device, const NMPlatformLink *plink)
{
NM_DEVICE_CLASS (nm_device_ethernet_parent_class)->setup_start (device, plink);

2
src/devices/nm-device-generic.c
View file

@ -61,7 +61,7 @@ get_type_description (NMDevice *device)
}
static void
setup_start (NMDevice *device, NMPlatformLink *plink)
setup_start (NMDevice *device, const NMPlatformLink *plink)
{
NMDeviceGeneric *self = NM_DEVICE_GENERIC (device);
NMDeviceGenericPrivate *priv = NM_DEVICE_GENERIC_GET_PRIVATE (self);

2
src/devices/nm-device-ip-tunnel.c
View file

@ -771,7 +771,7 @@ create_and_realize (NMDevice *device,
}
static void
setup_start (NMDevice *device, NMPlatformLink *plink)
setup_start (NMDevice *device, const NMPlatformLink *plink)
{
NM_DEVICE_CLASS (nm_device_ip_tunnel_parent_class)->setup_start (device, plink);

2
src/devices/nm-device-macvlan.c
View file

@ -559,7 +559,7 @@ ip4_config_pre_commit (NMDevice *device, NMIP4Config *config)
}
static void
setup_start (NMDevice *device, NMPlatformLink *plink)
setup_start (NMDevice *device, const NMPlatformLink *plink)
{
NM_DEVICE_CLASS (nm_device_macvlan_parent_class)->setup_start (device, plink);

2
src/devices/nm-device-tun.c
View file

@ -241,7 +241,7 @@ realize (NMDevice *device, NMPlatformLink *plink, GError **error)
}
static void
setup_start (NMDevice *device, NMPlatformLink *plink)
setup_start (NMDevice *device, const NMPlatformLink *plink)
{
NM_DEVICE_CLASS (nm_device_tun_parent_class)->setup_start (device, plink);
reload_tun_properties (device);

2
src/devices/nm-device-vlan.c
View file

@ -148,7 +148,7 @@ nm_device_vlan_set_parent (NMDeviceVlan *self, NMDevice *parent)
}
static void
setup_start (NMDevice *device, NMPlatformLink *plink)
setup_start (NMDevice *device, const NMPlatformLink *plink)
{
NMDeviceVlan *self = NM_DEVICE_VLAN (device);
NMDeviceVlanPrivate *priv = NM_DEVICE_VLAN_GET_PRIVATE (self);

2
src/devices/nm-device-vxlan.c
View file

@ -143,7 +143,7 @@ link_changed (NMDevice *device, NMPlatformLink *info)
}
static void
setup_start (NMDevice *device, NMPlatformLink *plink)
setup_start (NMDevice *device, const NMPlatformLink *plink)
{
g_assert (plink->type == NM_LINK_TYPE_VXLAN);

8
src/devices/nm-device.c
View file

@ -1780,7 +1780,7 @@ nm_device_create_and_realize (NMDevice *self,
}
static void
update_device_from_platform_link (NMDevice *self, NMPlatformLink *plink)
update_device_from_platform_link (NMDevice *self, const NMPlatformLink *plink)
{
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
const char *udi;
@ -1836,7 +1836,7 @@ check_carrier (NMDevice *self)
}
static void
setup_start (NMDevice *self, NMPlatformLink *plink)
setup_start (NMDevice *self, const NMPlatformLink *plink)
{
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
static guint32 id = 0;
@ -1943,7 +1943,7 @@ setup_start (NMDevice *self, NMPlatformLink *plink)
}
static void
setup_finish (NMDevice *self, NMPlatformLink *plink)
setup_finish (NMDevice *self, const NMPlatformLink *plink)
{
if (plink) {
update_device_from_platform_link (self, plink);
@ -1952,7 +1952,7 @@ setup_finish (NMDevice *self, NMPlatformLink *plink)
}
void
nm_device_setup_finish (NMDevice *self, NMPlatformLink *plink)
nm_device_setup_finish (NMDevice *self, const NMPlatformLink *plink)
{
g_return_if_fail (!plink || link_type_compatible (self, plink->type, NULL, NULL));

6
src/devices/nm-device.h
View file

@ -197,7 +197,7 @@ typedef struct {
* any tasks that affect other interfaces (like master/slave or parent/child
* stuff).
*/
void (*setup_start) (NMDevice *self, NMPlatformLink *plink);
void (*setup_start) (NMDevice *self, const NMPlatformLink *plink);
/**
* setup_finish():
@ -208,7 +208,7 @@ typedef struct {
* backing resource properties. After this function finishes, the device
* is ready for network connectivity.
*/
void (*setup_finish) (NMDevice *self, NMPlatformLink *plink);
void (*setup_finish) (NMDevice *self, const NMPlatformLink *plink);
/**
* unrealize():
@ -509,7 +509,7 @@ gboolean nm_device_create_and_realize (NMDevice *self,
NMDevice *parent,
GError **error);
void nm_device_setup_finish (NMDevice *self,
NMPlatformLink *plink);
const NMPlatformLink *plink);
gboolean nm_device_unrealize (NMDevice *device,
gboolean remove_resources,
GError **error);

2
src/devices/wifi/nm-device-wifi.c
View file

@ -424,7 +424,7 @@ periodic_update_cb (gpointer user_data)
}
static void
setup_start (NMDevice *device, NMPlatformLink *plink)
setup_start (NMDevice *device, const NMPlatformLink *plink)
{
NM_DEVICE_CLASS (nm_device_wifi_parent_class)->setup_start (device, plink);