Imported Upstream version 0.8.1upstream/0.8.1

1 files changed, 28 insertions, 28 deletions

diff --git a/LoadAverageMeter.c b/LoadAverageMeter.c
index ab06beb..b692b9f 100644
--- a/LoadAverageMeter.c
+++ b/LoadAverageMeter.c
@@ -16,32 +16,8 @@ int LoadAverageMeter_attributes[] = {
    LOAD_AVERAGE_FIFTEEN, LOAD_AVERAGE_FIVE, LOAD_AVERAGE_ONE
 };
 
-MeterType LoadAverageMeter = {
-   .setValues = LoadAverageMeter_setValues, 
-   .display = LoadAverageMeter_display,
-   .mode = TEXT_METERMODE,
-   .items = 3,
-   .total = 100.0,
-   .attributes = LoadAverageMeter_attributes,
-   .name = "LoadAverage",
-   .uiName = "Load average",
-   .caption = "Load average: "
-};
-
 int LoadMeter_attributes[] = { LOAD };
 
-MeterType LoadMeter = {
-   .setValues = LoadMeter_setValues, 
-   .display = LoadMeter_display,
-   .mode = TEXT_METERMODE,
-   .items = 1,
-   .total = 100.0,
-   .attributes = LoadMeter_attributes,
-   .name = "Load",
-   .uiName = "Load",
-   .caption = "Load: "
-};
-
 static inline void LoadAverageMeter_scan(double* one, double* five, double* fifteen) {
    int activeProcs, totalProcs, lastProc;
    FILE *fd = fopen(PROCDIR "/loadavg", "r");
@@ -52,12 +28,12 @@ static inline void LoadAverageMeter_scan(double* one, double* five, double* fift
    fclose(fd);
 }
 
-void LoadAverageMeter_setValues(Meter* this, char* buffer, int size) {
+static void LoadAverageMeter_setValues(Meter* this, char* buffer, int size) {
    LoadAverageMeter_scan(&this->values[2], &this->values[1], &this->values[0]);
    snprintf(buffer, size, "%.2f/%.2f/%.2f", this->values[2], this->values[1], this->values[0]);
 }
 
-void LoadAverageMeter_display(Object* cast, RichString* out) {
+static void LoadAverageMeter_display(Object* cast, RichString* out) {
    Meter* this = (Meter*)cast;
    char buffer[20];
    RichString_init(out);
@@ -69,7 +45,7 @@ void LoadAverageMeter_display(Object* cast, RichString* out) {
    RichString_append(out, CRT_colors[LOAD_AVERAGE_ONE], buffer);
 }
 
-void LoadMeter_setValues(Meter* this, char* buffer, int size) {
+static void LoadMeter_setValues(Meter* this, char* buffer, int size) {
    double five, fifteen;
    LoadAverageMeter_scan(&this->values[0], &five, &fifteen);
    if (this->values[0] > this->total) {
@@ -78,10 +54,34 @@ void LoadMeter_setValues(Meter* this, char* buffer, int size) {
    snprintf(buffer, size, "%.2f", this->values[0]);
 }
 
-void LoadMeter_display(Object* cast, RichString* out) {
+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);
 }
+
+MeterType LoadAverageMeter = {
+   .setValues = LoadAverageMeter_setValues, 
+   .display = LoadAverageMeter_display,
+   .mode = TEXT_METERMODE,
+   .items = 3,
+   .total = 100.0,
+   .attributes = LoadAverageMeter_attributes,
+   .name = "LoadAverage",
+   .uiName = "Load average",
+   .caption = "Load average: "
+};
+
+MeterType LoadMeter = {
+   .setValues = LoadMeter_setValues, 
+   .display = LoadMeter_display,
+   .mode = TEXT_METERMODE,
+   .items = 1,
+   .total = 100.0,
+   .attributes = LoadMeter_attributes,
+   .name = "Load",
+   .uiName = "Load",
+   .caption = "Load: "
+};