helper/command: simplify run_command()
authorAntonio Borneo <borneo.antonio@gmail.com>
Wed, 13 May 2020 00:30:11 +0000 (02:30 +0200)
committerAntonio Borneo <borneo.antonio@gmail.com>
Sun, 18 Apr 2021 14:34:24 +0000 (15:34 +0100)
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>
src/helper/command.c

index 41b86796a1b7a1b5e9cd646e4eb8163d7a485e66..1628b6ee7fcbdcc81ca7da4612af6a947b41c45e 100644 (file)
@@ -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);
        }