Diffstat (limited to 'noncore/settings/networksettings2/networksettings2/wextensions.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/networksettings2/networksettings2/wextensions.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/noncore/settings/networksettings2/networksettings2/wextensions.cpp b/noncore/settings/networksettings2/networksettings2/wextensions.cpp index 778990c..c10bdc3 100644 --- a/noncore/settings/networksettings2/networksettings2/wextensions.cpp +++ b/noncore/settings/networksettings2/networksettings2/wextensions.cpp | |||
@@ -52,10 +52,10 @@ QString WExtensions::station(){ | |||
52 | iwr.u.data.length = IW_ESSID_MAX_SIZE; | 52 | iwr.u.data.length = IW_ESSID_MAX_SIZE; |
53 | iwr.u.data.flags = 0; | 53 | iwr.u.data.flags = 0; |
54 | if ( 0 == ioctl( fd, SIOCGIWNICKN, &iwr )){ | 54 | if ( 0 == ioctl( fd, SIOCGIWNICKN, &iwr )){ |
55 | iwr.u.data.pointer[(unsigned int) iwr.u.data.length-1] = '\0'; | 55 | buffer[(unsigned int) iwr.u.data.length-1] = '\0'; |
56 | return QString(iwr.u.data.pointer); | 56 | return (const char *)buffer; |
57 | } | 57 | } |
58 | return QString(); | 58 | return QString::null; |
59 | } | 59 | } |
60 | 60 | ||
61 | /** | 61 | /** |
@@ -64,9 +64,13 @@ QString WExtensions::station(){ | |||
64 | QString WExtensions::essid(){ | 64 | QString WExtensions::essid(){ |
65 | if(!hasWirelessExtensions) | 65 | if(!hasWirelessExtensions) |
66 | return QString(); | 66 | return QString(); |
67 | const char* buffer[200]; | ||
68 | iwr.u.data.pointer = (caddr_t) buffer; | ||
69 | iwr.u.data.length = IW_ESSID_MAX_SIZE; | ||
70 | iwr.u.data.flags = 0; | ||
67 | if ( 0 == ioctl( fd, SIOCGIWESSID, &iwr )){ | 71 | if ( 0 == ioctl( fd, SIOCGIWESSID, &iwr )){ |
68 | iwr.u.essid.pointer[(unsigned int) iwr.u.essid.length] = '\0'; | 72 | buffer[(unsigned int) iwr.u.essid.length] = '\0'; |
69 | return QString(iwr.u.essid.pointer); | 73 | return (const char *)buffer; |
70 | } | 74 | } |
71 | return QString(); | 75 | return QString(); |
72 | } | 76 | } |