printf format warning fixes

Observed on a Cygwin build.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>

diff --git a/src/flash/flash.c b/src/flash/flash.c
index 4c123f8fc88f80222364869c828177f9ce6b8db1..d1b023c55b28e11dd369599f553e133510b6842d 100644 (file)
--- a/src/flash/flash.c
+++ b/src/flash/flash.c
@@ -569,8 +569,8 @@ static int flash_check_sector_parameters(struct command_context_s *cmd_ctx,
        }
 
        if (!(last <= (num_sectors - 1))) {
-               command_print(cmd_ctx, "ERROR: "
-                               "last sector must be <= %d", num_sectors - 1);
+               command_print(cmd_ctx, "ERROR: last sector must be <= %d",
+                               (int) num_sectors - 1);
                return ERROR_FAIL;
        }
 
@@ -616,7 +616,8 @@ static int handle_flash_erase_command(struct command_context_s *cmd_ctx,
                                return retval;
                        command_print(cmd_ctx, "erased sectors %i through %i "
                                        "on flash bank %i in %s",
-                               first, last, bank_nr, duration_text);
+                               (int) first, (int) last, (int) bank_nr,
+                               duration_text);
                        free(duration_text);
                }
        }
@@ -667,8 +668,8 @@ static int handle_flash_protect_command(struct command_context_s *cmd_ctx,
                if (retval == ERROR_OK) {
                        command_print(cmd_ctx, "%s protection for sectors %i "
                                        "through %i on flash bank %i",
-                               (set) ? "set" : "cleared", first,
-                               last, bank_nr);
+                               (set) ? "set" : "cleared", (int) first,
+                               (int) last, (int) bank_nr);
                }
        }
        else

