[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-479-g712c1244e

[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  712c1244e8486bb4519ad0144a03c3c48c030214 (commit)
      from  5e1468da186e65029316a359493e2d2353e21512 (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 712c1244e8486bb4519ad0144a03c3c48c030214
Author: Antonio Borneo <bor...@gm...>
Date:   Sun Aug 6 10:32:46 2023 +0200

    helper/command: simplify script_command_args_alloc()
    
    The output parameter nwords is always equal to the input parameter
    argc, when the function succeeds.
    
    Drop the parameter nwords and let the caller use directly the
    value in argc.
    
    While there, convert some 'unsigned' to 'unsigned int'.
    
    Change-Id: Ie3d8ce1351792f3c07fe39cdcbcd180fd24dc928
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/8054
    Tested-by: jenkins

diff --git a/src/helper/command.c b/src/helper/command.c
index 96023336c..f7ec0e21f 100644
--- a/src/helper/command.c
+++ b/src/helper/command.c
@@ -161,15 +161,13 @@ static void script_command_args_free(char **words, unsigned nwords)
 	free(words);
 }
 
-static char **script_command_args_alloc(
-	unsigned argc, Jim_Obj * const *argv, unsigned *nwords)
+static char **script_command_args_alloc(unsigned int argc, Jim_Obj * const *argv)
 {
 	char **words = malloc(argc * sizeof(char *));
 	if (!words)
 		return NULL;
 
-	unsigned i;
-	for (i = 0; i < argc; i++) {
+	for (unsigned int i = 0; i < argc; i++) {
 		const char *w = Jim_GetString(argv[i], NULL);
 		words[i] = strdup(w);
 		if (!words[i]) {
@@ -177,7 +175,6 @@ static char **script_command_args_alloc(
 			return NULL;
 		}
 	}
-	*nwords = i;
 	return words;
 }
 
@@ -901,8 +898,8 @@ static int exec_command(Jim_Interp *interp, struct command_context *cmd_ctx,
 		return c->jim_handler(interp, argc, argv);
 
 	/* use c->handler */
-	unsigned int nwords;
-	char **words = script_command_args_alloc(argc, argv, &nwords);
+	unsigned int nwords = argc;
+	char **words = script_command_args_alloc(argc, argv);
 	if (!words)
 		return JIM_ERR;
 

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

Summary of changes:
 src/helper/command.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository