flash: jtagspi: fix clang build warning

[openocd.git] / src / flash / nor / jtagspi.c

diff --git a/src/flash/nor/jtagspi.c b/src/flash/nor/jtagspi.c
index 866548a7e0148b44c71d5d5e0622145b37a6b6d3..6bb3af9b7df1a89ff4d60a4cbb0649631f7dc2a2 100644 (file)
--- a/src/flash/nor/jtagspi.c
+++ b/src/flash/nor/jtagspi.c
@@ -301,24 +301,18 @@ COMMAND_HANDLER(jtagspi_handle_set)
 COMMAND_HANDLER(jtagspi_handle_cmd)
 {
        struct flash_bank *bank;
-       unsigned int index = 1;
-       const int max = 21;
-       uint8_t num_write, num_read, write_buffer[max], read_buffer[1 << CHAR_BIT];
-       uint8_t data, *ptr;
-       char temp[4], output[(2 + max + (1 << CHAR_BIT)) * 3 + 8];
-       int retval;
+       const unsigned int max = 20;
+       uint8_t cmd_byte, num_read, write_buffer[max], read_buffer[1 << CHAR_BIT];
 
        LOG_DEBUG("%s", __func__);
 
-       if (CMD_ARGC < 3) {
-               command_print(CMD, "jtagspi: not enough arguments");
+       if (CMD_ARGC < 3)
                return ERROR_COMMAND_SYNTAX_ERROR;
-       }
 
-       num_write = CMD_ARGC - 2;
+       uint8_t num_write = CMD_ARGC - 3;
        if (num_write > max) {
-               LOG_ERROR("at most %d bytes may be send", max);
-               return ERROR_COMMAND_SYNTAX_ERROR;
+               command_print(CMD, "at most %d bytes may be send", max);
+               return ERROR_COMMAND_ARGUMENT_INVALID;
        }
 
        /* calling flash_command_get_bank without probing because we like to be
@@ -326,33 +320,31 @@ COMMAND_HANDLER(jtagspi_handle_cmd)
           "release from power down" is needed before probing when flash is in
           power down mode.
         */
-       retval = CALL_COMMAND_HANDLER(flash_command_get_bank_probe_optional, 0,
+       int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_probe_optional, 0,
                                                                &bank, false);
-       if (ERROR_OK != retval)
+       if (retval != ERROR_OK)
                return retval;
 
-       COMMAND_PARSE_NUMBER(u8, CMD_ARGV[index++], num_read);
+       COMMAND_PARSE_NUMBER(u8, CMD_ARGV[1], num_read);
+       COMMAND_PARSE_NUMBER(u8, CMD_ARGV[2], cmd_byte);
 
-       snprintf(output, sizeof(output), "spi: ");
-       for (ptr = &write_buffer[0] ; index < CMD_ARGC; index++) {
-               COMMAND_PARSE_NUMBER(u8, CMD_ARGV[index], data);
-               *ptr++ = data;
-               snprintf(temp, sizeof(temp), "%02" PRIx8 " ", data);
-               strncat(output, temp, sizeof(output) - strlen(output) - 1);
-       }
-       strncat(output, "-> ", sizeof(output) - strlen(output) - 1);
+       for (unsigned int i = 0; i < num_write; i++)
+               COMMAND_PARSE_NUMBER(u8, CMD_ARGV[i + 3], write_buffer[i]);
 
        /* process command */
-       ptr = &read_buffer[0];
-       retval = jtagspi_cmd(bank, write_buffer[0], &write_buffer[1], num_write - 1, ptr, -num_read);
+       retval = jtagspi_cmd(bank, cmd_byte, write_buffer, num_write, read_buffer, -num_read);
        if (retval != ERROR_OK)
                return retval;
 
-       for ( ; num_read > 0; num_read--) {
-               snprintf(temp, sizeof(temp), "%02" PRIx8 " ", *ptr++);
-               strncat(output, temp, sizeof(output) - strlen(output) - 1);
-       }
-       command_print(CMD, "%s", output);
+       command_print_sameline(CMD, "spi: %02" PRIx8, cmd_byte);
+
+       for (unsigned int i = 0; i < num_write; i++)
+               command_print_sameline(CMD, " %02" PRIx8, write_buffer[i]);
+
+       command_print_sameline(CMD, " ->");
+
+       for (unsigned int i = 0; i < num_read; i++)
+               command_print_sameline(CMD, " %02" PRIx8, read_buffer[i]);
 
        return ERROR_OK;
 }