Added consumption to battery info

[i3/i3status] / src / print_load.c

diff --git a/src/print_load.c b/src/print_load.c
index 9fe1964c27d7bd5ad30ad7562021937cd586e7a3..7fd54ca6f1a6f6af7a24649d6f8f750fcf5d9e57 100644 (file)
--- a/src/print_load.c
+++ b/src/print_load.c
@@ -1,39 +1,50 @@
 // vim:ts=8:expandtab
 #include "i3status.h"
-#include <err.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <yajl/yajl_gen.h>
+#include <yajl/yajl_version.h>
+
+void print_load(yajl_gen json_gen, char *buffer, const char *format) {
+        char *outwalk = buffer;
+        /* Get load */
 
-void print_load(const char *format) {
-/* Get load */
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(sun)
         double loadavg[3];
         const char *walk;
 
         if (getloadavg(loadavg, 3) == -1)
-                errx(-1, "getloadavg() failed\n");
+                goto error;
 
         for (walk = format; *walk != '\0'; walk++) {
                 if (*walk != '%') {
-                        putchar(*walk);
+                        *(outwalk++) = *walk;
                         continue;
                 }
 
                 if (BEGINS_WITH(walk+1, "1min")) {
-                        (void)printf("%1.2f", loadavg[0]);
+                        outwalk += sprintf(outwalk, "%1.2f", loadavg[0]);
                         walk += strlen("1min");
                 }
 
                 if (BEGINS_WITH(walk+1, "5min")) {
-                        (void)printf("%1.2f", loadavg[1]);
+                        outwalk += sprintf(outwalk, "%1.2f", loadavg[1]);
                         walk += strlen("5min");
                 }
 
                 if (BEGINS_WITH(walk+1, "15min")) {
-                        (void)printf("%1.2f", loadavg[2]);
+                        outwalk += sprintf(outwalk, "%1.2f", loadavg[2]);
                         walk += strlen("15min");
                 }
         }
+
+        *outwalk = '\0';
+        OUTPUT_FULL_TEXT(buffer);
+
+        return;
+error:
 #endif
+        OUTPUT_FULL_TEXT("cant read load");
+        (void)fputs("i3status: Cannot read system load using getloadavg()\n", stderr);
 }