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

core: minor code cleanup in nm-device-wimax.c

Browse source 
Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Thomas Haller 2013-12-13 15:43:27 +01:00
parent 3bda3fb60c
commit d21775ece2
1 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/devices/wimax/nm-device-wimax.c
View file

@ -167,14 +167,9 @@ impl_device_get_nsp_list (NMDeviceWimax *self, GPtrArray **nsps, GError **error)
NMDeviceWimaxPrivate *priv = NM_DEVICE_WIMAX_GET_PRIVATE (self);
GSList *iter;
*nsps = g_ptr_array_sized_new (g_slist_length (priv->nsp_list));
for (iter = priv->nsp_list; iter; iter = iter->next) {
const char *path;
path = nm_wimax_nsp_get_dbus_path (NM_WIMAX_NSP (iter->data));
if (path)
g_ptr_array_add (*nsps, g_strdup (path));
}
*nsps = g_ptr_array_sized_new (4);
for (iter = priv->nsp_list; iter; iter = iter->next)
g_ptr_array_add (*nsps, g_strdup (nm_wimax_nsp_get_dbus_path (NM_WIMAX_NSP (iter->data))));
return TRUE;
}
@ -231,7 +226,7 @@ remove_all_nsps (NMDeviceWimax *self)
set_current_nsp (self, NULL);
while (g_slist_length (priv->nsp_list)) {
while (priv->nsp_list) {
NMWimaxNsp *nsp = NM_WIMAX_NSP (priv->nsp_list->data);
priv->nsp_list = g_slist_remove (priv->nsp_list, nsp);
@ -240,9 +235,6 @@ remove_all_nsps (NMDeviceWimax *self)
}
nm_device_recheck_available_connections (NM_DEVICE (self));
g_slist_free (priv->nsp_list);
priv->nsp_list = NULL;
}
static NMWimaxNsp *
@ -251,6 +243,8 @@ get_nsp_by_name (NMDeviceWimax *self, const char *name)
NMDeviceWimaxPrivate *priv = NM_DEVICE_WIMAX_GET_PRIVATE (self);
GSList *iter;
g_return_val_if_fail (name, NULL);
for (iter = priv->nsp_list; iter; iter = iter->next) {
NMWimaxNsp *nsp = NM_WIMAX_NSP (iter->data);
@ -267,10 +261,12 @@ get_nsp_by_path (NMDeviceWimax *self, const char *path)
NMDeviceWimaxPrivate *priv = NM_DEVICE_WIMAX_GET_PRIVATE (self);
GSList *iter;
g_return_val_if_fail (path, NULL);
for (iter = priv->nsp_list; iter; iter = iter->next) {
NMWimaxNsp *nsp = NM_WIMAX_NSP (iter->data);
if (!g_strcmp0 (nm_wimax_nsp_get_dbus_path (nsp), path))
if (!strcmp (nm_wimax_nsp_get_dbus_path (nsp), path))
return nsp;
}