X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fprint_run_watch.c;h=3d1ec3fa4922a62248ecf83e1c6782fb84acc09d;hb=d74e904bf4bdd7f1d767a8db09987b90de809579;hp=f93c3a0e02c3d086c1de3c906bdc993ae31fb87f;hpb=12b1bfa9b8485de88b0bda82821c021aee197673;p=i3%2Fi3status

diff --git a/src/print_run_watch.c b/src/print_run_watch.c
index f93c3a0..3d1ec3f 100644
--- a/src/print_run_watch.c
+++ b/src/print_run_watch.c
@@ -1,32 +1,34 @@
+// vim:ts=4:sw=4:expandtab
 #include <stdio.h>
 #include <string.h>
 #include <yajl/yajl_gen.h>
+#include <yajl/yajl_version.h>
 #include "i3status.h"
 
 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;
+    bool running = process_runs(pidfile);
+    const char *walk;
+    char *outwalk = buffer;
 
-	INSTANCE(pidfile);
+    INSTANCE(pidfile);
 
-	START_COLOR((running ? "color_good" : "color_bad"));
+    START_COLOR((running ? "color_good" : "color_bad"));
 
-        for (walk = format; *walk != '\0'; walk++) {
-                if (*walk != '%') {
-			*(outwalk++) = *walk;
-                        continue;
-                }
+    for (walk = format; *walk != '\0'; walk++) {
+        if (*walk != '%') {
+            *(outwalk++) = *walk;
+            continue;
+        }
 
-                if (strncmp(walk+1, "title", strlen("title")) == 0) {
-			outwalk += sprintf(outwalk, "%s", title);
-                        walk += strlen("title");
-                } else if (strncmp(walk+1, "status", strlen("status")) == 0) {
-			outwalk += sprintf(outwalk, "%s", (running ? "yes" : "no"));
-                        walk += strlen("status");
-                }
+        if (BEGINS_WITH(walk + 1, "title")) {
+            outwalk += sprintf(outwalk, "%s", title);
+            walk += strlen("title");
+        } else if (BEGINS_WITH(walk + 1, "status")) {
+            outwalk += sprintf(outwalk, "%s", (running ? "yes" : "no"));
+            walk += strlen("status");
         }
+    }
 
-	END_COLOR;
-	OUTPUT_FULL_TEXT(buffer);
+    END_COLOR;
+    OUTPUT_FULL_TEXT(buffer);
 }