]> git.sur5r.net Git - i3/i3status/blobdiff - src/print_load.c
doc fix: the load supports %1min, not %10min in the format (Thanks zendeavor)
[i3/i3status] / src / print_load.c
index c0d9494322a41e903cd3c6b5d342d03c835b7e7b..d47eceacdbf3abee23fcb98f6519c924654fa17b 100644 (file)
@@ -1,6 +1,5 @@
 // vim:ts=8:expandtab
 #include "i3status.h"
-#include <err.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -12,7 +11,7 @@ void print_load(const char *format) {
         const char *walk;
 
         if (getloadavg(loadavg, 3) == -1)
-                errx(-1, "getloadavg() failed\n");
+                goto error;
 
         for (walk = format; *walk != '\0'; walk++) {
                 if (*walk != '%') {
@@ -20,14 +19,14 @@ void print_load(const char *format) {
                         continue;
                 }
 
-                if (BEGINS_WITH(walk+1, "5min")) {
+                if (BEGINS_WITH(walk+1, "1min")) {
                         (void)printf("%1.2f", loadavg[0]);
-                        walk += strlen("5min");
+                        walk += strlen("1min");
                 }
 
-                if (BEGINS_WITH(walk+1, "10min")) {
+                if (BEGINS_WITH(walk+1, "5min")) {
                         (void)printf("%1.2f", loadavg[1]);
-                        walk += strlen("10min");
+                        walk += strlen("5min");
                 }
 
                 if (BEGINS_WITH(walk+1, "15min")) {
@@ -35,5 +34,8 @@ void print_load(const char *format) {
                         walk += strlen("15min");
                 }
         }
+        return;
+error:
 #endif
+        (void)fputs("Cannot read load\n", stderr);
 }