X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fprint_load.c;h=5d97a2ca5a08c538a27705aba1718026c6a07689;hb=96923a5bc060c2195cdde25e77235410c69585e7;hp=6da2519c3d58496e58ecfac1491b767dd7fd17d3;hpb=9375959b68d7c80dbad53a6eb0df1035bb33c6ce;p=i3%2Fi3status diff --git a/src/print_load.c b/src/print_load.c index 6da2519..5d97a2c 100644 --- a/src/print_load.c +++ b/src/print_load.c @@ -1,4 +1,5 @@ // vim:ts=4:sw=4:expandtab +#include #include "i3status.h" #include #include @@ -29,21 +30,21 @@ void print_load(yajl_gen json_gen, char *buffer, const char *format, const char for (walk = selected_format; *walk != '\0'; walk++) { if (*walk != '%') { *(outwalk++) = *walk; - continue; - } - if (BEGINS_WITH(walk + 1, "1min")) { + + } else if (BEGINS_WITH(walk + 1, "1min")) { outwalk += sprintf(outwalk, "%1.2f", loadavg[0]); walk += strlen("1min"); - } - if (BEGINS_WITH(walk + 1, "5min")) { + } else if (BEGINS_WITH(walk + 1, "5min")) { outwalk += sprintf(outwalk, "%1.2f", loadavg[1]); walk += strlen("5min"); - } - if (BEGINS_WITH(walk + 1, "15min")) { + } else if (BEGINS_WITH(walk + 1, "15min")) { outwalk += sprintf(outwalk, "%1.2f", loadavg[2]); walk += strlen("15min"); + + } else { + *(outwalk++) = '%'; } }