]> git.sur5r.net Git - openocd/commitdiff
helper: fix -Wshadow warning in number parsing
authorØyvind Harboe <oyvind.harboe@zylin.com>
Mon, 14 Jun 2010 10:10:35 +0000 (12:10 +0200)
committerØyvind Harboe <oyvind.harboe@zylin.com>
Mon, 14 Jun 2010 10:27:57 +0000 (12:27 +0200)
use obtuse local variable names in macros to avoid
interfering with global name space

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
src/helper/command.h

index 2c192416ef1d7324b7762a26c5c23e4cb510e3cc..1bf2cb48cb1b06ba4365fc9c44ca879bc510dd85 100644 (file)
@@ -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)