From c714f7ad53cd7b5011c9dba6090f75ddaeb91501 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 29 Apr 2014 16:12:25 +0200 Subject: [PATCH] core: refactor to return const GSList * from nm_manager_get_devices() Signed-off-by: Thomas Haller --- src/devices/wifi/nm-device-olpc-mesh.c | 2 +- src/nm-manager.c | 2 +- src/nm-manager.h | 2 +- src/nm-policy.c | 25 ++++++++++--------------- 4 files changed, 13 insertions(+), 18 deletions(-) diff --git a/src/devices/wifi/nm-device-olpc-mesh.c b/src/devices/wifi/nm-device-olpc-mesh.c index 9c25fd026a..5631eec571 100644 --- a/src/devices/wifi/nm-device-olpc-mesh.c +++ b/src/devices/wifi/nm-device-olpc-mesh.c @@ -416,7 +416,7 @@ static void find_companion (NMDeviceOlpcMesh *self) { NMDeviceOlpcMeshPrivate *priv = NM_DEVICE_OLPC_MESH_GET_PRIVATE (self); - GSList *list; + const GSList *list; if (priv->companion) return; diff --git a/src/nm-manager.c b/src/nm-manager.c index dde273923d..4662e79b54 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -2064,7 +2064,7 @@ rfkill_manager_rfkill_changed_cb (NMRfkillManager *rfkill_mgr, nm_manager_rfkill_update (NM_MANAGER (user_data), rtype); } -GSList * +const GSList * nm_manager_get_devices (NMManager *manager) { g_return_val_if_fail (NM_IS_MANAGER (manager), NULL); diff --git a/src/nm-manager.h b/src/nm-manager.h index 1b0865fe0d..81eefc7b00 100644 --- a/src/nm-manager.h +++ b/src/nm-manager.h @@ -110,7 +110,7 @@ GSList *nm_manager_get_activatable_connections (NMManager *manager); /* Device handling */ -GSList *nm_manager_get_devices (NMManager *manager); +const GSList *nm_manager_get_devices (NMManager *manager); NMDevice *nm_manager_get_device_by_master (NMManager *manager, const char *master, diff --git a/src/nm-policy.c b/src/nm-policy.c index d751606ed8..da56f96d9f 100644 --- a/src/nm-policy.c +++ b/src/nm-policy.c @@ -95,12 +95,11 @@ static NMDevice * get_best_ip4_device (NMPolicy *self, gboolean fully_activated) { NMPolicyPrivate *priv = NM_POLICY_GET_PRIVATE (self); - GSList *devices, *iter; + const GSList *iter; NMDevice *best = NULL; int best_prio = G_MAXINT; - devices = nm_manager_get_devices (priv->manager); - for (iter = devices; iter; iter = g_slist_next (iter)) { + for (iter = nm_manager_get_devices (priv->manager); iter; iter = g_slist_next (iter)) { NMDevice *dev = NM_DEVICE (iter->data); NMDeviceType devtype = nm_device_get_device_type (dev); NMDeviceState state = nm_device_get_state (dev); @@ -177,12 +176,11 @@ static NMDevice * get_best_ip6_device (NMPolicy *self, gboolean fully_activated) { NMPolicyPrivate *priv = NM_POLICY_GET_PRIVATE (self); - GSList *devices, *iter; + const GSList *iter; NMDevice *best = NULL; int best_prio = G_MAXINT; - devices = nm_manager_get_devices (priv->manager); - for (iter = devices; iter; iter = g_slist_next (iter)) { + for (iter = nm_manager_get_devices (priv->manager); iter; iter = g_slist_next (iter)) { NMDevice *dev = NM_DEVICE (iter->data); NMDeviceType devtype = nm_device_get_device_type (dev); NMDeviceState state = nm_device_get_state (dev); @@ -1814,10 +1812,9 @@ static void schedule_activate_all (NMPolicy *policy) { NMPolicyPrivate *priv = NM_POLICY_GET_PRIVATE (policy); - GSList *iter, *devices; + const GSList *iter; - devices = nm_manager_get_devices (priv->manager); - for (iter = devices; iter; iter = g_slist_next (iter)) + for (iter = nm_manager_get_devices (priv->manager); iter; iter = g_slist_next (iter)) schedule_activate_check (policy, NM_DEVICE (iter->data)); } @@ -1848,11 +1845,10 @@ firewall_update_zone (NMPolicy *policy, NMConnection *connection) { NMPolicyPrivate *priv = NM_POLICY_GET_PRIVATE (policy); NMSettingConnection *s_con = nm_connection_get_setting_connection (connection); - GSList *iter, *devices; + const GSList *iter; - devices = nm_manager_get_devices (priv->manager); /* find dev with passed connection and change zone its interface belongs to */ - for (iter = devices; iter; iter = g_slist_next (iter)) { + for (iter = nm_manager_get_devices (priv->manager); iter; iter = g_slist_next (iter)) { NMDevice *dev = NM_DEVICE (iter->data); if ( (nm_device_get_connection (dev) == connection) @@ -1875,11 +1871,10 @@ firewall_started (NMFirewallManager *manager, NMPolicyPrivate *priv = NM_POLICY_GET_PRIVATE (policy); NMConnection *connection; NMSettingConnection *s_con; - GSList *iter, *devices; + const GSList *iter; - devices = nm_manager_get_devices (priv->manager); /* add interface of each device to correct zone */ - for (iter = devices; iter; iter = g_slist_next (iter)) { + for (iter = nm_manager_get_devices (priv->manager); iter; iter = g_slist_next (iter)) { NMDevice *dev = NM_DEVICE (iter->data); connection = nm_device_get_connection (dev);