summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Elsbrock <simon@iodev.org>2012-09-05 18:39:46 +0200
committerMichael Stapelberg <michael@stapelberg.de>2012-09-05 23:28:17 +0200
commit674d28e192680e2ebe9c1e83455ec034e451432f (patch)
tree8f8377b22732af09876c636386a37db286a27a5f
parentd6b8a4efc1c07f3bbf5f01f524986ecb496711a0 (diff)
modify START_COLOR macro variable naming
Rename val to _val to prevent shadowing warnings due to its common naming.
-rw-r--r--include/i3status.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/i3status.h b/include/i3status.h
index 1f9da4d..2317936 100644
--- a/include/i3status.h
+++ b/include/i3status.h
@@ -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)); \
} \