fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-04 16:50:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: use _NM_GET_PRIVATE() macros

Browse source 
(cherry picked from commit cdf6ad4057)
This commit is contained in:
Thomas Haller 2016-09-05 16:55:07 +02:00
parent 5bac57496c
commit 3940d63a7e
15 changed files with 26 additions and 180 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -127,18 +127,7 @@ NM_GOBJECT_PROPERTIES_DEFINE (NMDeviceEthernet,
G_DEFINE_TYPE (NMDeviceEthernet, nm_device_ethernet, NM_TYPE_DEVICE)
#define NM_DEVICE_ETHERNET_GET_PRIVATE(self) \
({ \
/* preserve the const-ness of self. Unfortunately, that
* way, @self cannot be a void pointer */ \
typeof (self) _self = (self); \
\
/* Get compiler error if variable is of wrong type */ \
_nm_unused const NMDeviceEthernet *_self2 = (_self); \
\
nm_assert (NM_IS_DEVICE_ETHERNET (_self)); \
_self->_priv; \
})
#define NM_DEVICE_ETHERNET_GET_PRIVATE(self) _NM_GET_PRIVATE_PTR(self, NMDeviceEthernet, NM_IS_DEVICE_ETHERNET)
/*****************************************************************************/

13
src/devices/nm-device-veth.c
View file

@ -62,18 +62,7 @@ NM_GOBJECT_PROPERTIES_DEFINE (NMDeviceVeth,
G_DEFINE_TYPE (NMDeviceVeth, nm_device_veth, NM_TYPE_DEVICE_ETHERNET)
#define NM_DEVICE_VETH_GET_PRIVATE(self) \
({ \
/* preserve the const-ness of self. Unfortunately, that
* way, @self cannot be a void pointer */ \
typeof (self) _self = (self); \
\
/* Get compiler error if variable is of wrong type */ \
_nm_unused const NMDeviceVeth *_self2 = (_self); \
\
nm_assert (NM_IS_DEVICE_VETH (_self)); \
&_self->_priv; \
})
#define NM_DEVICE_VETH_GET_PRIVATE(self) _NM_GET_PRIVATE(self, NMDeviceVeth, NM_IS_DEVICE_VETH)
/*****************************************************************************/

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

@ -75,18 +75,7 @@ _LOG_DECLARE_SELF (NMDevice);
G_DEFINE_ABSTRACT_TYPE (NMDevice, nm_device, NM_TYPE_EXPORTED_OBJECT)
#define NM_DEVICE_GET_PRIVATE(self) \
({ \
/* preserve the const-ness of self. Unfortunately, that
* way, @self cannot be a void pointer */ \
typeof (self) _self = (self); \
\
/* Get compiler error if variable is of wrong type */ \
_nm_unused const NMDevice *_self2 = (_self); \
\
nm_assert (NM_IS_DEVICE (_self)); \
_self->priv; \
})
#define NM_DEVICE_GET_PRIVATE(self) _NM_GET_PRIVATE_PTR(self, NMDevice, NM_IS_DEVICE)
enum {
STATE_CHANGED,
@ -2029,7 +2018,7 @@ link_type_compatible (NMDevice *self,
return FALSE;
}
device_type = self->priv->link_type;
device_type = self->_priv->link_type;
if (device_type > NM_LINK_TYPE_UNKNOWN && device_type != link_type) {
g_set_error (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_FAILED,
"Needed link type 0x%x does not match the platform link type 0x%X",
@ -10064,7 +10053,7 @@ nm_device_set_unmanaged_by_user_udev (NMDevice *self)
int ifindex;
gboolean platform_unmanaged = FALSE;
ifindex = self->priv->ifindex;
ifindex = self->_priv->ifindex;
if ( ifindex <= 0
|| !nm_platform_link_get_unmanaged (NM_PLATFORM_GET, ifindex, &platform_unmanaged))
@ -10151,7 +10140,7 @@ nm_device_reapply_settings_immediately (NMDevice *self)
if (g_strcmp0 ((zone = nm_setting_connection_get_zone (s_con_settings)),
nm_setting_connection_get_zone (s_con_applied)) != 0) {
version_id = nm_active_connection_version_id_bump ((NMActiveConnection *) self->priv->act_request);
version_id = nm_active_connection_version_id_bump ((NMActiveConnection *) self->_priv->act_request);
_LOGD (LOGD_DEVICE, "reapply setting: zone = %s%s%s (version-id %llu)", NM_PRINT_FMT_QUOTE_STRING (zone), (long long unsigned) version_id);
g_object_set (G_OBJECT (s_con_applied),
@ -10163,7 +10152,7 @@ nm_device_reapply_settings_immediately (NMDevice *self)
if ((metered = nm_setting_connection_get_metered (s_con_settings)) != nm_setting_connection_get_metered (s_con_applied)) {
version_id = nm_active_connection_version_id_bump ((NMActiveConnection *) self->priv->act_request);
version_id = nm_active_connection_version_id_bump ((NMActiveConnection *) self->_priv->act_request);
_LOGD (LOGD_DEVICE, "reapply setting: metered = %d (version-id %llu)", (int) metered, (long long unsigned) version_id);
g_object_set (G_OBJECT (s_con_applied),
@ -10342,22 +10331,22 @@ nm_device_check_connection_available (NMDevice *self,
static gboolean
available_connections_del_all (NMDevice *self)
{
if (g_hash_table_size (self->priv->available_connections) == 0)
if (g_hash_table_size (self->_priv->available_connections) == 0)
return FALSE;
g_hash_table_remove_all (self->priv->available_connections);
g_hash_table_remove_all (self->_priv->available_connections);
return TRUE;
}
static gboolean
available_connections_add (NMDevice *self, NMConnection *connection)
{
return nm_g_hash_table_add (self->priv->available_connections, g_object_ref (connection));
return nm_g_hash_table_add (self->_priv->available_connections, g_object_ref (connection));
}
static gboolean
available_connections_del (NMDevice *self, NMConnection *connection)
{
return g_hash_table_remove (self->priv->available_connections, connection);
return g_hash_table_remove (self->_priv->available_connections, connection);
}
static gboolean
@ -12103,7 +12092,7 @@ nm_device_init (NMDevice *self)
priv = G_TYPE_INSTANCE_GET_PRIVATE (self, NM_TYPE_DEVICE, NMDevicePrivate);
self->priv = priv;
self->_priv = priv;
priv->type = NM_DEVICE_TYPE_UNKNOWN;
priv->capabilities = NM_DEVICE_CAP_NM_SUPPORTED;

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

@ -125,7 +125,7 @@ struct _NMDevice {
NMExportedObject parent;
/* private */
struct _NMDevicePrivate *priv;
struct _NMDevicePrivate *_priv;
};
/* The flags have an relaxing meaning, that means, specifying more flags, can make

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

@ -138,18 +138,7 @@ struct _NMDeviceWifiClass
G_DEFINE_TYPE (NMDeviceWifi, nm_device_wifi, NM_TYPE_DEVICE)
#define NM_DEVICE_WIFI_GET_PRIVATE(self) \
({ \
/* preserve the const-ness of self. Unfortunately, that
* way, @self cannot be a void pointer */ \
typeof (self) _self = (self); \
\
/* Get compiler error if variable is of wrong type */ \
_nm_unused const NMDeviceWifi *_self2 = (_self); \
\
nm_assert (NM_IS_DEVICE_WIFI (_self)); \
&_self->_priv; \
})
#define NM_DEVICE_WIFI_GET_PRIVATE(self) _NM_GET_PRIVATE(self, NMDeviceWifi, NM_IS_DEVICE_WIFI)
/*****************************************************************************/

13
src/devices/wifi/nm-wifi-ap.c
View file

@ -68,18 +68,7 @@ struct _NMAccessPointClass{
NMExportedObjectClass parent;
};
#define NM_AP_GET_PRIVATE(self) \
({ \
/* preserve the const-ness of self. Unfortunately, that
* way, @self cannot be a void pointer */ \
typeof (self) _self = (self); \
\
/* Get compiler error if variable is of wrong type */ \
_nm_unused const NMAccessPoint *_self2 = (_self); \
\
nm_assert (NM_IS_AP (_self)); \
&_self->_priv; \
})
#define NM_AP_GET_PRIVATE(self) _NM_GET_PRIVATE(self, NMAccessPoint, NM_IS_AP)
G_DEFINE_TYPE (NMAccessPoint, nm_ap, NM_TYPE_EXPORTED_OBJECT)

13
src/dns-manager/nm-dns-manager.c
View file

@ -151,18 +151,7 @@ G_DEFINE_TYPE (NMDnsManager, nm_dns_manager, G_TYPE_OBJECT)
NM_DEFINE_SINGLETON_INSTANCE (NMDnsManager);
#define NM_DNS_MANAGER_GET_PRIVATE(self) \
({ \
/* preserve the const-ness of self. Unfortunately, that
* way, @self cannot be a void pointer */ \
typeof (self) _self = (self); \
\
/* Get compiler error if variable is of wrong type */ \
_nm_unused const NMDnsManager *_self2 = (_self); \
\
nm_assert (NM_IS_DNS_MANAGER (_self)); \
&_self->_priv; \
})
#define NM_DNS_MANAGER_GET_PRIVATE(self) _NM_GET_PRIVATE(self, NMDnsManager, NM_IS_DNS_MANAGER)
/*****************************************************************************/

13
src/nm-auth-subject.c
View file

@ -68,18 +68,7 @@ struct _NMAuthSubjectClass {
G_DEFINE_TYPE (NMAuthSubject, nm_auth_subject, G_TYPE_OBJECT)
#define NM_AUTH_SUBJECT_GET_PRIVATE(self) \
({ \
/* preserve the const-ness of self. Unfortunately, that
* way, @self cannot be a void pointer */ \
typeof (self) _self = (self); \
\
/* Get compiler error if variable is of wrong type */ \
_nm_unused const NMAuthSubject *_self2 = (_self); \
\
nm_assert (NM_IS_AUTH_SUBJECT (_self)); \
&_self->_priv; \
})
#define NM_AUTH_SUBJECT_GET_PRIVATE(self) _NM_GET_PRIVATE(self, NMAuthSubject, NM_IS_AUTH_SUBJECT)
/**************************************************************/

15
src/nm-checkpoint.c
View file

@ -70,7 +70,7 @@ typedef struct {
struct _NMCheckpoint {
NMExportedObject parent;
NMCheckpointPrivate priv;
NMCheckpointPrivate _priv;
};
typedef struct {
@ -79,18 +79,7 @@ typedef struct {
G_DEFINE_TYPE (NMCheckpoint, nm_checkpoint, NM_TYPE_EXPORTED_OBJECT)
#define NM_CHECKPOINT_GET_PRIVATE(self) \
({ \
/* preserve the const-ness of self. Unfortunately, that
* way, @self cannot be a void pointer */ \
typeof (self) _self = (self); \
\
/* Get compiler error if variable is of wrong type */ \
_nm_unused const NMCheckpoint *_self2 = (_self); \
\
nm_assert (NM_IS_CHECKPOINT (_self)); \
&_self->priv; \
})
#define NM_CHECKPOINT_GET_PRIVATE(self) _NM_GET_PRIVATE(self, NMCheckpoint, NM_IS_CHECKPOINT)
NM_GOBJECT_PROPERTIES_DEFINE_BASE (
PROP_DEVICES,

13
src/nm-ip4-config.c
View file

@ -68,18 +68,7 @@ struct _NMIP4ConfigClass {
G_DEFINE_TYPE (NMIP4Config, nm_ip4_config, NM_TYPE_EXPORTED_OBJECT)
#define NM_IP4_CONFIG_GET_PRIVATE(self) \
({ \
/* preserve the const-ness of self. Unfortunately, that
* way, @self cannot be a void pointer */ \
typeof (self) _self = (self); \
\
/* Get compiler error if variable is of wrong type */ \
_nm_unused const NMIP4Config *_self2 = (_self); \
\
nm_assert (NM_IS_IP4_CONFIG (_self)); \
&_self->_priv; \
})
#define NM_IP4_CONFIG_GET_PRIVATE(self) _NM_GET_PRIVATE(self, NMIP4Config, NM_IS_IP4_CONFIG)
/* internal guint32 are assigned to gobject properties of type uint. Ensure, that uint is large enough */
G_STATIC_ASSERT (sizeof (uint) >= sizeof (guint32));

13
src/nm-ip6-config.c
View file

@ -61,18 +61,7 @@ struct _NMIP6ConfigClass {
G_DEFINE_TYPE (NMIP6Config, nm_ip6_config, NM_TYPE_EXPORTED_OBJECT)
#define NM_IP6_CONFIG_GET_PRIVATE(self) \
({ \
/* preserve the const-ness of self. Unfortunately, that
* way, @self cannot be a void pointer */ \
typeof (self) _self = (self); \
\
/* Get compiler error if variable is of wrong type */ \
_nm_unused const NMIP6Config *_self2 = (_self); \
\
nm_assert (NM_IS_IP6_CONFIG (_self)); \
&_self->_priv; \
})
#define NM_IP6_CONFIG_GET_PRIVATE(self) _NM_GET_PRIVATE(self, NMIP6Config, NM_IS_IP6_CONFIG)
NM_GOBJECT_PROPERTIES_DEFINE (NMIP6Config,
PROP_IFINDEX,

15
src/nm-manager.c
View file

@ -158,21 +158,10 @@ typedef struct {
NMExportedObjectClass parent;
} NMManagerClass;
#define NM_MANAGER_GET_PRIVATE(self) \
({ \
/* preserve the const-ness of self. Unfortunately, that
* way, @self cannot be a void pointer */ \
typeof (self) _self = (self); \
\
/* Get compiler error if variable is of wrong type */ \
_nm_unused const NMManager *_self2 = (_self); \
\
nm_assert (NM_IS_MANAGER (_self)); \
&_self->_priv; \
})
G_DEFINE_TYPE (NMManager, nm_manager, NM_TYPE_EXPORTED_OBJECT)
#define NM_MANAGER_GET_PRIVATE(self) _NM_GET_PRIVATE(self, NMManager, NM_IS_MANAGER)
enum {
DEVICE_ADDED,
INTERNAL_DEVICE_ADDED,

13
src/rdisc/nm-lndp-rdisc.c
View file

@ -60,18 +60,7 @@ struct _NMLndpRDiscClass {
G_DEFINE_TYPE (NMLndpRDisc, nm_lndp_rdisc, NM_TYPE_RDISC)
#define NM_LNDP_RDISC_GET_PRIVATE(self) \
({ \
/* preserve the const-ness of self. Unfortunately, that
* way, @self cannot be a void pointer */ \
typeof (self) _self = (self); \
\
/* Get compiler error if variable is of wrong type */ \
_nm_unused const NMLndpRDisc *_self2 = (_self); \
\
nm_assert (NM_IS_LNDP_RDISC (_self)); \
&_self->_priv; \
})
#define NM_LNDP_RDISC_GET_PRIVATE(self) _NM_GET_PRIVATE(self, NMLndpRDisc, NM_IS_LNDP_RDISC)
/*****************************************************************************/

13
src/rdisc/nm-rdisc.c
View file

@ -87,18 +87,7 @@ static guint signals[LAST_SIGNAL] = { 0 };
G_DEFINE_TYPE (NMRDisc, nm_rdisc, G_TYPE_OBJECT)
#define NM_RDISC_GET_PRIVATE(self) \
({ \
/* preserve the const-ness of self. Unfortunately, that
* way, @self cannot be a void pointer */ \
typeof (self) _self = (self); \
\
/* Get compiler error if variable is of wrong type */ \
_nm_unused const NMRDisc *_self2 = (_self); \
\
nm_assert (NM_IS_RDISC (_self)); \
_self->_priv; \
})
#define NM_RDISC_GET_PRIVATE(self) _NM_GET_PRIVATE_PTR(self, NMRDisc, NM_IS_RDISC)
/*****************************************************************************/

13
src/vpn-manager/nm-vpn-connection.c
View file

@ -168,18 +168,7 @@ struct _NMVpnConnectionClass {
G_DEFINE_TYPE (NMVpnConnection, nm_vpn_connection, NM_TYPE_ACTIVE_CONNECTION)
#define NM_VPN_CONNECTION_GET_PRIVATE(self) \
({ \
/* preserve the const-ness of self. Unfortunately, that
* way, @self cannot be a void pointer */ \
typeof (self) _self = (self); \
\
/* Get compiler error if variable is of wrong type */ \
_nm_unused const NMVpnConnection *_self2 = (_self); \
\
nm_assert (NM_IS_VPN_CONNECTION (_self)); \
&_self->_priv; \
})
#define NM_VPN_CONNECTION_GET_PRIVATE(self) _NM_GET_PRIVATE(self, NMVpnConnection, NM_IS_VPN_CONNECTION)
/*****************************************************************************/