Update to the current Jim Tcl

This is a post-release version but hopefully some fixes that went in
are worth it; also the changes here make OpenOCD compatible with stock
0.75 version if a distro maintainer decides to use it.

Change-Id: I7ad1814c7c4868198475cdca4750c3d0ee4f5f8b
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Reviewed-on: http://openocd.zylin.com/2121
Tested-by: jenkins
Reviewed-by: Freddie Chopin <freddie.chopin@gmail.com>

diff --git a/jimtcl b/jimtcl
index 2c1eba991e21a6f0b531fb0f83e21f9e6ee7c515..72bbd6c5a327bdc1d5ea8cb12502640860b1fc44 160000 (submodule)
--- a/jimtcl
+++ b/jimtcl
@@ -1 +1 @@
-Subproject commit 2c1eba991e21a6f0b531fb0f83e21f9e6ee7c515
+Subproject commit 72bbd6c5a327bdc1d5ea8cb12502640860b1fc44

diff --git a/src/helper/command.c b/src/helper/command.c
index 21362a619f483df9b1fa5fa66155b22555f402c7..137ac7ee6782fcbbb3042bbb42990c0bb43baea5 100644 (file)
--- a/src/helper/command.c
+++ b/src/helper/command.c
@@ -365,7 +365,7 @@ static int register_command_handler(struct command_context *cmd_ctx,
 
        LOG_DEBUG("registering '%s'...", ocd_name);
 
-       Jim_CmdProc func = c->handler ? &script_command : &command_unknown;
+       Jim_CmdProc *func = c->handler ? &script_command : &command_unknown;
        int retval = Jim_CreateCommand(interp, ocd_name, func, c, NULL);
        free(ocd_name);
        if (JIM_OK != retval)

diff --git a/src/helper/command.h b/src/helper/command.h
index 0f0edbb578c2089252437687c81af9622f71e70c..0eda5b5e776e86313a7f9208ff7f149d8e666a48 100644 (file)
--- a/src/helper/command.h
+++ b/src/helper/command.h
@@ -168,7 +168,7 @@ struct command {
        struct command *parent;
        struct command *children;
        command_handler_t handler;
-       Jim_CmdProc jim_handler;
+       Jim_CmdProc *jim_handler;
        void *jim_handler_data;
        enum command_mode mode;
        struct command *next;
@@ -204,7 +204,7 @@ char *command_name(struct command *c, char delim);
 struct command_registration {
        const char *name;
        command_handler_t handler;
-       Jim_CmdProc jim_handler;
+       Jim_CmdProc *jim_handler;
        void *jim_handler_data;
        enum command_mode mode;
        const char *help;