Unify use of string comparisons

[i3/i3status] / src / print_run_watch.c

diff --git a/src/print_run_watch.c b/src/print_run_watch.c
index 807e322b07f4989f65dfbbb7bce31575834d0c85..bc0d6dc1635037bd5fbf54b7ec04f2f0131ba2dd 100644 (file)
--- a/src/print_run_watch.c
+++ b/src/print_run_watch.c
@@ -1,27 +1,33 @@
 #include <stdio.h>
 #include <string.h>
+#include <yajl/yajl_gen.h>
+#include <yajl/yajl_version.h>
 #include "i3status.h"
 
-void print_run_watch(const char *title, const char *pidfile, const char *format) {
+void print_run_watch(yajl_gen json_gen, char *buffer, const char *title, const char *pidfile, const char *format) {
        bool running = process_runs(pidfile);
        const char *walk;
+       char *outwalk = buffer;
 
-       printf("%s", (running ? color("#00FF00") : color("#FF0000")));
+       INSTANCE(pidfile);
+
+       START_COLOR((running ? "color_good" : "color_bad"));
 
         for (walk = format; *walk != '\0'; walk++) {
                 if (*walk != '%') {
-                        putchar(*walk);
+                       *(outwalk++) = *walk;
                         continue;
                 }
 
-                if (strncmp(walk+1, "title", strlen("title")) == 0) {
-                        printf("%s", title);
+                if (BEGINS_WITH(walk+1, "title")) {
+                       outwalk += sprintf(outwalk, "%s", title);
                         walk += strlen("title");
-                } else if (strncmp(walk+1, "status", strlen("status")) == 0) {
-                        printf("%s", (running ? "yes" : "no"));
+                } else if (BEGINS_WITH(walk+1, "status")) {
+                       outwalk += sprintf(outwalk, "%s", (running ? "yes" : "no"));
                         walk += strlen("status");
                 }
         }
 
-       printf("%s", endcolor());
+       END_COLOR;
+       OUTPUT_FULL_TEXT(buffer);
 }