diff options
author | Antonio Borneo <borneo.antonio@gmail.com> | 2020-05-13 02:30:11 +0200 |
---|---|---|
committer | Antonio Borneo <borneo.antonio@gmail.com> | 2021-04-18 15:34:24 +0100 |
commit | f238337c9c2fdabb48992487e5243d03d32e215d (patch) | |
tree | 7fb0ede580292429b3398f837266f8c64c5cd196 | |
parent | e216186fab59d71fdee24af926d1807a1d7fc950 (diff) | |
download | riscv-openocd-f238337c9c2fdabb48992487e5243d03d32e215d.zip riscv-openocd-f238337c9c2fdabb48992487e5243d03d32e215d.tar.gz riscv-openocd-f238337c9c2fdabb48992487e5243d03d32e215d.tar.bz2 |
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>
-rw-r--r-- | src/helper/command.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/helper/command.c b/src/helper/command.c index 41b8679..1628b6e 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); } |