diff options
| author | Daniel Lange <DLange@git.local> | 2016-04-11 13:00:19 +0200 |
|---|---|---|
| committer | Daniel Lange <DLange@git.local> | 2016-04-11 13:00:19 +0200 |
| commit | 266ab52b3a741a58fb17c48b0f7939d7c5d266de (patch) | |
| tree | b4bccc59b9a35f3acbe7560f3d633940c71aedef /LoadAverageMeter.c | |
| parent | 2c8c1a156130aa40be7dcaeb3ce2977a03cf50c2 (diff) | |
| download | debian_htop-266ab52b3a741a58fb17c48b0f7939d7c5d266de.tar.gz debian_htop-266ab52b3a741a58fb17c48b0f7939d7c5d266de.tar.bz2 debian_htop-266ab52b3a741a58fb17c48b0f7939d7c5d266de.zip | |
Imported Upstream version 0.6upstream/0.6
Diffstat (limited to 'LoadAverageMeter.c')
| -rw-r--r-- | LoadAverageMeter.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/LoadAverageMeter.c b/LoadAverageMeter.c index 3ef03cb..824e71c 100644 --- a/LoadAverageMeter.c +++ b/LoadAverageMeter.c @@ -31,9 +31,9 @@ void LoadAverageMeter_scan(double* one, double* five, double* fifteen); LoadAverageMeter* LoadAverageMeter_new() { LoadAverageMeter* this = malloc(sizeof(LoadAverageMeter)); Meter_init((Meter*)this, String_copy("LoadAverage"), String_copy("Load average: "), 3); - ((Meter*)this)->attributes[0] = &(CRT_colors[LOAD_AVERAGE_FIFTEEN]); - ((Meter*)this)->attributes[1] = &(CRT_colors[LOAD_AVERAGE_FIVE]); - ((Meter*)this)->attributes[2] = &(CRT_colors[LOAD_AVERAGE_ONE]); + ((Meter*)this)->attributes[0] = LOAD_AVERAGE_FIFTEEN; + ((Meter*)this)->attributes[1] = LOAD_AVERAGE_FIVE; + ((Meter*)this)->attributes[2] = LOAD_AVERAGE_ONE; ((Object*)this)->display = LoadAverageMeter_display; ((Meter*)this)->setValues = LoadAverageMeter_setValues; Meter_setMode((Meter*)this, TEXT); @@ -46,8 +46,10 @@ LoadAverageMeter* LoadAverageMeter_new() { void LoadAverageMeter_scan(double* one, double* five, double* fifteen) { int activeProcs, totalProcs, lastProc; FILE *fd = fopen(PROCDIR "/loadavg", "r"); - fscanf(fd, "%lf %lf %lf %d/%d %d", one, five, fifteen, + int read = fscanf(fd, "%lf %lf %lf %d/%d %d", one, five, fifteen, &activeProcs, &totalProcs, &lastProc); + (void) read; + assert(read == 6); fclose(fd); } |