From d54ab5595153b3dc57560077ff3551ffd4406b30 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
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 +++---
 5 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'ksysguard/ksysguardd/Linux')

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;
-- 
cgit v1.2.1