summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-07-28 16:33:32 (UTC)
committer mickeyl <mickeyl>2004-07-28 16:33:32 (UTC)
commit19eab093c4d63ae275d215f400b1d262390daa16 (patch) (side-by-side diff)
tree74b48d8ebe8c303c30bc969e32884306a480dc48
parent614c7e0add47c87902da610e7f31f5abe0d79655 (diff)
downloadopie-19eab093c4d63ae275d215f400b1d262390daa16.zip
opie-19eab093c4d63ae275d215f400b1d262390daa16.tar.gz
opie-19eab093c4d63ae275d215f400b1d262390daa16.tar.bz2
disambiguate
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/networksettings/wlan/wextensions.cpp16
1 files changed, 10 insertions, 6 deletions
diff --git a/noncore/settings/networksettings/wlan/wextensions.cpp b/noncore/settings/networksettings/wlan/wextensions.cpp
index fe21f02..8a9db66 100644
--- a/noncore/settings/networksettings/wlan/wextensions.cpp
+++ b/noncore/settings/networksettings/wlan/wextensions.cpp
@@ -57,8 +57,8 @@ QString WExtensions::station(){
iwr.u.data.flags = 0;
if ( 0 == ioctl( fd, SIOCGIWNICKN, &iwr )){
- iwr.u.data.pointer[(unsigned int) iwr.u.data.length-1] = '\0';
- return QString(iwr.u.data.pointer);
+ buffer[(unsigned int) iwr.u.data.length-1] = '\0';
+ return (const char*) buffer;
}
- return QString();
+ return QString::null;
}
@@ -69,9 +69,13 @@ QString WExtensions::essid(){
if(!hasWirelessExtensions)
return QString();
+ const char* buffer[200];
+ iwr.u.data.pointer = (caddr_t) buffer;
+ iwr.u.data.length = IW_ESSID_MAX_SIZE;
+ iwr.u.data.flags = 0;
if ( 0 == ioctl( fd, SIOCGIWESSID, &iwr )){
- iwr.u.essid.pointer[(unsigned int) iwr.u.essid.length] = '\0';
- return QString(iwr.u.essid.pointer);
+ buffer[(unsigned int) iwr.u.essid.length] = '\0';
+ return (const char*) buffer;
}
- return QString();
+ return QString::null;
}