jtag/drivers/jlink: Use correct command errors

While at it, remove the syntax error messages as the correct
syntax is already suggested due to the return value used.

Change-Id: I9310ba96ed3f8a85c37cee9193e481ad3df02e77
Signed-off-by: Marc Schink <dev@zapb.de>
Reviewed-on: https://review.openocd.org/c/openocd/+/7969
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
Tested-by: jenkins
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>

diff --git a/src/jtag/drivers/jlink.c b/src/jtag/drivers/jlink.c
index 243d1a46b25d01194317173c2fd18b2c313c0fb1..5743d8d6eb8d8daec760341cfecf0e1ce3ab5981 100644 (file)
--- a/src/jtag/drivers/jlink.c
+++ b/src/jtag/drivers/jlink.c
@@ -966,19 +966,17 @@ COMMAND_HANDLER(jlink_usb_command)
 {
        int tmp;
 
-       if (CMD_ARGC != 1) {
-               command_print(CMD, "Need exactly one argument for jlink usb");
+       if (CMD_ARGC != 1)
                return ERROR_COMMAND_SYNTAX_ERROR;
-       }
 
        if (sscanf(CMD_ARGV[0], "%i", &tmp) != 1) {
                command_print(CMD, "Invalid USB address: %s", CMD_ARGV[0]);
-               return ERROR_FAIL;
+               return ERROR_COMMAND_ARGUMENT_INVALID;
        }
 
        if (tmp < JAYLINK_USB_ADDRESS_0 || tmp > JAYLINK_USB_ADDRESS_3) {
                command_print(CMD, "Invalid USB address: %s", CMD_ARGV[0]);
-               return ERROR_FAIL;
+               return ERROR_COMMAND_ARGUMENT_INVALID;
        }
 
        usb_address = tmp;
@@ -1059,7 +1057,7 @@ COMMAND_HANDLER(jlink_handle_jlink_jtag_command)
        } else if (CMD_ARGC == 1) {
                if (sscanf(CMD_ARGV[0], "%i", &tmp) != 1) {
                        command_print(CMD, "Invalid argument: %s", CMD_ARGV[0]);
-                       return ERROR_COMMAND_SYNTAX_ERROR;
+                       return ERROR_COMMAND_ARGUMENT_INVALID;
                }
 
                switch (tmp) {
@@ -1071,10 +1069,9 @@ COMMAND_HANDLER(jlink_handle_jlink_jtag_command)
                                break;
                        default:
                                command_print(CMD, "Invalid argument: %s", CMD_ARGV[0]);
-                               return ERROR_COMMAND_SYNTAX_ERROR;
+                               return ERROR_COMMAND_ARGUMENT_INVALID;
                }
        } else {
-               command_print(CMD, "Need exactly one argument for jlink jtag");
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
@@ -1086,10 +1083,8 @@ COMMAND_HANDLER(jlink_handle_target_power_command)
        int ret;
        int enable;
 
-       if (CMD_ARGC != 1) {
-               command_print(CMD, "Need exactly one argument for jlink targetpower");
+       if (CMD_ARGC != 1)
                return ERROR_COMMAND_SYNTAX_ERROR;
-       }
 
        if (!jaylink_has_cap(caps, JAYLINK_DEV_CAP_SET_TARGET_POWER)) {
                command_print(CMD, "Target power supply is not supported by the "
@@ -1428,17 +1423,16 @@ COMMAND_HANDLER(jlink_handle_config_usb_address_command)
        } else if (CMD_ARGC == 1) {
                if (sscanf(CMD_ARGV[0], "%" SCNd8, &tmp) != 1) {
                        command_print(CMD, "Invalid USB address: %s", CMD_ARGV[0]);
-                       return ERROR_FAIL;
+                       return ERROR_COMMAND_ARGUMENT_INVALID;
                }
 
                if (tmp > JAYLINK_USB_ADDRESS_3) {
                        command_print(CMD, "Invalid USB address: %u", tmp);
-                       return ERROR_FAIL;
+                       return ERROR_COMMAND_ARGUMENT_INVALID;
                }
 
                tmp_config.usb_address = tmp;
        } else {
-               command_print(CMD, "Need exactly one argument for jlink config usb");
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
@@ -1470,13 +1464,11 @@ COMMAND_HANDLER(jlink_handle_config_target_power_command)
                        enable = false;
                } else {
                        command_print(CMD, "Invalid argument: %s", CMD_ARGV[0]);
-                       return ERROR_FAIL;
+                       return ERROR_COMMAND_ARGUMENT_INVALID;
                }
 
                tmp_config.target_power = enable;
        } else {
-               command_print(CMD, "Need exactly one argument for jlink config "
-                       "targetpower");
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
@@ -1510,7 +1502,7 @@ COMMAND_HANDLER(jlink_handle_config_mac_address_command)
                if ((strlen(str) != 17) || (str[2] != ':' || str[5] != ':' ||
                                str[8] != ':' || str[11] != ':' || str[14] != ':')) {
                        command_print(CMD, "Invalid MAC address format");
-                       return ERROR_COMMAND_SYNTAX_ERROR;
+                       return ERROR_COMMAND_ARGUMENT_INVALID;
                }
 
                for (i = 5; i >= 0; i--) {
@@ -1520,17 +1512,16 @@ COMMAND_HANDLER(jlink_handle_config_mac_address_command)
 
                if (!(addr[0] | addr[1] | addr[2] | addr[3] | addr[4] | addr[5])) {
                        command_print(CMD, "Invalid MAC address: zero address");
-                       return ERROR_COMMAND_SYNTAX_ERROR;
+                       return ERROR_COMMAND_ARGUMENT_INVALID;
                }
 
                if (!(0x01 & addr[0])) {
                        command_print(CMD, "Invalid MAC address: multicast address");
-                       return ERROR_COMMAND_SYNTAX_ERROR;
+                       return ERROR_COMMAND_ARGUMENT_INVALID;
                }
 
                memcpy(tmp_config.mac_address, addr, sizeof(addr));
        } else {
-               command_print(CMD, "Need exactly one argument for jlink config mac");
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
@@ -1592,20 +1583,26 @@ COMMAND_HANDLER(jlink_handle_config_ip_address_command)
        if (!CMD_ARGC) {
                show_config_ip_address(CMD);
        } else {
-               if (!string_to_ip(CMD_ARGV[0], ip_address, &i))
-                       return ERROR_COMMAND_SYNTAX_ERROR;
+               if (!string_to_ip(CMD_ARGV[0], ip_address, &i)) {
+                       command_print(CMD, "invalid IPv4 address");
+                       return ERROR_COMMAND_ARGUMENT_INVALID;
+               }
 
                len = strlen(CMD_ARGV[0]);
 
                /* Check for format A.B.C.D/E. */
                if (i < len) {
-                       if (CMD_ARGV[0][i] != '/')
-                               return ERROR_COMMAND_SYNTAX_ERROR;
+                       if (CMD_ARGV[0][i] != '/') {
+                               command_print(CMD, "missing network mask");
+                               return ERROR_COMMAND_ARGUMENT_INVALID;
+                       }
 
                        COMMAND_PARSE_NUMBER(u8, CMD_ARGV[0] + i + 1, subnet_bits);
                } else if (CMD_ARGC > 1) {
-                       if (!string_to_ip(CMD_ARGV[1], (uint8_t *)&subnet_mask, &i))
-                               return ERROR_COMMAND_SYNTAX_ERROR;
+                       if (!string_to_ip(CMD_ARGV[1], (uint8_t *)&subnet_mask, &i)) {
+                               command_print(CMD, "invalid subnet mask");
+                               return ERROR_COMMAND_ARGUMENT_INVALID;
+                       }
                }
 
                if (!subnet_mask)