From d54ab5595153b3dc57560077ff3551ffd4406b30 Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 15 Aug 2011 21:36:27 +0000 Subject: Fix a number of issues in kdebase caused by C style casts This includes Bug #492 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1247425 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- ksysguard/ksysguardd/Linux/ProcessList.c | 2 +- ksysguard/ksysguardd/Linux/acpi.c | 12 +++++------ ksysguard/ksysguardd/Linux/cpuinfo.c | 2 +- ksysguard/ksysguardd/Linux/netdev.c | 10 ++++----- ksysguard/ksysguardd/Linux/stat.c | 6 +++--- ksysguard/ksysguardd/Solaris/NetDev.c | 36 ++++++++++++++++---------------- ksysguard/ksysguardd/Tru64/NetDev.c | 36 ++++++++++++++++---------------- ksysguard/ksysguardd/conf.c | 8 +++---- 8 files changed, 56 insertions(+), 56 deletions(-) (limited to 'ksysguard/ksysguardd') diff --git a/ksysguard/ksysguardd/Linux/ProcessList.c b/ksysguard/ksysguardd/Linux/ProcessList.c index e9e8c1315..b267c7005 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 = (char*)strchr( ps->cmdline + KDEINITLEN, ' ' ); + char* end = 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 6e9470b59..b3100c363 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 = (char*)strchr( p, '\n' ); + p = 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 = (char*)strchr( p, '\n' ); + p = 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 = (char*)strchr( p, '\n' ); + p = 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 = (char*)strchr(cmd, '/'); + idx = strchr(cmd, '/'); if (idx == NULL) return 0; - idx = (char*)strchr(idx+1, '/'); + idx = strchr(idx+1, '/'); if (idx == NULL) return 0; *startidx = idx+1; - idx = (char*)strchr(*startidx, '/'); + idx = 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 fa55aabd9..de5deb80f 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 = (char*)strchr( cibp, '\n' ); + cibp = strchr( cibp, '\n' ); if ( cibp ) cibp++; else diff --git a/ksysguard/ksysguardd/Linux/netdev.c b/ksysguard/ksysguardd/Linux/netdev.c index bba927e19..c2ef2d16f 100644 --- a/ksysguard/ksysguardd/Linux/netdev.c +++ b/ksysguard/ksysguardd/Linux/netdev.c @@ -165,7 +165,7 @@ static int processNetDev_( void ) netDevBufP += strlen( buf ) + 1; /* move netDevBufP to next line */ if ( sscanf( buf, devFormat, tag ) ) { - char* pos = (char*)strchr( tag, ':' ); + char* pos = strchr( tag, ':' ); if ( pos ) { FORALL( DEFVARS ); *pos = '\0'; @@ -289,7 +289,7 @@ void initNetDev( struct SensorModul* sm ) netDevBufP += strlen( buf ) + 1; /* move netDevBufP to next line */ if ( sscanf( buf, devFormat, tag ) ) { - char* pos = (char*)strchr( tag, ':' ); + char* pos = strchr( tag, ':' ); if ( pos ) { char mon[ MON_SIZE ]; *pos = '\0'; @@ -450,9 +450,9 @@ void printNetDev##a( const char* cmd ) \ char* end; \ char dev[ 64 ]; \ \ - beg = (char*)strchr( cmd, '/' ); \ - beg = (char*)strchr( beg + 1, '/' ); \ - end = (char*)strchr( beg + 1, '/' ); \ + beg = strchr( cmd, '/' ); \ + beg = strchr( beg + 1, '/' ); \ + end = 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 9bc576deb..0e03e4d53 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 = (char*)strchr( p, ')' ) + 1; - p = (char*)strchr( p, ')' ) + 1; + p = strchr( p, ')' ) + 1; + p = strchr( p, ')' ) + 1; if ( p && *p ) - p = (char*)strchr( p, '(' ); + p = strchr( p, '(' ); } return 0; diff --git a/ksysguard/ksysguardd/Solaris/NetDev.c b/ksysguard/ksysguardd/Solaris/NetDev.c index 836e2832b..89db266cb 100644 --- a/ksysguard/ksysguardd/Solaris/NetDev.c +++ b/ksysguard/ksysguardd/Solaris/NetDev.c @@ -436,9 +436,9 @@ void printIPackets( const char *cmd ) { char *name, *ptr; int i; - ptr = (char*)strchr( cmdcopy, (int) '/' ); + ptr = strchr( cmdcopy, (int) '/' ); name = ++ptr; - ptr = (char*)strchr( name, (int) '/' ); + ptr = strchr( name, (int) '/' ); *ptr = '\0'; for( i = 0; i < NetDevCount; i++ ) { @@ -464,9 +464,9 @@ void printOPackets( const char *cmd ) { char *name, *ptr; int i; - ptr = (char*)strchr( cmdcopy, (int) '/' ); + ptr = strchr( cmdcopy, (int) '/' ); name = ++ptr; - ptr = (char*)strchr( name, (int) '/' ); + ptr = strchr( name, (int) '/' ); *ptr = '\0'; for( i = 0; i < NetDevCount; i++ ) { @@ -492,9 +492,9 @@ void printIErrors( const char *cmd ) { char *name, *ptr; int i; - ptr = (char*)strchr( cmdcopy, (int) '/' ); + ptr = strchr( cmdcopy, (int) '/' ); name = ++ptr; - ptr = (char*)strchr( name, (int) '/' ); + ptr = strchr( name, (int) '/' ); *ptr = '\0'; for( i = 0; i < NetDevCount; i++ ) { @@ -520,9 +520,9 @@ void printOErrors( const char *cmd ) { char *name, *ptr; int i; - ptr = (char*)strchr( cmdcopy, (int) '/' ); + ptr = strchr( cmdcopy, (int) '/' ); name = ++ptr; - ptr = (char*)strchr( name, (int) '/' ); + ptr = strchr( name, (int) '/' ); *ptr = '\0'; for( i = 0; i < NetDevCount; i++ ) { @@ -548,9 +548,9 @@ void printCollisions( const char *cmd ) { char *name, *ptr; int i; - ptr = (char*)strchr( cmdcopy, (int) '/' ); + ptr = strchr( cmdcopy, (int) '/' ); name = ++ptr; - ptr = (char*)strchr( name, (int) '/' ); + ptr = strchr( name, (int) '/' ); *ptr = '\0'; for( i = 0; i < NetDevCount; i++ ) { @@ -576,9 +576,9 @@ void printMultiXmits( const char *cmd ) { char *name, *ptr; int i; - ptr = (char*)strchr( cmdcopy, (int) '/' ); + ptr = strchr( cmdcopy, (int) '/' ); name = ++ptr; - ptr = (char*)strchr( name, (int) '/' ); + ptr = strchr( name, (int) '/' ); *ptr = '\0'; for( i = 0; i < NetDevCount; i++ ) { @@ -604,9 +604,9 @@ void printMultiRecvs( const char *cmd ) { char *name, *ptr; int i; - ptr = (char*)strchr( cmdcopy, (int) '/' ); + ptr = strchr( cmdcopy, (int) '/' ); name = ++ptr; - ptr = (char*)strchr( name, (int) '/' ); + ptr = strchr( name, (int) '/' ); *ptr = '\0'; for( i = 0; i < NetDevCount; i++ ) { @@ -632,9 +632,9 @@ void printBcastXmits( const char *cmd ) { char *name, *ptr; int i; - ptr = (char*)strchr( cmdcopy, (int) '/' ); + ptr = strchr( cmdcopy, (int) '/' ); name = ++ptr; - ptr = (char*)strchr( name, (int) '/' ); + ptr = strchr( name, (int) '/' ); *ptr = '\0'; for( i = 0; i < NetDevCount; i++ ) { @@ -660,9 +660,9 @@ void printBcastRecvs( const char *cmd ) { char *name, *ptr; int i; - ptr = (char*)strchr( cmdcopy, (int) '/' ); + ptr = strchr( cmdcopy, (int) '/' ); name = ++ptr; - ptr = (char*)strchr( name, (int) '/' ); + ptr = strchr( name, (int) '/' ); *ptr = '\0'; for( i = 0; i < NetDevCount; i++ ) { diff --git a/ksysguard/ksysguardd/Tru64/NetDev.c b/ksysguard/ksysguardd/Tru64/NetDev.c index a28c7ecf7..0699b929a 100644 --- a/ksysguard/ksysguardd/Tru64/NetDev.c +++ b/ksysguard/ksysguardd/Tru64/NetDev.c @@ -435,9 +435,9 @@ void printIPackets( const char *cmd ) { char *name, *ptr; int i; - ptr = (char*)strchr( cmdcopy, (int) '/' ); + ptr = strchr( cmdcopy, (int) '/' ); name = ++ptr; - ptr = (char*)strchr( name, (int) '/' ); + ptr = strchr( name, (int) '/' ); *ptr = '\0'; for( i = 0; i < NetDevCount; i++ ) { @@ -463,9 +463,9 @@ void printOPackets( const char *cmd ) { char *name, *ptr; int i; - ptr = (char*)strchr( cmdcopy, (int) '/' ); + ptr = strchr( cmdcopy, (int) '/' ); name = ++ptr; - ptr = (char*)strchr( name, (int) '/' ); + ptr = strchr( name, (int) '/' ); *ptr = '\0'; for( i = 0; i < NetDevCount; i++ ) { @@ -491,9 +491,9 @@ void printIErrors( const char *cmd ) { char *name, *ptr; int i; - ptr = (char*)strchr( cmdcopy, (int) '/' ); + ptr = strchr( cmdcopy, (int) '/' ); name = ++ptr; - ptr = (char*)strchr( name, (int) '/' ); + ptr = strchr( name, (int) '/' ); *ptr = '\0'; for( i = 0; i < NetDevCount; i++ ) { @@ -519,9 +519,9 @@ void printOErrors( const char *cmd ) { char *name, *ptr; int i; - ptr = (char*)strchr( cmdcopy, (int) '/' ); + ptr = strchr( cmdcopy, (int) '/' ); name = ++ptr; - ptr = (char*)strchr( name, (int) '/' ); + ptr = strchr( name, (int) '/' ); *ptr = '\0'; for( i = 0; i < NetDevCount; i++ ) { @@ -547,9 +547,9 @@ void printCollisions( const char *cmd ) { char *name, *ptr; int i; - ptr = (char*)strchr( cmdcopy, (int) '/' ); + ptr = strchr( cmdcopy, (int) '/' ); name = ++ptr; - ptr = (char*)strchr( name, (int) '/' ); + ptr = strchr( name, (int) '/' ); *ptr = '\0'; for( i = 0; i < NetDevCount; i++ ) { @@ -575,9 +575,9 @@ void printMultiXmits( const char *cmd ) { char *name, *ptr; int i; - ptr = (char*)strchr( cmdcopy, (int) '/' ); + ptr = strchr( cmdcopy, (int) '/' ); name = ++ptr; - ptr = (char*)strchr( name, (int) '/' ); + ptr = strchr( name, (int) '/' ); *ptr = '\0'; for( i = 0; i < NetDevCount; i++ ) { @@ -603,9 +603,9 @@ void printMultiRecvs( const char *cmd ) { char *name, *ptr; int i; - ptr = (char*)strchr( cmdcopy, (int) '/' ); + ptr = strchr( cmdcopy, (int) '/' ); name = ++ptr; - ptr = (char*)strchr( name, (int) '/' ); + ptr = strchr( name, (int) '/' ); *ptr = '\0'; for( i = 0; i < NetDevCount; i++ ) { @@ -631,9 +631,9 @@ void printBcastXmits( const char *cmd ) { char *name, *ptr; int i; - ptr = (char*)strchr( cmdcopy, (int) '/' ); + ptr = strchr( cmdcopy, (int) '/' ); name = ++ptr; - ptr = (char*)strchr( name, (int) '/' ); + ptr = strchr( name, (int) '/' ); *ptr = '\0'; for( i = 0; i < NetDevCount; i++ ) { @@ -659,9 +659,9 @@ void printBcastRecvs( const char *cmd ) { char *name, *ptr; int i; - ptr = (char*)strchr( cmdcopy, (int) '/' ); + ptr = strchr( cmdcopy, (int) '/' ); name = ++ptr; - ptr = (char*)strchr( name, (int) '/' ); + ptr = strchr( name, (int) '/' ); *ptr = '\0'; for( i = 0; i < NetDevCount; i++ ) { diff --git a/ksysguard/ksysguardd/conf.c b/ksysguard/ksysguardd/conf.c index 7f48ee590..1d857137b 100644 --- a/ksysguard/ksysguardd/conf.c +++ b/ksysguard/ksysguardd/conf.c @@ -93,9 +93,9 @@ void parseConfigFile( const char *filename ) if ( line[ strlen( line ) - 1 ] == '\n' ) line[ strlen( line ) - 1 ] = '\0'; - if ( !strncmp( line, "RegisterDomain",14) && (begin = (char*)strchr( line, '=' )) ) RegisterDomain=strdup(begin+1); + if ( !strncmp( line, "RegisterDomain",14) && (begin = strchr( line, '=' )) ) RegisterDomain=strdup(begin+1); - if ( !strncmp( line, "LogFiles", 8 ) && (begin = (char*)strchr( line, '=' )) ) { + if ( !strncmp( line, "LogFiles", 8 ) && (begin = strchr( line, '=' )) ) { begin++; for ( token = strtok( begin, "," ); token; token = strtok( NULL, "," ) ) { @@ -104,7 +104,7 @@ void parseConfigFile( const char *filename ) continue; } confLog->name = strdup( token ); - tmp = (char*)strchr( confLog->name, ':' ); + tmp = strchr( confLog->name, ':' ); *tmp = '\0'; confLog->path = tmp; confLog->path++; @@ -113,7 +113,7 @@ void parseConfigFile( const char *filename ) } } - if ( !strncmp( line, "Sensors", 7 ) && (begin = (char*)strchr( line, '=' )) ) { + if ( !strncmp( line, "Sensors", 7 ) && (begin = strchr( line, '=' )) ) { begin++; for ( token = strtok( begin, ","); token; token = strtok( NULL, "," ) ) -- cgit v1.2.1