aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Fertser <fercerpav@gmail.com>2014-04-28 14:34:47 +0400
committerFreddie Chopin <freddie.chopin@gmail.com>2014-05-09 20:12:17 +0000
commit92ea548aafee840e1507306a3ffb38625f427ec5 (patch)
tree2dd8e84463bfd905fc1b26230ffd258a5dd8db14
parentdd2e16a9e8b8c3da6e25ccd0d49ab833f0a3be02 (diff)
downloadriscv-openocd-92ea548aafee840e1507306a3ffb38625f427ec5.zip
riscv-openocd-92ea548aafee840e1507306a3ffb38625f427ec5.tar.gz
riscv-openocd-92ea548aafee840e1507306a3ffb38625f427ec5.tar.bz2
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>
m---------jimtcl0
-rw-r--r--src/helper/command.c2
-rw-r--r--src/helper/command.h4
3 files changed, 3 insertions, 3 deletions
diff --git a/jimtcl b/jimtcl
-Subproject 2c1eba991e21a6f0b531fb0f83e21f9e6ee7c51
+Subproject 72bbd6c5a327bdc1d5ea8cb12502640860b1fc4
diff --git a/src/helper/command.c b/src/helper/command.c
index 21362a6..137ac7e 100644
--- 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 0f0edbb..0eda5b5 100644
--- 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;