interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

helper: fix -Wshadow warning in number parsing 

use obtuse local variable names in macros to avoid
interfering with global name space

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
This commit is contained in:
Øyvind Harboe 2010-06-14 12:10:35 +02:00
parent 18918a0423
commit f3ae52cace
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/helper/command.h
View File

@ -387,11 +387,11 @@ DECLARE_PARSE_WRAPPER(_s8, int8_t);
*/ */
#define COMMAND_PARSE_NUMBER(type, in, out) \ #define COMMAND_PARSE_NUMBER(type, in, out) \
do { \ do { \
int retval = parse_##type(in, &(out)); \ int retval_macro_tmp = parse_##type(in, &(out)); \
if (ERROR_OK != retval) { \ if (ERROR_OK != retval_macro_tmp) { \
command_print(CMD_CTX, stringify(out) \ command_print(CMD_CTX, stringify(out) \
" option value ('%s') is not valid", in); \ " option value ('%s') is not valid", in); \
return retval; \ return retval_macro_tmp; \
} \ } \
} while (0) } while (0)
@ -404,13 +404,13 @@ DECLARE_PARSE_WRAPPER(_s8, int8_t);
#define COMMAND_PARSE_BOOL(in, out, on, off) \ #define COMMAND_PARSE_BOOL(in, out, on, off) \
do { \ do { \
bool value; \ bool value; \
int retval = command_parse_bool_arg(in, &value); \ int retval_macro_tmp = command_parse_bool_arg(in, &value); \
if (ERROR_OK != retval) { \ if (ERROR_OK != retval_macro_tmp) { \
command_print(CMD_CTX, stringify(out) \ command_print(CMD_CTX, stringify(out) \
" option value ('%s') is not valid", in); \ " option value ('%s') is not valid", in); \
command_print(CMD_CTX, " choices are '%s' or '%s'", \ command_print(CMD_CTX, " choices are '%s' or '%s'", \
on, off); \ on, off); \
return retval; \ return retval_macro_tmp; \
} \ } \
out = value; \ out = value; \
} while (0) } while (0)