diff --git a/src/flash/lpc2900.c b/src/flash/lpc2900.c
index 26ca67f5fa70ec5175032c394940d8c737293de1..e39c53195d9f588f7ce3591099939050de71094f 100644 (file)
--- a/src/flash/lpc2900.c
+++ b/src/flash/lpc2900.c
@@ -444,9 +444,9 @@ static int lpc2900_write_index_page( struct flash_bank_s *bank,
                                      uint8_t (*page)[FLASH_PAGE_SIZE] )
 {
        /* Only pages 4...7 are user writable */
-       if( (pagenum < 4) || (pagenum > 7) )
+       if ((pagenum < 4) || (pagenum > 7))
        {
-               LOG_ERROR( "Refuse to burn index sector page %" PRIu32, pagenum );
+               LOG_ERROR("Refuse to burn index sector page %d", pagenum);
                return ERROR_COMMAND_ARGUMENT_INVALID;
        }
 
@@ -479,7 +479,7 @@ static int lpc2900_write_index_page( struct flash_bank_s *bank,
                                 bank->base + pagenum * FLASH_PAGE_SIZE,
                                 4, FLASH_PAGE_SIZE / 4, (uint8_t *)page) != ERROR_OK )
        {
-               LOG_ERROR( "Index sector write failed @ page %" PRIu32, pagenum );
+               LOG_ERROR("Index sector write failed @ page %d", pagenum);
                target_write_u32( target, FCTR, FCTR_FS_CS | FCTR_FS_WEB );
 
                return ERROR_FLASH_OPERATION_FAILED;
@@ -501,10 +501,10 @@ static int lpc2900_write_index_page( struct flash_bank_s *bank,
        /* Wait for the end of the write operation. If it's not over after one
         * second, something went dreadfully wrong... :-(
         */
-       if( lpc2900_wait_status( bank, INTSRC_END_OF_BURN, 1000 ) != ERROR_OK )
+       if (lpc2900_wait_status(bank, INTSRC_END_OF_BURN, 1000) != ERROR_OK)
        {
-               LOG_ERROR( "Index sector write failed @ page %" PRIu32, pagenum );
-               target_write_u32( target, FCTR, FCTR_FS_CS | FCTR_FS_WEB );
+               LOG_ERROR("Index sector write failed @ page %d", pagenum);
+               target_write_u32(target, FCTR, FCTR_FS_CS | FCTR_FS_WEB);
 
                return ERROR_FLASH_OPERATION_FAILED;
        }
@@ -796,7 +796,8 @@ static int lpc2900_handle_write_custom_command( struct command_context_s *cmd_ct
        if( (image.sections[0].base_address != 0) ||
         (image.sections[0].size != ISS_CUSTOMER_SIZE) )
        {
-               LOG_ERROR("Incorrect image file size. Expected %" PRIu32 ", got %" PRIu32,
+               LOG_ERROR("Incorrect image file size. Expected %d, "
+                       "got %" PRIu32,
                    ISS_CUSTOMER_SIZE, image.sections[0].size);
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
@@ -1477,12 +1478,13 @@ static int lpc2900_write(struct flash_bank_s *bank, uint8_t *buffer,
                        }
 
                        /* Skip the current sector if it is secured */
-                       if( bank->sectors[start_sector].is_protected )
+                       if (bank->sectors[start_sector].is_protected)
                        {
-                               LOG_DEBUG( "Skip secured sector %" PRIu32, start_sector );
+                               LOG_DEBUG("Skip secured sector %d",
+                                               start_sector);
 
                                /* Stop if this is the last sector */
-                               if( start_sector == bank->num_sectors - 1 )
+                               if (start_sector == bank->num_sectors - 1)
                                {
                                        break;
                                }
@@ -1763,9 +1765,9 @@ static int lpc2900_probe(struct flash_bank_s *bank)
        }
 
        /* Show detected device */
-       LOG_INFO("Flash bank %" PRIu32
+       LOG_INFO("Flash bank %d"
                 ": Device %s, %" PRIu32
-                " KiB in %" PRIu32 " sectors",
+                " KiB in %d sectors",
                 bank->bank_number,
                 lpc2900_info->target_name, bank->size / KiB,
                 bank->num_sectors);
@@ -1805,7 +1807,7 @@ static int lpc2900_probe(struct flash_bank_s *bank)
                         * that has more than 19 sectors. Politely ask for a fix then.
                         */
                        bank->sectors[i].size = 0;
-                       LOG_ERROR("Never heard about sector %" PRIu32 " (FIXME please)", i);
+                       LOG_ERROR("Never heard about sector %d", i);
                }
 
                offset += bank->sectors[i].size;

diff --git a/src/flash/mx3_nand.c b/src/flash/mx3_nand.c
index 20ab91e8110225f862ed1a468d63cfb1932a6913..a5df00338be9f0f3821424bb0cbb7fbf1099d226 100644 (file)
--- a/src/flash/mx3_nand.c
+++ b/src/flash/mx3_nand.c
@@ -40,9 +40,9 @@ get_next_halfword_from_sram_buffer() not tested
 static const char target_not_halted_err_msg[] =
        "target must be halted to use mx3 NAND flash controller";
 static const char data_block_size_err_msg[] =
-       "minimal granularity is one half-word, %d is incorrect";
+       "minimal granularity is one half-word, %" PRId32 " is incorrect";
 static const char sram_buffer_bounds_err_msg[] =
-       "trying to access out of SRAM buffer bound (addr=0x%x)";
+       "trying to access out of SRAM buffer bound (addr=0x%" PRIx32 ")";
 static const char get_status_register_err_msg[] = "can't get NAND status";
 static uint32_t in_sram_address;
 unsigned char sign_of_sequental_byte_read;

diff --git a/src/jtag/core.c b/src/jtag/core.c
index 14c28fb7072f59f54fb223b6c126504b6de436ea..564b93f84940d546f35fd00135693467c3978f11 100644 (file)
--- a/src/jtag/core.c
+++ b/src/jtag/core.c
@@ -1167,7 +1167,7 @@ static int jtag_validate_ircapture(void)
                                        (tap->ir_length + 7) / tap->ir_length,
                                        val,
                                        (tap->ir_length + 7) / tap->ir_length,
-                                       tap->ir_capture_value);
+                                       (unsigned) tap->ir_capture_value);
 
                        retval = ERROR_JTAG_INIT_FAILED;
                        goto done;

diff --git a/src/target/arm11.c b/src/target/arm11.c
index dc465973bb9acd8539a27cf1bf54b105d45a09ef..588ea3c27598a0f2ce8541ba087b0fbc4d6e3403 100644 (file)
--- a/src/target/arm11.c
+++ b/src/target/arm11.c
@@ -1480,8 +1480,10 @@ int arm11_write_memory(struct target_s *target, uint32_t address, uint32_t size,
 
                if (address + size * count != r0)
                {
-                       LOG_ERROR("Data transfer failed. Expected end address 0x%08x, got 0x%08x",
-                                       address + size * count, r0);
+                       LOG_ERROR("Data transfer failed. Expected end "
+                                       "address 0x%08x, got 0x%08x",
+                                       (unsigned) (address + size * count),
+                                       (unsigned) r0);
 
                        if (arm11_config_memwrite_burst)
                                LOG_ERROR("use 'arm11 memwrite burst disable' to disable fast burst mode");

diff --git a/src/target/etm.c b/src/target/etm.c
index 5a774f4d24c364beef75b9acbfcd94431afdbef1..34e2ca8a3c42c93563e13a6224ea71877f0c0a7a 100644 (file)
--- a/src/target/etm.c
+++ b/src/target/etm.c
@@ -1497,29 +1497,29 @@ static int handle_etm_info_command(struct command_context_s *cmd_ctx,
        command_print(cmd_ctx, "ETM v%d.%d",
                        etm->bcd_vers >> 4, etm->bcd_vers & 0xf);
        command_print(cmd_ctx, "pairs of address comparators: %i",
-                       (etm->config >> 0) & 0x0f);
+                       (int) (etm->config >> 0) & 0x0f);
        command_print(cmd_ctx, "data comparators: %i",
-                       (etm->config >> 4) & 0x0f);
+                       (int) (etm->config >> 4) & 0x0f);
        command_print(cmd_ctx, "memory map decoders: %i",
-                       (etm->config >> 8) & 0x1f);
+                       (int) (etm->config >> 8) & 0x1f);
        command_print(cmd_ctx, "number of counters: %i",
-                       (etm->config >> 13) & 0x07);
+                       (int) (etm->config >> 13) & 0x07);
        command_print(cmd_ctx, "sequencer %spresent",
-                       (etm->config & (1 << 16)) ? "" : "not ");
+                       (int) (etm->config & (1 << 16)) ? "" : "not ");
        command_print(cmd_ctx, "number of ext. inputs: %i",
-                       (etm->config >> 17) & 0x07);
+                       (int) (etm->config >> 17) & 0x07);
        command_print(cmd_ctx, "number of ext. outputs: %i",
-                       (etm->config >> 20) & 0x07);
+                       (int) (etm->config >> 20) & 0x07);
        command_print(cmd_ctx, "FIFO full %spresent",
-                       (etm->config & (1 << 23)) ? "" : "not ");
+                       (int) (etm->config & (1 << 23)) ? "" : "not ");
        if (etm->bcd_vers < 0x20)
                command_print(cmd_ctx, "protocol version: %i",
-                               (etm->config >> 28) & 0x07);
+                               (int) (etm->config >> 28) & 0x07);
        else {
                command_print(cmd_ctx, "trace start/stop %spresent",
                                (etm->config & (1 << 26)) ? "" : "not ");
                command_print(cmd_ctx, "number of context comparators: %i",
-                               (etm->config >> 24) & 0x03);
+                               (int) (etm->config >> 24) & 0x03);
        }
 
        /* SYS_CONFIG isn't present before ETMv1.2 */