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 <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/5672
Tested-by: jenkins
Reviewed-by: Oleksij Rempel <linux@rempel-privat.de>
This commit is contained in:
Antonio Borneo 2020-05-13 02:30:11 +02:00
parent e216186fab
commit f238337c9c
1 changed files with 3 additions and 10 deletions

View File

@ -586,20 +586,13 @@ static int run_command(struct command_context *context,
int retval = c->handler(&cmd); int retval = c->handler(&cmd);
if (retval == ERROR_COMMAND_SYNTAX_ERROR) { if (retval == ERROR_COMMAND_SYNTAX_ERROR) {
/* Print help for command */ /* Print help for command */
char *full_name = command_name(c, ' '); command_run_linef(context, "usage %s", words[0]);
if (NULL != full_name) {
command_run_linef(context, "usage %s", full_name);
free(full_name);
}
} else if (retval == ERROR_COMMAND_CLOSE_CONNECTION) { } else if (retval == ERROR_COMMAND_CLOSE_CONNECTION) {
/* just fall through for a shutdown request */ /* just fall through for a shutdown request */
} else { } else {
if (retval != ERROR_OK) { if (retval != ERROR_OK)
char *full_name = command_name(c, ' ');
LOG_DEBUG("Command '%s' failed with error code %d", LOG_DEBUG("Command '%s' failed with error code %d",
full_name ? full_name : c->name, retval); words[0], retval);
free(full_name);
}
/* Use the command output as the Tcl result */ /* Use the command output as the Tcl result */
Jim_SetResult(context->interp, cmd.output); Jim_SetResult(context->interp, cmd.output);
} }