diff options
Diffstat (limited to 'ksysguard/ksysguardd/Linux')
-rw-r--r-- | ksysguard/ksysguardd/Linux/ProcessList.c | 2 | ||||
-rw-r--r-- | ksysguard/ksysguardd/Linux/acpi.c | 12 | ||||
-rw-r--r-- | ksysguard/ksysguardd/Linux/cpuinfo.c | 2 | ||||
-rw-r--r-- | ksysguard/ksysguardd/Linux/netdev.c | 10 | ||||
-rw-r--r-- | ksysguard/ksysguardd/Linux/stat.c | 6 |
5 files changed, 16 insertions, 16 deletions
diff --git a/ksysguard/ksysguardd/Linux/ProcessList.c b/ksysguard/ksysguardd/Linux/ProcessList.c index b267c7005..e9e8c1315 100644 --- a/ksysguard/ksysguardd/Linux/ProcessList.c +++ b/ksysguard/ksysguardd/Linux/ProcessList.c @@ -292,7 +292,7 @@ static int updateProcess( int pid ) strncmp( ps->cmdline, "kdeinit: ", KDEINITLEN ) == 0 && strcmp( ps->cmdline + KDEINITLEN, "Running..." ) != 0 ) { size_t len; - char* end = strchr( ps->cmdline + KDEINITLEN, ' ' ); + char* end = (char*)strchr( ps->cmdline + KDEINITLEN, ' ' ); if ( end ) len = ( end - ps->cmdline ) - KDEINITLEN; else diff --git a/ksysguard/ksysguardd/Linux/acpi.c b/ksysguard/ksysguardd/Linux/acpi.c index b3100c363..6e9470b59 100644 --- a/ksysguard/ksysguardd/Linux/acpi.c +++ b/ksysguard/ksysguardd/Linux/acpi.c @@ -130,7 +130,7 @@ int updateAcpiBattery( void ) p = AcpiBatInfoBuf; while ( ( p!= NULL ) && ( sscanf( p, "last full capacity: %d ", &AcpiBatCapacity ) != 1 ) ) { - p = strchr( p, '\n' ); + p = (char*)strchr( p, '\n' ); if ( p ) p++; } @@ -152,7 +152,7 @@ int updateAcpiBattery( void ) p = AcpiBatStateBuf; while ( ( p!= NULL ) && ( sscanf( p, "remaining capacity: %d ", &AcpiBatRemainingCapacity ) != 1 ) ) { - p = strchr( p, '\n' ); + p = (char*)strchr( p, '\n' ); if ( p ) p++; } @@ -161,7 +161,7 @@ int updateAcpiBattery( void ) p = AcpiBatStateBuf; while ( ( p!= NULL ) && ( sscanf( p, "present rate: %d ", &AcpiBatteryUsage[i] ) != 1 ) ) { - p = strchr( p, '\n' ); + p = (char*)strchr( p, '\n' ); if ( p ) p++; } @@ -229,12 +229,12 @@ void printAcpiBatUsageInfo( const char* cmd) static int extract_zone_name(char **startidx, const char *cmd) { char *idx = NULL; - idx = strchr(cmd, '/'); + idx = (char*)strchr(cmd, '/'); if (idx == NULL) return 0; - idx = strchr(idx+1, '/'); + idx = (char*)strchr(idx+1, '/'); if (idx == NULL) return 0; *startidx = idx+1; - idx = strchr(*startidx, '/'); + idx = (char*)strchr(*startidx, '/'); if (idx == NULL) return 0; return idx - *startidx; } diff --git a/ksysguard/ksysguardd/Linux/cpuinfo.c b/ksysguard/ksysguardd/Linux/cpuinfo.c index de5deb80f..fa55aabd9 100644 --- a/ksysguard/ksysguardd/Linux/cpuinfo.c +++ b/ksysguard/ksysguardd/Linux/cpuinfo.c @@ -83,7 +83,7 @@ static void processCpuInfo( void ) sscanf( value, "%f", &Clocks[ cpuId ] ); /* Move cibp to begining of next line, if there is one. */ - cibp = strchr( cibp, '\n' ); + cibp = (char*)strchr( cibp, '\n' ); if ( cibp ) cibp++; else 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'; \ \ diff --git a/ksysguard/ksysguardd/Linux/stat.c b/ksysguard/ksysguardd/Linux/stat.c index 0e03e4d53..9bc576deb 100644 --- a/ksysguard/ksysguardd/Linux/stat.c +++ b/ksysguard/ksysguardd/Linux/stat.c @@ -267,10 +267,10 @@ static int processDiskIO( const char* buf ) } /* Move p after the sencond ')'. We can safely assume that * those two ')' exist. */ - p = strchr( p, ')' ) + 1; - p = strchr( p, ')' ) + 1; + p = (char*)strchr( p, ')' ) + 1; + p = (char*)strchr( p, ')' ) + 1; if ( p && *p ) - p = strchr( p, '(' ); + p = (char*)strchr( p, '(' ); } return 0; |