summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-04-04 23:20:06 (UTC)
committer mickeyl <mickeyl>2003-04-04 23:20:06 (UTC)
commite4c19111590664371c359878e5c79428bc7b02c9 (patch) (side-by-side diff)
tree359c86228f9587415e60ffa1f6614e7e2cbc0153
parent998e0da2ba2823f6048f420d69386b2265247e81 (diff)
downloadopie-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
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opienet/onetwork.cpp12
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
@@ -96,10 +96,10 @@ void ONetwork::synchronize()
if ( isWirelessInterface( str ) )
{
- iface = new OWirelessNetworkInterface( this, str );
+ iface = new OWirelessNetworkInterface( this, (const char*) str );
qDebug( "ONetwork: interface '%s' has Wireless Extensions", (const char*) str );
}
else
{
- iface = new ONetworkInterface( this, str );
+ iface = new ONetworkInterface( this, (const char*) str );
}
_interfaces.insert( str, iface );
@@ -175,7 +175,7 @@ bool ONetworkInterface::ioctl( int call, struct ifreq& ifreq ) const
int result = ::ioctl( _sfd, call, &ifreq );
if ( result == -1 )
- qDebug( "ONetworkInterface::ioctl(): Call %d - Status: Failed: %d (%s)", call, result, strerror( errno ) );
+ qDebug( "ONetworkInterface::ioctl (%s) call %d - Status: Failed: %d (%s)", name(), call, result, strerror( errno ) );
else
- qDebug( "ONetworkInterface::ioctl(): Call %d - Status: Ok.", call );
+ qDebug( "ONetworkInterface::ioctl (%s) call %d - Status: Ok.", name(), call );
return ( result != -1 );
}
@@ -679,7 +679,7 @@ bool OWirelessNetworkInterface::wioctl( int call, struct iwreq& iwreq ) const
int result = ::ioctl( _sfd, call, &iwreq );
if ( result == -1 )
- qDebug( "ONetworkInterface::wioctl(): Call %d - Status: Failed: %d (%s)", call, result, strerror( errno ) );
+ qDebug( "ONetworkInterface::wioctl (%s) call %d - Status: Failed: %d (%s)", name(), call, result, strerror( errno ) );
else
- qDebug( "ONetworkInterface::wioctl(): Call %d - Status: Ok.", call );
+ qDebug( "ONetworkInterface::wioctl (%s) call %d - Status: Ok.", name(), call );
return ( result != -1 );
}