Imported Debian patch 0.6-1debian/0.6-1

1 files changed, 5 insertions, 4 deletions

diff --git a/LoadMeter.c b/LoadMeter.c
index c2b2af7..b93f305 100644
--- a/LoadMeter.c
+++ b/LoadMeter.c
@@ -26,7 +26,7 @@ struct LoadMeter_ {
 LoadMeter* LoadMeter_new() {
    LoadMeter* this = malloc(sizeof(LoadMeter));
    Meter_init((Meter*)this, String_copy("Load"), String_copy("Load: "), 1);
-   ((Meter*)this)->attributes[0] = &(CRT_colors[LOAD]);
+   ((Meter*)this)->attributes[0] = LOAD;
    ((Meter*)this)->setValues = LoadMeter_setValues;
    ((Object*)this)->display = LoadMeter_display;
    Meter_setMode((Meter*)this, GRAPH);
@@ -38,8 +38,10 @@ LoadMeter* LoadMeter_new() {
 void LoadMeter_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);
 }
 
@@ -53,10 +55,9 @@ void LoadMeter_setValues(Meter* cast) {
 }
 
 void LoadMeter_display(Object* cast, RichString* out) {
-   Meter* super = (Meter*)cast;
    LoadMeter* this = (LoadMeter*)cast;
    char buffer[20];
    RichString_prune(out);
    sprintf(buffer, "%.2f ", ((Meter*)this)->values[0]);
-   RichString_append(out, *(super->attributes[0]), buffer);
+   RichString_append(out, CRT_colors[LOAD], buffer);
 }