diff options
| author | Antonio Borneo <borneo.antonio@gmail.com> | 2022-12-19 23:50:23 +0100 |
|---|---|---|
| committer | Antonio Borneo <borneo.antonio@gmail.com> | 2023-03-25 18:15:33 +0000 |
| commit | 26f457896c456c57a57719e484d055d444ba67ee (patch) | |
| tree | 664b8497a7d6b01330d1a5b0858dd0a3d8c2c48d | |
| parent | 583efa68f71b9ad8e06b8e1246af25fc6c70e052 (diff) | |
| download | riscv-openocd-26f457896c456c57a57719e484d055d444ba67ee.zip riscv-openocd-26f457896c456c57a57719e484d055d444ba67ee.tar.gz riscv-openocd-26f457896c456c57a57719e484d055d444ba67ee.tar.bz2 | |
target: rewrite command 'target current' as COMMAND_HANDLER
While there add the mandatory 'usage' field.
Change-Id: I3e5b826ca58f7ade30a443ada0cb4a9cd9ea35c2
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/7508
Tested-by: jenkins
| -rw-r--r-- | src/target/target.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/target/target.c b/src/target/target.c index 4e29146..ae5f74c 100644 --- a/src/target/target.c +++ b/src/target/target.c @@ -6365,19 +6365,16 @@ static int target_create(struct jim_getopt_info *goi) return JIM_OK; } -static int jim_target_current(Jim_Interp *interp, int argc, Jim_Obj *const *argv) +COMMAND_HANDLER(handle_target_current) { - if (argc != 1) { - Jim_WrongNumArgs(interp, 1, argv, "Too many parameters"); - return JIM_ERR; - } - struct command_context *cmd_ctx = current_command_context(interp); - assert(cmd_ctx); + if (CMD_ARGC != 0) + return ERROR_COMMAND_SYNTAX_ERROR; - struct target *target = get_current_target_or_null(cmd_ctx); + struct target *target = get_current_target_or_null(CMD_CTX); if (target) - Jim_SetResultString(interp, target_name(target), -1); - return JIM_OK; + command_print(CMD, "%s", target_name(target)); + + return ERROR_OK; } static int jim_target_types(Jim_Interp *interp, int argc, Jim_Obj *const *argv) @@ -6522,8 +6519,9 @@ static const struct command_registration target_subcommand_handlers[] = { { .name = "current", .mode = COMMAND_ANY, - .jim_handler = jim_target_current, + .handler = handle_target_current, .help = "Returns the currently selected target", + .usage = "", }, { .name = "types", |