diff options
| author | Daniel Lange <DLange@git.local> | 2016-04-11 13:00:27 +0200 |
|---|---|---|
| committer | Daniel Lange <DLange@git.local> | 2016-04-11 13:00:27 +0200 |
| commit | 283707c5e5bc436b78ea23bf5500cb6b16a01148 (patch) | |
| tree | b977131bbbb4c3bd8ade370aab2e4fc913440c04 /LoadAverageMeter.c | |
| parent | bea9b4798717b6f4e31085506dfc179eeb8dc17c (diff) | |
| download | debian_htop-283707c5e5bc436b78ea23bf5500cb6b16a01148.tar.gz debian_htop-283707c5e5bc436b78ea23bf5500cb6b16a01148.tar.bz2 debian_htop-283707c5e5bc436b78ea23bf5500cb6b16a01148.zip | |
Imported Upstream version 0.9upstream/0.9
Diffstat (limited to 'LoadAverageMeter.c')
| -rw-r--r-- | LoadAverageMeter.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/LoadAverageMeter.c b/LoadAverageMeter.c index b692b9f..1109dab 100644 --- a/LoadAverageMeter.c +++ b/LoadAverageMeter.c @@ -1,6 +1,6 @@ /* htop -(C) 2004-2006 Hisham H. Muhammad +(C) 2004-2010 Hisham H. Muhammad Released under the GNU GPL, see the COPYING file in the source distribution for its full text. */ @@ -21,10 +21,10 @@ int LoadMeter_attributes[] = { LOAD }; static inline void LoadAverageMeter_scan(double* one, double* five, double* fifteen) { int activeProcs, totalProcs, lastProc; FILE *fd = fopen(PROCDIR "/loadavg", "r"); - int read = fscanf(fd, "%lf %lf %lf %d/%d %d", one, five, fifteen, + int total = fscanf(fd, "%lf %lf %lf %d/%d %d", one, five, fifteen, &activeProcs, &totalProcs, &lastProc); - (void) read; - assert(read == 6); + (void) total; + assert(total == 6); fclose(fd); } @@ -36,9 +36,8 @@ static void LoadAverageMeter_setValues(Meter* this, char* buffer, int size) { static void LoadAverageMeter_display(Object* cast, RichString* out) { Meter* this = (Meter*)cast; char buffer[20]; - RichString_init(out); sprintf(buffer, "%.2f ", this->values[2]); - RichString_append(out, CRT_colors[LOAD_AVERAGE_FIFTEEN], buffer); + RichString_write(out, CRT_colors[LOAD_AVERAGE_FIFTEEN], buffer); sprintf(buffer, "%.2f ", this->values[1]); RichString_append(out, CRT_colors[LOAD_AVERAGE_FIVE], buffer); sprintf(buffer, "%.2f ", this->values[0]); @@ -57,9 +56,8 @@ static void LoadMeter_setValues(Meter* this, char* buffer, int size) { static void LoadMeter_display(Object* cast, RichString* out) { Meter* this = (Meter*)cast; char buffer[20]; - RichString_init(out); sprintf(buffer, "%.2f ", ((Meter*)this)->values[0]); - RichString_append(out, CRT_colors[LOAD], buffer); + RichString_write(out, CRT_colors[LOAD], buffer); } MeterType LoadAverageMeter = { |