[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-481-gf857db98b

[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  f857db98bd2a3d97ada208a8137c48c47e9d3a78 (commit)
      from  f9ea9ce24cf4423111a7fa033f8ceff61d17aa5b (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 f857db98bd2a3d97ada208a8137c48c47e9d3a78
Author: Antonio Borneo <bor...@gm...>
Date:   Sun Aug 6 12:26:25 2023 +0200

    helper/command: inline run_command() in exec_command()
    
    Simplify the command execution by inlining run_command() inside
    exec_command().
    
    Change-Id: Id932b006846720cfd867d22d142cd35831dbd1a2
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/8056
    Tested-by: jenkins

diff --git a/src/helper/command.c b/src/helper/command.c
index 8860cf81f..57db2adc1 100644
--- a/src/helper/command.c
+++ b/src/helper/command.c
@@ -489,14 +489,27 @@ static bool command_can_run(struct command_context *cmd_ctx, struct command *c,
 	return false;
 }
 
-static int run_command(struct command_context *context,
-	struct command *c, const char **words, unsigned num_words)
+static int exec_command(Jim_Interp *interp, struct command_context *context,
+		struct command *c, int argc, Jim_Obj * const *argv)
 {
+	if (c->jim_handler)
+		return c->jim_handler(interp, argc, argv);
+
+	/* use c->handler */
+	const char **words = malloc(argc * sizeof(char *));
+	if (!words) {
+		LOG_ERROR("Out of memory");
+		return JIM_ERR;
+	}
+
+	for (int i = 0; i < argc; i++)
+		words[i] = Jim_GetString(argv[i], NULL);
+
 	struct command_invocation cmd = {
 		.ctx = context,
 		.current = c,
 		.name = c->name,
-		.argc = num_words - 1,
+		.argc = argc - 1,
 		.argv = words + 1,
 	};
 
@@ -526,7 +539,8 @@ static int run_command(struct command_context *context,
 	}
 	Jim_DecrRefCount(context->interp, cmd.output);
 
-	return retval;
+	free(words);
+	return command_retval_set(interp, retval);
 }
 
 int command_run_line(struct command_context *context, char *line)
@@ -867,27 +881,6 @@ static char *alloc_concatenate_strings(int argc, Jim_Obj * const *argv)
 	return all;
 }
 
-static int exec_command(Jim_Interp *interp, struct command_context *cmd_ctx,
-		struct command *c, int argc, Jim_Obj * const *argv)
-{
-	if (c->jim_handler)
-		return c->jim_handler(interp, argc, argv);
-
-	/* use c->handler */
-	const char **words = malloc(argc * sizeof(char *));
-	if (!words) {
-		LOG_ERROR("Out of memory");
-		return JIM_ERR;
-	}
-
-	for (int i = 0; i < argc; i++)
-		words[i] = Jim_GetString(argv[i], NULL);
-
-	int retval = run_command(cmd_ctx, c, words, argc);
-	free(words);
-	return command_retval_set(interp, retval);
-}
-
 static int jim_command_dispatch(Jim_Interp *interp, int argc, Jim_Obj * const *argv)
 {
 	/* check subcommands */

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

Summary of changes:
 src/helper/command.c | 43 ++++++++++++++++++-------------------------
 1 file changed, 18 insertions(+), 25 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository