From b5d1b719e5a4a248d99921ebfd1298dcb473d1c1 Mon Sep 17 00:00:00 2001 From: Antonio Borneo Date: Tue, 9 Nov 2021 00:04:52 +0100 Subject: [PATCH] openocd: use single line for register_commands*() Do not split in multiple lines the calls to register_commands*(). No change in code behaviour, just make it easy to grep in the code and identify the commands that can be registered. This would help detecting undocumented commands. Change-Id: Id654e107cdabf7ee31fc3d227c1d2a59acc5669e Signed-off-by: Antonio Borneo Reviewed-on: https://review.openocd.org/c/openocd/+/6716 Tested-by: jenkins Reviewed-by: Tomas Vanek --- src/flash/nand/tcl.c | 3 +-- src/flash/nor/tcl.c | 3 +-- src/jtag/adapter.c | 3 +-- src/jtag/aice/aice_transport.c | 3 +-- src/jtag/hla/hla_transport.c | 6 ++---- src/pld/pld.c | 3 +-- src/target/etm.c | 3 +-- 7 files changed, 8 insertions(+), 16 deletions(-) diff --git a/src/flash/nand/tcl.c b/src/flash/nand/tcl.c index 6707314ccc..b796fb7cec 100644 --- a/src/flash/nand/tcl.c +++ b/src/flash/nand/tcl.c @@ -528,8 +528,7 @@ static COMMAND_HELPER(create_nand_device, const char *bank_name, } if (controller->commands) { - retval = register_commands(CMD_CTX, NULL, - controller->commands); + retval = register_commands(CMD_CTX, NULL, controller->commands); if (retval != ERROR_OK) return retval; } diff --git a/src/flash/nor/tcl.c b/src/flash/nor/tcl.c index 228e76fd0f..b24191348d 100644 --- a/src/flash/nor/tcl.c +++ b/src/flash/nor/tcl.c @@ -1284,8 +1284,7 @@ COMMAND_HANDLER(handle_flash_bank_command) /* register flash specific commands */ if (driver->commands) { - int retval = register_commands(CMD_CTX, NULL, - driver->commands); + int retval = register_commands(CMD_CTX, NULL, driver->commands); if (retval != ERROR_OK) { LOG_ERROR("couldn't register '%s' commands", driver_name); diff --git a/src/jtag/adapter.c b/src/jtag/adapter.c index c30019c175..65874590dd 100644 --- a/src/jtag/adapter.c +++ b/src/jtag/adapter.c @@ -367,8 +367,7 @@ COMMAND_HANDLER(handle_adapter_driver_command) continue; if (adapter_drivers[i]->commands) { - retval = register_commands(CMD_CTX, NULL, - adapter_drivers[i]->commands); + retval = register_commands(CMD_CTX, NULL, adapter_drivers[i]->commands); if (retval != ERROR_OK) return retval; } diff --git a/src/jtag/aice/aice_transport.c b/src/jtag/aice/aice_transport.c index 3e9d942197..c0088f5a4d 100644 --- a/src/jtag/aice/aice_transport.c +++ b/src/jtag/aice/aice_transport.c @@ -387,8 +387,7 @@ static const struct command_registration aice_transport_command_handlers[] = { /* */ static int aice_transport_register_commands(struct command_context *cmd_ctx) { - return register_commands(cmd_ctx, NULL, - aice_transport_command_handlers); + return register_commands(cmd_ctx, NULL, aice_transport_command_handlers); } /* */ diff --git a/src/jtag/hla/hla_transport.c b/src/jtag/hla/hla_transport.c index d925b174a8..684a52cb92 100644 --- a/src/jtag/hla/hla_transport.c +++ b/src/jtag/hla/hla_transport.c @@ -196,15 +196,13 @@ static int hl_jtag_transport_select(struct command_context *cmd_ctx) * That works with only C code ... no Tcl glue required. */ - return register_commands(cmd_ctx, NULL, - hl_jtag_transport_command_handlers); + return register_commands(cmd_ctx, NULL, hl_jtag_transport_command_handlers); } static int hl_swd_transport_select(struct command_context *cmd_ctx) { LOG_DEBUG("hl_swd_transport_select"); - return register_commands(cmd_ctx, NULL, - hl_swd_transport_command_handlers); + return register_commands(cmd_ctx, NULL, hl_swd_transport_command_handlers); } static struct transport hl_swd_transport = { diff --git a/src/pld/pld.c b/src/pld/pld.c index d0f85d74bf..fe21f6c85b 100644 --- a/src/pld/pld.c +++ b/src/pld/pld.c @@ -67,8 +67,7 @@ COMMAND_HANDLER(handle_pld_device_command) /* register pld specific commands */ int retval; if (pld_drivers[i]->commands) { - retval = register_commands(CMD_CTX, NULL, - pld_drivers[i]->commands); + retval = register_commands(CMD_CTX, NULL, pld_drivers[i]->commands); if (retval != ERROR_OK) { LOG_ERROR("couldn't register '%s' commands", CMD_ARGV[0]); return ERROR_FAIL; diff --git a/src/target/etm.c b/src/target/etm.c index e8bd20fef4..119c0df5d8 100644 --- a/src/target/etm.c +++ b/src/target/etm.c @@ -1416,8 +1416,7 @@ COMMAND_HANDLER(handle_etm_config_command) for (i = 0; etm_capture_drivers[i]; i++) { if (strcmp(CMD_ARGV[4], etm_capture_drivers[i]->name) == 0) { - int retval = register_commands(CMD_CTX, NULL, - etm_capture_drivers[i]->commands); + int retval = register_commands(CMD_CTX, NULL, etm_capture_drivers[i]->commands); if (retval != ERROR_OK) { free(etm_ctx); return retval; -- 2.30.2