From f96abc8be53379898ed2cc1b6eb2f52341a86e3f Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Mon, 4 Jan 2016 10:29:06 +0100 Subject: [PATCH] core: always use gulong to store signal handler ids We inconsistently use gulong,guint,int types to store signal handler id, but the type returned by g_signal_connect() is a gulong. This has no practical consequences because a int/guint is enough to store the value, however it is better to use a consistent type, also because nm_clear_g_signal_handler() accepts a pointer to the signal id and thus it must be always called with the same pointer type. --- shared/nm-macros-internal.h | 2 +- src/devices/nm-device-ethernet.c | 6 +++--- src/devices/nm-device-macvlan.c | 2 +- src/devices/nm-device-vlan.c | 4 ++-- src/devices/nm-device.c | 4 ++-- src/dhcp-manager/nm-dhcp-listener.c | 4 ++-- src/nm-bus-manager.c | 2 +- src/nm-policy.c | 12 ++++++------ src/platform/tests/test-common.c | 2 +- src/platform/tests/test-common.h | 2 +- src/settings/nm-secret-agent.c | 2 +- src/settings/nm-settings.c | 4 ++-- src/settings/plugins/ifcfg-rh/plugin.c | 4 ++-- src/settings/plugins/keyfile/plugin.c | 2 +- src/vpn-manager/nm-vpn-manager.c | 4 ++-- 15 files changed, 28 insertions(+), 28 deletions(-) diff --git a/shared/nm-macros-internal.h b/shared/nm-macros-internal.h index 14430c4277..7bddb4bd84 100644 --- a/shared/nm-macros-internal.h +++ b/shared/nm-macros-internal.h @@ -208,7 +208,7 @@ nm_clear_g_source (guint *id) } static inline gboolean -nm_clear_g_signal_handler (gpointer self, guint *id) +nm_clear_g_signal_handler (gpointer self, gulong *id) { if (id && *id) { g_signal_handler_disconnect (self, *id); diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c index ee516c37ee..338d2a53d6 100644 --- a/src/devices/nm-device-ethernet.c +++ b/src/devices/nm-device-ethernet.c @@ -71,8 +71,8 @@ typedef struct Supplicant { NMSupplicantInterface *iface; /* signal handler ids */ - guint iface_error_id; - guint iface_state_id; + gulong iface_error_id; + gulong iface_state_id; /* Timeouts and idles */ guint iface_con_error_cb_id; @@ -117,7 +117,7 @@ typedef struct { /* DCB */ DcbWait dcb_wait; guint dcb_timeout_id; - guint dcb_carrier_id; + gulong dcb_carrier_id; } NMDeviceEthernetPrivate; enum { diff --git a/src/devices/nm-device-macvlan.c b/src/devices/nm-device-macvlan.c index 12cd95ba58..907d480b2d 100644 --- a/src/devices/nm-device-macvlan.c +++ b/src/devices/nm-device-macvlan.c @@ -47,7 +47,7 @@ G_DEFINE_TYPE (NMDeviceMacvlan, nm_device_macvlan, NM_TYPE_DEVICE) typedef struct { int parent_ifindex; - guint parent_state_id; + gulong parent_state_id; NMDevice *parent; NMPlatformLnkMacvlan props; } NMDeviceMacvlanPrivate; diff --git a/src/devices/nm-device-vlan.c b/src/devices/nm-device-vlan.c index 8e79ce7ef5..5ccddbde38 100644 --- a/src/devices/nm-device-vlan.c +++ b/src/devices/nm-device-vlan.c @@ -49,8 +49,8 @@ G_DEFINE_TYPE (NMDeviceVlan, nm_device_vlan, NM_TYPE_DEVICE) typedef struct { NMDevice *parent; - guint parent_state_id; - guint parent_hwaddr_id; + gulong parent_state_id; + gulong parent_hwaddr_id; int vlan_id; } NMDeviceVlanPrivate; diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index b66c07f6a6..0b7f55eb17 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -174,7 +174,7 @@ typedef struct { NMDevice *slave; gboolean slave_is_enslaved; gboolean configure; - guint watch_id; + gulong watch_id; } SlaveInfo; typedef struct { @@ -354,7 +354,7 @@ typedef struct _NMDevicePrivate { NMDevice * master; gboolean is_enslaved; gboolean master_ready_handled; - guint master_ready_id; + gulong master_ready_id; /* slave management */ gboolean is_master; diff --git a/src/dhcp-manager/nm-dhcp-listener.c b/src/dhcp-manager/nm-dhcp-listener.c index 25f09ff6c7..7378e5fc4e 100644 --- a/src/dhcp-manager/nm-dhcp-listener.c +++ b/src/dhcp-manager/nm-dhcp-listener.c @@ -39,8 +39,8 @@ typedef struct { NMBusManager * dbus_mgr; - guint new_conn_id; - guint dis_conn_id; + gulong new_conn_id; + gulong dis_conn_id; GHashTable * signal_handlers; } NMDhcpListenerPrivate; diff --git a/src/nm-bus-manager.c b/src/nm-bus-manager.c index c3e86b2f8c..a82b38836b 100644 --- a/src/nm-bus-manager.c +++ b/src/nm-bus-manager.c @@ -61,7 +61,7 @@ typedef struct { GDBusProxy *proxy; - guint bus_closed_id; + gulong bus_closed_id; guint reconnect_id; } NMBusManagerPrivate; diff --git a/src/nm-policy.c b/src/nm-policy.c index ba7504cffe..05f7edf4db 100644 --- a/src/nm-policy.c +++ b/src/nm-policy.c @@ -1726,20 +1726,20 @@ static void _connect_manager_signal (NMPolicy *policy, const char *name, gpointer callback) { NMPolicyPrivate *priv = NM_POLICY_GET_PRIVATE (policy); - guint id; + gulong id; id = g_signal_connect (priv->manager, name, callback, policy); - priv->manager_ids = g_slist_prepend (priv->manager_ids, GUINT_TO_POINTER (id)); + priv->manager_ids = g_slist_prepend (priv->manager_ids, (gpointer) id); } static void _connect_settings_signal (NMPolicy *policy, const char *name, gpointer callback) { NMPolicyPrivate *priv = NM_POLICY_GET_PRIVATE (policy); - guint id; + gulong id; id = g_signal_connect (priv->settings, name, callback, policy); - priv->settings_ids = g_slist_prepend (priv->settings_ids, GUINT_TO_POINTER (id)); + priv->settings_ids = g_slist_prepend (priv->settings_ids, (gpointer) id); } NMPolicy * @@ -1889,11 +1889,11 @@ dispose (GObject *object) } for (iter = priv->manager_ids; iter; iter = g_slist_next (iter)) - g_signal_handler_disconnect (priv->manager, GPOINTER_TO_UINT (iter->data)); + g_signal_handler_disconnect (priv->manager, (gulong) iter->data); g_clear_pointer (&priv->manager_ids, g_slist_free); for (iter = priv->settings_ids; iter; iter = g_slist_next (iter)) - g_signal_handler_disconnect (priv->settings, GPOINTER_TO_UINT (iter->data)); + g_signal_handler_disconnect (priv->settings, (gulong) iter->data); g_clear_pointer (&priv->settings_ids, g_slist_free); for (iter = priv->dev_ids; iter; iter = g_slist_next (iter)) { diff --git a/src/platform/tests/test-common.c b/src/platform/tests/test-common.c index be8f736c8e..426b6b1674 100644 --- a/src/platform/tests/test-common.c +++ b/src/platform/tests/test-common.c @@ -322,7 +322,7 @@ nmtstp_wait_for_signal (guint timeout_ms) { WaitForSignalData data = { 0 }; - guint id_link, id_ip4_address, id_ip6_address, id_ip4_route, id_ip6_route; + gulong id_link, id_ip4_address, id_ip6_address, id_ip4_route, id_ip6_route; data.loop = g_main_loop_new (NULL, FALSE); diff --git a/src/platform/tests/test-common.h b/src/platform/tests/test-common.h index b240cbfbb6..0281d3c533 100644 --- a/src/platform/tests/test-common.h +++ b/src/platform/tests/test-common.h @@ -39,7 +39,7 @@ /*********************************************************************************************/ typedef struct { - int handler_id; + gulong handler_id; const char *name; NMPlatformSignalChangeType change_type; gint received_count; diff --git a/src/settings/nm-secret-agent.c b/src/settings/nm-secret-agent.c index 68fdab029c..89e84c2690 100644 --- a/src/settings/nm-secret-agent.c +++ b/src/settings/nm-secret-agent.c @@ -73,7 +73,7 @@ typedef struct { NMBusManager *bus_mgr; GDBusConnection *connection; gboolean connection_is_private; - guint on_disconnected_id; + gulong on_disconnected_id; GHashTable *requests; } NMSecretAgentPrivate; diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c index 20076057a9..f6f8c3743e 100644 --- a/src/settings/nm-settings.c +++ b/src/settings/nm-settings.c @@ -152,8 +152,8 @@ typedef struct { char *file; GFileMonitor *monitor; GFileMonitor *dhcp_monitor; - guint monitor_id; - guint dhcp_monitor_id; + gulong monitor_id; + gulong dhcp_monitor_id; GDBusProxy *hostnamed_proxy; } hostname; } NMSettingsPrivate; diff --git a/src/settings/plugins/ifcfg-rh/plugin.c b/src/settings/plugins/ifcfg-rh/plugin.c index c89a490c81..5afc46d609 100644 --- a/src/settings/plugins/ifcfg-rh/plugin.c +++ b/src/settings/plugins/ifcfg-rh/plugin.c @@ -89,14 +89,14 @@ typedef struct { GDBusConnection *connection; GDBusInterfaceSkeleton *interface; GCancellable *cancellable; - guint signal_id; + gulong signal_id; } dbus; GHashTable *connections; /* uuid::connection */ gboolean initialized; GFileMonitor *ifcfg_monitor; - guint ifcfg_monitor_id; + gulong ifcfg_monitor_id; } SettingsPluginIfcfgPrivate; static SettingsPluginIfcfg *settings_plugin_ifcfg_get (void); diff --git a/src/settings/plugins/keyfile/plugin.c b/src/settings/plugins/keyfile/plugin.c index fe7e64a7c3..30ef9c31b4 100644 --- a/src/settings/plugins/keyfile/plugin.c +++ b/src/settings/plugins/keyfile/plugin.c @@ -56,7 +56,7 @@ typedef struct { gboolean initialized; GFileMonitor *monitor; - guint monitor_id; + gulong monitor_id; NMConfig *config; } SettingsPluginKeyfilePrivate; diff --git a/src/vpn-manager/nm-vpn-manager.c b/src/vpn-manager/nm-vpn-manager.c index f39ddf6c11..45d22998b9 100644 --- a/src/vpn-manager/nm-vpn-manager.c +++ b/src/vpn-manager/nm-vpn-manager.c @@ -40,8 +40,8 @@ typedef struct { GSList *plugins; GFileMonitor *monitor_etc; GFileMonitor *monitor_lib; - guint monitor_id_etc; - guint monitor_id_lib; + gulong monitor_id_etc; + gulong monitor_id_lib; /* This is only used for services that don't support multiple * connections, to guard access to them. */