From f238337c9c2fdabb48992487e5243d03d32e215d Mon Sep 17 00:00:00 2001 From: Antonio Borneo Date: Wed, 13 May 2020 02:30:11 +0200 Subject: [PATCH] helper/command: simplify run_command() Now that the commands are registered using their full-name, the full-name is in argv[0]. Don't rebuild the full-name but use directly argv[0]. Change-Id: Ic9e469ac39276367b8c47527e70791ff470fefbc Signed-off-by: Antonio Borneo Reviewed-on: http://openocd.zylin.com/5672 Tested-by: jenkins Reviewed-by: Oleksij Rempel --- src/helper/command.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/helper/command.c b/src/helper/command.c index 41b86796a1..1628b6ee7f 100644 --- a/src/helper/command.c +++ b/src/helper/command.c @@ -586,20 +586,13 @@ static int run_command(struct command_context *context, int retval = c->handler(&cmd); if (retval == ERROR_COMMAND_SYNTAX_ERROR) { /* Print help for command */ - char *full_name = command_name(c, ' '); - if (NULL != full_name) { - command_run_linef(context, "usage %s", full_name); - free(full_name); - } + command_run_linef(context, "usage %s", words[0]); } else if (retval == ERROR_COMMAND_CLOSE_CONNECTION) { /* just fall through for a shutdown request */ } else { - if (retval != ERROR_OK) { - char *full_name = command_name(c, ' '); + if (retval != ERROR_OK) LOG_DEBUG("Command '%s' failed with error code %d", - full_name ? full_name : c->name, retval); - free(full_name); - } + words[0], retval); /* Use the command output as the Tcl result */ Jim_SetResult(context->interp, cmd.output); } -- 2.30.2