diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-12-11 20:21:27 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-12-11 20:21:27 +0000 |
| commit | 10e41144596fc9ced40fc349d9ecd099b1c2ea19 (patch) | |
| tree | 88ab04e475ff5a4cd889cb082f5760b6e0bf5e4e /ksysguard/ksysguardd/Linux/netdev.c | |
| parent | 4aed2c8219774f5d797760606b8489a92ddc5163 (diff) | |
| download | tdebase-10e41144.tar.gz tdebase-10e41144.zip | |
Initial import of Trinity 3.5.11 to kdebase
Extends krandrtray, adds iccconfig kcontrol module, adds run dialog autocomplete and lots of bugfixes
Will need to check for commit warnings and repair as encountered
Also needs full compile test
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1061475 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'ksysguard/ksysguardd/Linux/netdev.c')
| -rw-r--r-- | ksysguard/ksysguardd/Linux/netdev.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ksysguard/ksysguardd/Linux/netdev.c b/ksysguard/ksysguardd/Linux/netdev.c index 55e812807..867678642 100644 --- a/ksysguard/ksysguardd/Linux/netdev.c +++ b/ksysguard/ksysguardd/Linux/netdev.c @@ -142,7 +142,7 @@ static int processNetDev_( void ) netDevBufP += strlen( buf ) + 1; /* move netDevBufP to next line */ if ( sscanf( buf, devFormat, tag ) ) { - char* pos = strchr( tag, ':' ); + char* pos = (char*)strchr( tag, ':' ); if ( pos ) { FORALL( DEFVARS ); *pos = '\0'; @@ -227,7 +227,7 @@ void initNetDev( struct SensorModul* sm ) netDevBufP += strlen( buf ) + 1; /* move netDevBufP to next line */ if ( sscanf( buf, devFormat, tag ) ) { - char* pos = strchr( tag, ':' ); + char* pos = (char*)strchr( tag, ':' ); if ( pos ) { char mon[ MON_SIZE ]; *pos = '\0'; @@ -339,9 +339,9 @@ void printNetDev##a( const char* cmd ) \ char* end; \ char dev[ 64 ]; \ \ - beg = strchr( cmd, '/' ); \ - beg = strchr( beg + 1, '/' ); \ - end = strchr( beg + 1, '/' ); \ + beg = (char*)strchr( cmd, '/' ); \ + beg = (char*)strchr( beg + 1, '/' ); \ + end = (char*)strchr( beg + 1, '/' ); \ strncpy( dev, beg + 1, end - beg - 1 ); \ dev[ end - beg - 1 ] = '\0'; \ \ |