modify START_COLOR macro variable naming

Rename val to _val to prevent shadowing warnings due to its common
naming.
This commit is contained in:
Simon Elsbrock 2012-09-05 18:39:46 +02:00 committed by Michael Stapelberg
parent d6b8a4efc1
commit 674d28e192

View 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)); \
} \