author | mickeyl <mickeyl> | 2003-04-04 23:20:06 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-04-04 23:20:06 (UTC) |
commit | e4c19111590664371c359878e5c79428bc7b02c9 (patch) (unidiff) | |
tree | 359c86228f9587415e60ffa1f6614e7e2cbc0153 /libopie2 | |
parent | 998e0da2ba2823f6048f420d69386b2265247e81 (diff) | |
download | opie-e4c19111590664371c359878e5c79428bc7b02c9.zip opie-e4c19111590664371c359878e5c79428bc7b02c9.tar.gz opie-e4c19111590664371c359878e5c79428bc7b02c9.tar.bz2 |
fix segfault due to giving a QString as opposed to a char* as the Qbject name
-rw-r--r-- | libopie2/opienet/onetwork.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp index 6a363d7..f52279a 100644 --- a/libopie2/opienet/onetwork.cpp +++ b/libopie2/opienet/onetwork.cpp | |||
@@ -92,18 +92,18 @@ void ONetwork::synchronize() | |||
92 | s >> str; | 92 | s >> str; |
93 | str.truncate( str.find( ':' ) ); | 93 | str.truncate( str.find( ':' ) ); |
94 | qDebug( "ONetwork: found interface '%s'", (const char*) str ); | 94 | qDebug( "ONetwork: found interface '%s'", (const char*) str ); |
95 | ONetworkInterface* iface; | 95 | ONetworkInterface* iface; |
96 | if ( isWirelessInterface( str ) ) | 96 | if ( isWirelessInterface( str ) ) |
97 | { | 97 | { |
98 | iface = new OWirelessNetworkInterface( this, str ); | 98 | iface = new OWirelessNetworkInterface( this, (const char*) str ); |
99 | qDebug( "ONetwork: interface '%s' has Wireless Extensions", (const char*) str ); | 99 | qDebug( "ONetwork: interface '%s' has Wireless Extensions", (const char*) str ); |
100 | } | 100 | } |
101 | else | 101 | else |
102 | { | 102 | { |
103 | iface = new ONetworkInterface( this, str ); | 103 | iface = new ONetworkInterface( this, (const char*) str ); |
104 | } | 104 | } |
105 | _interfaces.insert( str, iface ); | 105 | _interfaces.insert( str, iface ); |
106 | s.readLine(); | 106 | s.readLine(); |
107 | } | 107 | } |
108 | } | 108 | } |
109 | 109 | ||
@@ -171,15 +171,15 @@ void ONetworkInterface::init() | |||
171 | 171 | ||
172 | 172 | ||
173 | bool ONetworkInterface::ioctl( int call, struct ifreq& ifreq ) const | 173 | bool ONetworkInterface::ioctl( int call, struct ifreq& ifreq ) const |
174 | { | 174 | { |
175 | int result = ::ioctl( _sfd, call, &ifreq ); | 175 | int result = ::ioctl( _sfd, call, &ifreq ); |
176 | if ( result == -1 ) | 176 | if ( result == -1 ) |
177 | qDebug( "ONetworkInterface::ioctl(): Call %d - Status: Failed: %d (%s)", call, result, strerror( errno ) ); | 177 | qDebug( "ONetworkInterface::ioctl (%s) call %d - Status: Failed: %d (%s)", name(), call, result, strerror( errno ) ); |
178 | else | 178 | else |
179 | qDebug( "ONetworkInterface::ioctl(): Call %d - Status: Ok.", call ); | 179 | qDebug( "ONetworkInterface::ioctl (%s) call %d - Status: Ok.", name(), call ); |
180 | return ( result != -1 ); | 180 | return ( result != -1 ); |
181 | } | 181 | } |
182 | 182 | ||
183 | 183 | ||
184 | bool ONetworkInterface::ioctl( int call ) const | 184 | bool ONetworkInterface::ioctl( int call ) const |
185 | { | 185 | { |
@@ -675,15 +675,15 @@ void OWirelessNetworkInterface::setSSID( const QString& ssid ) | |||
675 | 675 | ||
676 | 676 | ||
677 | bool OWirelessNetworkInterface::wioctl( int call, struct iwreq& iwreq ) const | 677 | bool OWirelessNetworkInterface::wioctl( int call, struct iwreq& iwreq ) const |
678 | { | 678 | { |
679 | int result = ::ioctl( _sfd, call, &iwreq ); | 679 | int result = ::ioctl( _sfd, call, &iwreq ); |
680 | if ( result == -1 ) | 680 | if ( result == -1 ) |
681 | qDebug( "ONetworkInterface::wioctl(): Call %d - Status: Failed: %d (%s)", call, result, strerror( errno ) ); | 681 | qDebug( "ONetworkInterface::wioctl (%s) call %d - Status: Failed: %d (%s)", name(), call, result, strerror( errno ) ); |
682 | else | 682 | else |
683 | qDebug( "ONetworkInterface::wioctl(): Call %d - Status: Ok.", call ); | 683 | qDebug( "ONetworkInterface::wioctl (%s) call %d - Status: Ok.", name(), call ); |
684 | return ( result != -1 ); | 684 | return ( result != -1 ); |
685 | } | 685 | } |
686 | 686 | ||
687 | 687 | ||
688 | bool OWirelessNetworkInterface::wioctl( int call ) const | 688 | bool OWirelessNetworkInterface::wioctl( int call ) const |
689 | { | 689 | { |