X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fprint_load.c;h=d47eceacdbf3abee23fcb98f6519c924654fa17b;hb=8166314ffa33849cfe7306c346e85c452587edbe;hp=c0d9494322a41e903cd3c6b5d342d03c835b7e7b;hpb=f947d0a446b1b99020722cbc71127fc0c06086b2;p=i3%2Fi3status diff --git a/src/print_load.c b/src/print_load.c index c0d9494..d47ecea 100644 --- a/src/print_load.c +++ b/src/print_load.c @@ -1,6 +1,5 @@ // vim:ts=8:expandtab #include "i3status.h" -#include #include #include #include @@ -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); }