]> git.sur5r.net Git - i3/i3status/commitdiff
modify START_COLOR macro variable naming
authorSimon Elsbrock <simon@iodev.org>
Wed, 5 Sep 2012 16:39:46 +0000 (18:39 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 5 Sep 2012 21:28:17 +0000 (23:28 +0200)
Rename val to _val to prevent shadowing warnings due to its common
naming.

include/i3status.h

index 1f9da4d60476d91d84e08e17397cf35c1753117a..23179369bc06a069a3e94d080cb3900287aa0822 100644 (file)
@@ -94,10 +94,10 @@ enum { O_DZEN2, O_XMOBAR, O_I3BAR, O_NONE } output_format;
 #define START_COLOR(colorstr) \
        do { \
                if (cfg_getbool(cfg_general, "colors")) { \
-                       const char *val = cfg_getstr(cfg_general, colorstr); \
+                       const char *_val = cfg_getstr(cfg_general, colorstr); \
                        if (output_format == O_I3BAR) { \
                                yajl_gen_string(json_gen, (const unsigned char *)"color", strlen("color")); \
-                               yajl_gen_string(json_gen, (const unsigned char *)val, strlen(val)); \
+                               yajl_gen_string(json_gen, (const unsigned char *)_val, strlen(_val)); \
                        } else { \
                                outwalk += sprintf(outwalk, "%s", color(colorstr)); \
                        } \