From 19eab093c4d63ae275d215f400b1d262390daa16 Mon Sep 17 00:00:00 2001
From: mickeyl <mickeyl>
Date: Wed, 28 Jul 2004 16:33:32 +0000
Subject: disambiguate

---
(limited to 'noncore')

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
@@ -56,10 +56,10 @@ QString WExtensions::station(){
   iwr.u.data.length = IW_ESSID_MAX_SIZE;
   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;
 }
 
 /**
@@ -68,11 +68,15 @@ QString WExtensions::station(){
 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;
 }
 
 /**
--
cgit v0.9.0.2