fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-05 00:38:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clean up indentation; make implicit errors really errors

Browse source 
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2925 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2007-10-02 13:07:25 +00:00
parent 694278a5e9
commit 39910e16fe
1 changed files with 37 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
src/nm-device-802-11-wireless.c
View file

@ -401,14 +401,17 @@ constructor (GType type,
GObjectConstructParam *construct_params)
{
GObject *object;
GObjectClass *klass;
NMDevice80211Wireless *self;
NMDevice80211WirelessPrivate *priv;
const char *iface;
NMSock *sk;
NMSock *sk = NULL;
struct iw_range range;
struct iwreq wrq;
int i;
object = G_OBJECT_CLASS (nm_device_802_11_wireless_parent_class)->constructor (type,
n_construct_params,
construct_params);
klass = G_OBJECT_CLASS (nm_device_802_11_wireless_parent_class);
object = klass->constructor (type, n_construct_params, construct_params);
if (!object)
return NULL;
@ -416,44 +419,45 @@ constructor (GType type,
priv = NM_DEVICE_802_11_WIRELESS_GET_PRIVATE (self);
iface = nm_device_get_iface (NM_DEVICE (self));
sk = nm_dev_sock_open (iface, DEV_WIRELESS, __FUNCTION__, NULL);
if (!sk)
goto error;
if ((sk = nm_dev_sock_open (iface, DEV_WIRELESS, __FUNCTION__, NULL))) {
struct iw_range range;
struct iwreq wrq;
memset (&wrq, 0, sizeof (struct iwreq));
memset (&range, 0, sizeof (struct iw_range));
strncpy (wrq.ifr_name, iface, IFNAMSIZ);
wrq.u.data.pointer = (caddr_t) ⦥
wrq.u.data.length = sizeof (struct iw_range);
memset (&wrq, 0, sizeof (struct iwreq));
memset (&range, 0, sizeof (struct iw_range));
strncpy (wrq.ifr_name, iface, IFNAMSIZ);
wrq.u.data.pointer = (caddr_t) ⦥
wrq.u.data.length = sizeof (struct iw_range);
if (ioctl (nm_dev_sock_get_fd (sk), SIOCGIWRANGE, &wrq) < 0)
goto error;
if (ioctl (nm_dev_sock_get_fd (sk), SIOCGIWRANGE, &wrq) >= 0)
{
int i;
priv->max_qual.qual = range.max_qual.qual;
priv->max_qual.level = range.max_qual.level;
priv->max_qual.noise = range.max_qual.noise;
priv->max_qual.updated = range.max_qual.updated;
priv->max_qual.qual = range.max_qual.qual;
priv->max_qual.level = range.max_qual.level;
priv->max_qual.noise = range.max_qual.noise;
priv->max_qual.updated = range.max_qual.updated;
priv->avg_qual.qual = range.avg_qual.qual;
priv->avg_qual.level = range.avg_qual.level;
priv->avg_qual.noise = range.avg_qual.noise;
priv->avg_qual.updated = range.avg_qual.updated;
priv->avg_qual.qual = range.avg_qual.qual;
priv->avg_qual.level = range.avg_qual.level;
priv->avg_qual.noise = range.avg_qual.noise;
priv->avg_qual.updated = range.avg_qual.updated;
priv->num_freqs = MIN (range.num_frequency, IW_MAX_FREQUENCIES);
for (i = 0; i < priv->num_freqs; i++)
priv->freqs[i] = iw_freq2float (&(range.freq[i]));
priv->num_freqs = MIN (range.num_frequency, IW_MAX_FREQUENCIES);
for (i = 0; i < priv->num_freqs; i++)
priv->freqs[i] = iw_freq2float (&(range.freq[i]));
priv->we_version = range.we_version_compiled;
priv->we_version = range.we_version_compiled;
/* 802.11 wireless-specific capabilities */
priv->capabilities = get_wireless_capabilities (self, &range, wrq.u.data.length);
}
nm_dev_sock_close (sk);
}
/* 802.11 wireless-specific capabilities */
priv->capabilities = get_wireless_capabilities (self, &range, wrq.u.data.length);
return object;
error:
if (sk)
nm_dev_sock_close (sk);
g_object_unref (object);
return NULL;
}
static void