ecos flash: -Wshadow warning fixes

[fw/openocd] / src / helper / command.h

diff --git a/src/helper/command.h b/src/helper/command.h
index 8a418d367d04f604ad6084adb47f381a420c58de..1bf2cb48cb1b06ba4365fc9c44ca879bc510dd85 100644 (file)
--- a/src/helper/command.h
+++ b/src/helper/command.h
@@ -311,6 +311,10 @@ void command_set_output_handler(struct command_context* context,
 
 int command_context_mode(struct command_context *context, enum command_mode mode);
 
+/* Return the current command context associated with the Jim interpreter or
+ * alternatively the global default command interpreter
+ */
+struct command_context *current_command_context(Jim_Interp *interp);
 /**
  * Creates a new command context using the startup TCL provided and
  * the existing Jim interpreter, if any. If interp == NULL, then command_init
@@ -383,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)
 
@@ -400,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)