Attachment 890689 Details for Bug 920626 – patch for external jimctl

[patch] patch for external jimctl

b250bc0c.diff (text/plain), 1.53 KB, created by Jiri Kastner on 2014-04-29 08:48:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jiri Kastner

Created: 2014-04-29 08:48:47 UTC

Size: 1.53 KB

patch

obsolete

>From b250bc0ce48a90db20ac0ad27bd99629a80374ba Mon Sep 17 00:00:00 2001
>From: Paul Fertser <fercerpav@gmail.com>
>Date: Mon, 28 Apr 2014 14:34:47 +0400
>Subject: [PATCH] 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>
>---
>
>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 @@
> 
> 	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 *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 @@
> 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;

Actions: View | Diff

Attachments on bug 920626: 890689 | 890691 | 1026698