From: Antonio Borneo Date: Mon, 19 Dec 2022 22:58:01 +0000 (+0100) Subject: target: rewrite command 'target names' as COMMAND_HANDLER X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=commitdiff_plain;h=12b405a4ac3dddd18e2fd822e135bb783cae0236;hp=d9d698103e974b2a94c611864cccb92359509b7d target: rewrite command 'target names' as COMMAND_HANDLER Print one entry per line. While there add the mandatory 'usage' field. Change-Id: Ia832684817f3bdbfa4cb943cd97e3f9fb2605902 Signed-off-by: Antonio Borneo Reviewed-on: https://review.openocd.org/c/openocd/+/7510 Tested-by: jenkins --- diff --git a/src/target/target.c b/src/target/target.c index b77a25a2a3..3fdb34ec6f 100644 --- a/src/target/target.c +++ b/src/target/target.c @@ -6388,20 +6388,18 @@ COMMAND_HANDLER(handle_target_types) return ERROR_OK; } -static int jim_target_names(Jim_Interp *interp, int argc, Jim_Obj *const *argv) +COMMAND_HANDLER(handle_target_names) { - if (argc != 1) { - Jim_WrongNumArgs(interp, 1, argv, "Too many parameters"); - return JIM_ERR; - } - Jim_SetResult(interp, Jim_NewListObj(interp, NULL, 0)); + if (CMD_ARGC != 0) + return ERROR_COMMAND_SYNTAX_ERROR; + struct target *target = all_targets; while (target) { - Jim_ListAppendElement(interp, Jim_GetResult(interp), - Jim_NewStringObj(interp, target_name(target), -1)); + command_print(CMD, "%s", target_name(target)); target = target->next; } - return JIM_OK; + + return ERROR_OK; } static struct target_list * @@ -6531,8 +6529,9 @@ static const struct command_registration target_subcommand_handlers[] = { { .name = "names", .mode = COMMAND_ANY, - .jim_handler = jim_target_names, + .handler = handle_target_names, .help = "Returns the names of all targets as a list of strings", + .usage = "", }, { .name = "smp",