From fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 7 Jan 2011 04:10:07 +0000 Subject: Revert automated changes Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- ksysguard/ksysguardd/FreeBSD/ProcessList.c | 2 +- ksysguard/ksysguardd/Irix/ProcessList.c | 2 +- ksysguard/ksysguardd/Linux/Memory.c | 2 +- ksysguard/ksysguardd/Linux/ProcessList.c | 4 ++-- ksysguard/ksysguardd/Linux/lmsensors.c | 2 +- ksysguard/ksysguardd/Linux/stat.c | 2 +- ksysguard/ksysguardd/NetBSD/ProcessList.c | 2 +- ksysguard/ksysguardd/Porting-HOWTO | 4 ++-- ksysguard/ksysguardd/Solaris/ProcessList.c | 2 +- ksysguard/ksysguardd/ksysguardd.c | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) (limited to 'ksysguard/ksysguardd') diff --git a/ksysguard/ksysguardd/FreeBSD/ProcessList.c b/ksysguard/ksysguardd/FreeBSD/ProcessList.c index ecd8ce4a6..f8d2c3ba6 100644 --- a/ksysguard/ksysguardd/FreeBSD/ProcessList.c +++ b/ksysguard/ksysguardd/FreeBSD/ProcessList.c @@ -405,7 +405,7 @@ updateProcessList(void) void printProcessListInfo(const char* cmd) { - fprintf(CurrentClient, "Name\tPID\tPPID\tUID\tGID\ttqStatus\tUser%%\tSystem%%\tNice\tVmSize\tVmRss\tLogin\tCommand\n"); + fprintf(CurrentClient, "Name\tPID\tPPID\tUID\tGID\tStatus\tUser%%\tSystem%%\tNice\tVmSize\tVmRss\tLogin\tCommand\n"); fprintf(CurrentClient, "s\td\td\td\td\tS\tf\tf\td\tD\tD\ts\ts\n"); } diff --git a/ksysguard/ksysguardd/Irix/ProcessList.c b/ksysguard/ksysguardd/Irix/ProcessList.c index 1575e0153..523d87d26 100644 --- a/ksysguard/ksysguardd/Irix/ProcessList.c +++ b/ksysguard/ksysguardd/Irix/ProcessList.c @@ -317,7 +317,7 @@ int updateProcessList( void ) { } void printProcessListInfo( const char *cmd ) { - fprintf(CurrentClient, "Name\tPID\tPPID\tGID\ttqStatus\tUser" + fprintf(CurrentClient, "Name\tPID\tPPID\tGID\tStatus\tUser" "\tSize\tResident\t%% CPU\tPriority\tCommand\n" ); fprintf(CurrentClient, "s\td\td\td\ts\ts\tD\tD\tf\td\ts\n" ); } diff --git a/ksysguard/ksysguardd/Linux/Memory.c b/ksysguard/ksysguardd/Linux/Memory.c index ba69a9fb6..93c8d9edb 100644 --- a/ksysguard/ksysguardd/Linux/Memory.c +++ b/ksysguard/ksysguardd/Linux/Memory.c @@ -103,7 +103,7 @@ int updateMemory( void ) { /** The amount of total and used memory is read from the /proc/meminfo. - It also tqcontains the information about the swap space. + It also contains the information about the swap space. The 'file' looks like this: MemTotal: 516560 kB diff --git a/ksysguard/ksysguardd/Linux/ProcessList.c b/ksysguard/ksysguardd/Linux/ProcessList.c index 069e931b1..e9e8c1315 100644 --- a/ksysguard/ksysguardd/Linux/ProcessList.c +++ b/ksysguard/ksysguardd/Linux/ProcessList.c @@ -137,7 +137,7 @@ static void validateStr( char* str ) ++s; } - /* Make sure that string tqcontains at least one character (blank). */ + /* Make sure that string contains at least one character (blank). */ if ( str[ 0 ] == '\0' ) strcpy( str, " " ); } @@ -407,7 +407,7 @@ void exitProcessList( void ) void printProcessListInfo( const char* cmd ) { (void)cmd; - fprintf( CurrentClient, "Name\tPID\tPPID\tUID\tGID\ttqStatus\tUser%%\tSystem%%\tNice\tVmSize" + fprintf( CurrentClient, "Name\tPID\tPPID\tUID\tGID\tStatus\tUser%%\tSystem%%\tNice\tVmSize" "\tVmRss\tLogin\tCommand\n" ); fprintf( CurrentClient, "s\td\td\td\td\tS\tf\tf\td\tD\tD\ts\ts\n" ); } diff --git a/ksysguard/ksysguardd/Linux/lmsensors.c b/ksysguard/ksysguardd/Linux/lmsensors.c index 0d34d735f..37e41d2a1 100644 --- a/ksysguard/ksysguardd/Linux/lmsensors.c +++ b/ksysguard/ksysguardd/Linux/lmsensors.c @@ -151,7 +151,7 @@ void initLmSensors( struct SensorModul* sm ) strlen( label ) + 1 ); snprintf( p->fullName, BUFFER_SIZE_LMSEN, "lmsensors/%s/%s", scn->prefix, label ); - /* Make sure that name tqcontains only proper characters. */ + /* Make sure that name contains only proper characters. */ for ( s = p->fullName; *s; s++ ) if ( *s == ' ' ) *s = '_'; diff --git a/ksysguard/ksysguardd/Linux/stat.c b/ksysguard/ksysguardd/Linux/stat.c index c1eb48c7d..9bc576deb 100644 --- a/ksysguard/ksysguardd/Linux/stat.c +++ b/ksysguard/ksysguardd/Linux/stat.c @@ -550,7 +550,7 @@ static void processStat( void ) void initStat( struct SensorModul* sm ) { /* The CPU load is calculated from the values in /proc/stat. The cpu - * entry tqcontains 4 counters. These counters count the number of ticks + * entry contains 4 counters. These counters count the number of ticks * the system has spend on user processes, system processes, nice * processes and idle time. * diff --git a/ksysguard/ksysguardd/NetBSD/ProcessList.c b/ksysguard/ksysguardd/NetBSD/ProcessList.c index 5c7499f2f..54ab65513 100644 --- a/ksysguard/ksysguardd/NetBSD/ProcessList.c +++ b/ksysguard/ksysguardd/NetBSD/ProcessList.c @@ -306,7 +306,7 @@ updateProcessList(void) void printProcessListInfo(const char* cmd) { - fprintf(CurrentClient, "Name\tPID\tPPID\tUID\tGID\ttqStatus\tUser%%\tSystem%%\tNice\tVmSize\tVmRss\tLogin\tCommand\n"); + fprintf(CurrentClient, "Name\tPID\tPPID\tUID\tGID\tStatus\tUser%%\tSystem%%\tNice\tVmSize\tVmRss\tLogin\tCommand\n"); fprintf(CurrentClient, "s\td\td\td\td\tS\tf\tf\td\tD\tD\ts\ts\n"); } diff --git a/ksysguard/ksysguardd/Porting-HOWTO b/ksysguard/ksysguardd/Porting-HOWTO index 75bb2b3c2..4576783bc 100644 --- a/ksysguard/ksysguardd/Porting-HOWTO +++ b/ksysguard/ksysguardd/Porting-HOWTO @@ -70,7 +70,7 @@ auto-range feature of the display. -------- ksysguardd> ps? -Name PID PPID UID GID tqStatus User% System% Nice VmSize VmRss VmLib Login Command +Name PID PPID UID GID Status User% System% Nice VmSize VmRss VmLib Login Command s d d d d S f f d d sksysguardd> -------- @@ -105,7 +105,7 @@ ksysguardd may support dynamic monitor sets. If a CPU is added or an interface disabled, monitors may be added or removed. To notify the front-end about this, you need to send the string "RECONFIGURE\n" over stderr. This causes the front-end to request the list of monitors -again and adapt it's tqlayout accordingly. If ksysguardd receives a +again and adapt it's layout accordingly. If ksysguardd receives a command it doesn't know it has to reply with "UNKNOWN COMMAND\nksysguardd> ". diff --git a/ksysguard/ksysguardd/Solaris/ProcessList.c b/ksysguard/ksysguardd/Solaris/ProcessList.c index 1d6809aa9..771371b76 100644 --- a/ksysguard/ksysguardd/Solaris/ProcessList.c +++ b/ksysguard/ksysguardd/Solaris/ProcessList.c @@ -290,7 +290,7 @@ int updateProcessList( void ) { } void printProcessListInfo( const char *cmd ) { - fprintf(CurrentClient, "Name\tPID\tPPID\tGID\ttqStatus\tUser\tThreads" + fprintf(CurrentClient, "Name\tPID\tPPID\tGID\tStatus\tUser\tThreads" "\tSize\tResident\t%% CPU\tPriority\tCommand\n" ); fprintf(CurrentClient, "s\td\td\td\ts\ts\td\tD\tD\tf\td\ts\n" ); } diff --git a/ksysguard/ksysguardd/ksysguardd.c b/ksysguard/ksysguardd/ksysguardd.c index eebb44a53..faea19492 100644 --- a/ksysguard/ksysguardd/ksysguardd.c +++ b/ksysguard/ksysguardd/ksysguardd.c @@ -91,7 +91,7 @@ int QuitApp = 0; int RunAsDaemon = 0; /** - This pointer is used by all modules. It tqcontains the file pointer of + This pointer is used by all modules. It contains the file pointer of the currently served client. This is stdout for non-daemon mode. */ FILE* CurrentClient = 0; -- cgit v1.2.1