[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-408-ge48093b39

[OpenOCD-Gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  e48093b395808692145bf320e6d206561670107c (commit)
      from  7b504370f732a00d803163cab2b1750bde1927cf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e48093b395808692145bf320e6d206561670107c
Author: Antonio Borneo <bor...@gm...>
Date:   Fri Sep 17 18:37:41 2021 +0200

    openocd: prevent jimtcl error message while testing commands
    
    The jimtcl API Jim_GetCommand() sets an error message when the
    command is not found and flag JIM_ERRMSG is set.
    OpenOCD is checking if the command has already been registered,
    thus 'command not found' is the desired case.
    
    Pass flag JIM_NONE to prevent jimtcl from setting the error
    message.
    
    Change-Id: I3329c2f8722eda0cc9a5f9cbd888a37915b46107
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/6562
    Tested-by: jenkins

diff --git a/src/target/arm_cti.c b/src/target/arm_cti.c
index 7d005e2b1..c776e9c2a 100644
--- a/src/target/arm_cti.c
+++ b/src/target/arm_cti.c
@@ -465,7 +465,7 @@ static int cti_create(struct jim_getopt_info *goi)
 	/* COMMAND */
 	jim_getopt_obj(goi, &new_cmd);
 	/* does this command exist? */
-	cmd = Jim_GetCommand(goi->interp, new_cmd, JIM_ERRMSG);
+	cmd = Jim_GetCommand(goi->interp, new_cmd, JIM_NONE);
 	if (cmd) {
 		cp = Jim_GetString(new_cmd, NULL);
 		Jim_SetResultFormatted(goi->interp, "Command: %s Exists", cp);
diff --git a/src/target/arm_dap.c b/src/target/arm_dap.c
index 2f21aa170..94edfc09d 100644
--- a/src/target/arm_dap.c
+++ b/src/target/arm_dap.c
@@ -230,7 +230,7 @@ static int dap_create(struct jim_getopt_info *goi)
 	/* COMMAND */
 	jim_getopt_obj(goi, &new_cmd);
 	/* does this command exist? */
-	cmd = Jim_GetCommand(goi->interp, new_cmd, JIM_ERRMSG);
+	cmd = Jim_GetCommand(goi->interp, new_cmd, JIM_NONE);
 	if (cmd) {
 		cp = Jim_GetString(new_cmd, NULL);
 		Jim_SetResultFormatted(goi->interp, "Command: %s Exists", cp);
diff --git a/src/target/arm_tpiu_swo.c b/src/target/arm_tpiu_swo.c
index 8b1d012ed..f2b514826 100644
--- a/src/target/arm_tpiu_swo.c
+++ b/src/target/arm_tpiu_swo.c
@@ -880,7 +880,7 @@ static int arm_tpiu_swo_create(Jim_Interp *interp, struct arm_tpiu_swo_object *o
 	assert(cmd_ctx);
 
 	/* does this command exist? */
-	cmd = Jim_GetCommand(interp, Jim_NewStringObj(interp, obj->name, -1), JIM_ERRMSG);
+	cmd = Jim_GetCommand(interp, Jim_NewStringObj(interp, obj->name, -1), JIM_NONE);
 	if (cmd) {
 		Jim_SetResultFormatted(interp, "Command: %s Exists", obj->name);
 		return JIM_ERR;
diff --git a/src/target/target.c b/src/target/target.c
index 6d3bf7787..fa0c2b256 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -5715,7 +5715,7 @@ static int target_create(struct jim_getopt_info *goi)
 	/* COMMAND */
 	jim_getopt_obj(goi, &new_cmd);
 	/* does this command exist? */
-	cmd = Jim_GetCommand(goi->interp, new_cmd, JIM_ERRMSG);
+	cmd = Jim_GetCommand(goi->interp, new_cmd, JIM_NONE);
 	if (cmd) {
 		cp = Jim_GetString(new_cmd, NULL);
 		Jim_SetResultFormatted(goi->interp, "Command/target: %s Exists", cp);

-----------------------------------------------------------------------

Summary of changes:
 src/target/arm_cti.c      | 2 +-
 src/target/arm_dap.c      | 2 +-
 src/target/arm_tpiu_swo.c | 2 +-
 src/target/target.c       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository