hla: improve readability of struct hl_interface_s initialization

[fw/openocd] / src / jtag / adapter.c

diff --git a/src/jtag/adapter.c b/src/jtag/adapter.c
index cf579ede069d773746955fa28cd76dbf327c17c5..80d5ab048a991e752c20199cd84cbba121c37684 100644 (file)
--- a/src/jtag/adapter.c
+++ b/src/jtag/adapter.c
@@ -51,8 +51,8 @@ const char * const jtag_only[] = { "jtag", NULL };
 
 static int jim_adapter_name(Jim_Interp *interp, int argc, Jim_Obj * const *argv)
 {
-       Jim_GetOptInfo goi;
-       Jim_GetOpt_Setup(&goi, interp, argc-1, argv + 1);
+       struct jim_getopt_info goi;
+       jim_getopt_setup(&goi, interp, argc-1, argv + 1);
 
        /* return the name of the interface */
        /* TCL code might need to know the exact type... */
@@ -62,7 +62,7 @@ static int jim_adapter_name(Jim_Interp *interp, int argc, Jim_Obj * const *argv)
                return JIM_ERR;
        }
        const char *name = adapter_driver ? adapter_driver->name : NULL;
-       Jim_SetResultString(goi.interp, name ? : "undefined", -1);
+       Jim_SetResultString(goi.interp, name ? name : "undefined", -1);
        return JIM_OK;
 }
 
@@ -91,7 +91,7 @@ COMMAND_HANDLER(handle_adapter_list_command)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        command_print(CMD, "The following debug adapters are available:");
-       for (unsigned i = 0; NULL != adapter_drivers[i]; i++) {
+       for (unsigned i = 0; adapter_drivers[i]; i++) {
                const char *name = adapter_drivers[i]->name;
                command_print(CMD, "%u: %s", i + 1, name);
        }
@@ -113,14 +113,14 @@ COMMAND_HANDLER(handle_adapter_driver_command)
        if (CMD_ARGC != 1 || CMD_ARGV[0][0] == '\0')
                return ERROR_COMMAND_SYNTAX_ERROR;
 
-       for (unsigned i = 0; NULL != adapter_drivers[i]; i++) {
+       for (unsigned i = 0; adapter_drivers[i]; i++) {
                if (strcmp(CMD_ARGV[0], adapter_drivers[i]->name) != 0)
                        continue;
 
-               if (NULL != adapter_drivers[i]->commands) {
+               if (adapter_drivers[i]->commands) {
                        retval = register_commands(CMD_CTX, NULL,
                                        adapter_drivers[i]->commands);
-                       if (ERROR_OK != retval)
+                       if (retval != ERROR_OK)
                                return retval;
                }
 
@@ -394,13 +394,13 @@ COMMAND_HANDLER(handle_adapter_speed_command)
                COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], khz);
 
                retval = jtag_config_khz(khz);
-               if (ERROR_OK != retval)
+               if (retval != ERROR_OK)
                        return retval;
        }
 
        int cur_speed = jtag_get_speed_khz();
        retval = jtag_get_speed_readable(&cur_speed);
-       if (ERROR_OK != retval)
+       if (retval != ERROR_OK)
                return retval;
 
        if (cur_speed)
@@ -584,7 +584,7 @@ static const struct command_registration adapter_command_handlers[] = {
                .handler = adapter_transports_command,
                .mode = COMMAND_CONFIG,
                .help = "Declare transports the adapter supports.",
-               .usage = "transport ... ",
+               .usage = "transport ...",
        },
        {
                .name = "usb",