Use (void) instead of () for functions without args (Thanks fernandotcl)

[i3/i3status] / src / output.c

diff --git a/src/output.c b/src/output.c
index d4d8c2f441d3ff02c91425a3827e7c98ec98c7b5..c4a2d275cde9864b00561d94e2eaffbb5eab76e6 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -20,11 +20,11 @@ char *color(const char *colorstr) {
                 colorbuf[0] = '\0';
                 return colorbuf;
         }
-#ifdef DZEN
-        (void)snprintf(colorbuf, sizeof(colorbuf), "^fg(%s)", colorstr);
-#elif XMOBAR
-        (void)snprintf(colorbuf, sizeof(colorbuf), "<fc=%s>", colorstr);
-#endif
+        if (output_format == O_DZEN2)
+                (void)snprintf(colorbuf, sizeof(colorbuf), "^fg(%s)", cfg_getstr(cfg_general, colorstr));
+        else if (output_format == O_XMOBAR)
+                (void)snprintf(colorbuf, sizeof(colorbuf), "<fc=%s>", cfg_getstr(cfg_general, colorstr));
+
         return colorbuf;
 }
 
@@ -32,16 +32,17 @@ char *color(const char *colorstr) {
  * Some color formats (xmobar) require to terminate colors again
  *
  */
-char *endcolor() {
-#ifdef XMOBAR
-        return "</fc>";
-#else
-        return "";
-#endif
+char *endcolor(void) {
+        if (output_format == O_XMOBAR)
+                return "</fc>";
+        else return "";
 }
 
-void print_seperator() {
-#if defined(DZEN) || defined(XMOBAR)
-        printf("%s", BAR);
-#endif
+void print_seperator(void) {
+        if (output_format == O_DZEN2)
+                printf("^fg(%s)^p(5;-2)^ro(2)^p()^fg()^p(5)", cfg_getstr(cfg_general, "color_separator"));
+        else if (output_format == O_XMOBAR)
+                printf("<fc=%s> | </fc>", cfg_getstr(cfg_general, "color_separator"));
+        else if (output_format == O_NONE)
+                printf(" | ");
 }