ft2232: fix warning about assignment to local variable

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

diff --git a/src/helper/command.h b/src/helper/command.h
index 2c192416ef1d7324b7762a26c5c23e4cb510e3cc..3d1cdec8608730184e2ad4de6a1487070e608310 100644 (file)
--- a/src/helper/command.h
+++ b/src/helper/command.h
@@ -29,12 +29,11 @@
 #if BUILD_ECOSBOARD
 #include <stdio.h>
 #include <stdarg.h>
-/* Jim is provied by eCos */
-#include <cyg/jimtcl/jim.h>
-#else
-#include <helper/jim.h>
 #endif
 
+#include <jim.h>
+#include <jim-nvp.h>
+
 /* To achieve C99 printf compatibility in MinGW, gnu_printf should be
  * used for __attribute__((format( ... ))), with GCC v4.4 or later
  */
@@ -174,7 +173,7 @@ typedef __COMMAND_HANDLER((*command_handler_t));
 
 struct command
 {
-       char *name;
+       const char *name;
        const char *help;
        const char *usage;
        struct command *parent;
@@ -387,11 +386,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 +403,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)