diff options
| author | Øyvind Harboe <oyvind.harboe@zylin.com> | 2010-06-14 12:10:35 +0200 |
|---|---|---|
| committer | Øyvind Harboe <oyvind.harboe@zylin.com> | 2010-06-14 12:27:57 +0200 |
| commit | f3ae52cace69f9568bac719d50af3a62993e96ad (patch) | |
| tree | 7e6914a2c5318c7de41236b06bf731ccdb23f7c6 | |
| parent | 18918a0423e04180f580a4a9453e190488aab17d (diff) | |
| download | openocd_libswd-f3ae52cace69f9568bac719d50af3a62993e96ad.tar.gz openocd_libswd-f3ae52cace69f9568bac719d50af3a62993e96ad.tar.bz2 openocd_libswd-f3ae52cace69f9568bac719d50af3a62993e96ad.tar.xz openocd_libswd-f3ae52cace69f9568bac719d50af3a62993e96ad.zip | |
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>
| -rw-r--r-- | src/helper/command.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/helper/command.h b/src/helper/command.h index 2c192416..1bf2cb48 100644 --- a/src/helper/command.h +++ b/src/helper/command.h @@ -387,11 +387,11 @@ DECLARE_PARSE_WRAPPER(_s8, int8_t); */ #define COMMAND_PARSE_NUMBER(type, in, out) \ do { \ - int retval = parse_##type(in, &(out)); \ - if (ERROR_OK != retval) { \ + int retval_macro_tmp = parse_##type(in, &(out)); \ + if (ERROR_OK != retval_macro_tmp) { \ command_print(CMD_CTX, stringify(out) \ " option value ('%s') is not valid", in); \ - return retval; \ + return retval_macro_tmp; \ } \ } while (0) @@ -404,13 +404,13 @@ DECLARE_PARSE_WRAPPER(_s8, int8_t); #define COMMAND_PARSE_BOOL(in, out, on, off) \ do { \ bool value; \ - int retval = command_parse_bool_arg(in, &value); \ - if (ERROR_OK != retval) { \ + int retval_macro_tmp = command_parse_bool_arg(in, &value); \ + if (ERROR_OK != retval_macro_tmp) { \ command_print(CMD_CTX, stringify(out) \ " option value ('%s') is not valid", in); \ command_print(CMD_CTX, " choices are '%s' or '%s'", \ on, off); \ - return retval; \ + return retval_macro_tmp; \ } \ out = value; \ } while (0) |