commit cd5774b7baadc291ec12addcb72f954e2c749af0
author Fabio Utzig <utzig@apache.org> Wed Nov 29 10:18:26 2017 -0200
committer Fabio Utzig <utzig@utzig.org> Tue Dec 05 09:55:36 2017 -0200
tree 0925ceb90db00030939c6b30c0fdec7de470bef6
parent 446d3759f8e32ff3289d4cca56d43466cbdfaadb

Fix for gcc warnings

Fixes warnings treated as errors when upgrading gcc crate to 0.3.54.
Warnings are due to non-used variables and comparison between signed
and unsigned.

Signed-off-by: Fabio Utzig <utzig@apache.org>

boot/bootutil/src/bootutil_misc.c

diff --git a/boot/bootutil/src/bootutil_misc.c b/boot/bootutil/src/bootutil_misc.c
index bf4e9b8..0ec8605 100644
--- a/boot/bootutil/src/bootutil_misc.c
+++ b/boot/bootutil/src/bootutil_misc.c
@@ -100,7 +100,7 @@
 int
 boot_magic_code(const uint32_t *magic)
 {
-    int i;
+    size_t i;
 
     if (memcmp(magic, boot_img_magic, BOOT_MAGIC_SZ) == 0) {
         return BOOT_MAGIC_GOOD;
@@ -413,7 +413,7 @@
     struct boot_swap_state slot0;
     struct boot_swap_state slot1;
     int rc;
-    int i;
+    size_t i;
 
     rc = boot_read_swap_state_by_id(FLASH_AREA_IMAGE_0, &slot0);
     if (rc) {

boot/bootutil/src/image_rsa.c

diff --git a/boot/bootutil/src/image_rsa.c b/boot/bootutil/src/image_rsa.c
index 88ec784..4d4ab1f 100644
--- a/boot/bootutil/src/image_rsa.c
+++ b/boot/bootutil/src/image_rsa.c
@@ -268,7 +268,7 @@
     end = cp + *bootutil_keys[key_id].len;
 
     rc = bootutil_parse_rsakey(&ctx, &cp, end);
-    if (rc || slen != ctx.len) {
+    if (rc || (size_t)slen != ctx.len) {
         mbedtls_rsa_free(&ctx);
         return rc;
     }

boot/bootutil/src/loader.c

diff --git a/boot/bootutil/src/loader.c b/boot/bootutil/src/loader.c
index 9a921d8..b5e5c4a 100644
--- a/boot/bootutil/src/loader.c
+++ b/boot/bootutil/src/loader.c
@@ -149,7 +149,7 @@
     struct boot_swap_state state_scratch;
     struct boot_swap_state state_slot0;
     int rc;
-    int i;
+    size_t i;
     uint8_t source;
 
     rc = boot_read_swap_state_by_id(FLASH_AREA_IMAGE_0, &state_slot0);
@@ -1068,7 +1068,7 @@
     uint32_t sz;
     int first_sector_idx;
     int last_sector_idx;
-    int swap_idx;
+    uint32_t swap_idx;
     struct image_header *hdr;
     uint32_t size;
     uint32_t copy_size;

sim/mcuboot-sys/csupport/run.c

diff --git a/sim/mcuboot-sys/csupport/run.c b/sim/mcuboot-sys/csupport/run.c
index 261f24a..7010988 100644
--- a/sim/mcuboot-sys/csupport/run.c
+++ b/sim/mcuboot-sys/csupport/run.c
@@ -25,6 +25,7 @@
 uint8_t sim_flash_align = 1;
 uint8_t flash_area_align(const struct flash_area *area)
 {
+    (void)area;
     return sim_flash_align;
 }
 
@@ -68,6 +69,7 @@
 int hal_flash_read(uint8_t flash_id, uint32_t address, void *dst,
                    uint32_t num_bytes)
 {
+    (void)flash_id;
     // printf("hal_flash_read: %d, 0x%08x (0x%x)\n",
     //        flash_id, address, num_bytes);
     return sim_flash_read(address, dst, num_bytes);
@@ -76,6 +78,7 @@
 int hal_flash_write(uint8_t flash_id, uint32_t address,
                     const void *src, int32_t num_bytes)
 {
+    (void)flash_id;
     // printf("hal_flash_write: 0x%08x (0x%x)\n", address, num_bytes);
     // fflush(stdout);
     if (--flash_counter == 0) {
@@ -88,6 +91,7 @@
 int hal_flash_erase(uint8_t flash_id, uint32_t address,
                     uint32_t num_bytes)
 {
+    (void)flash_id;
     // printf("hal_flash_erase: 0x%08x, (0x%x)\n", address, num_bytes);
     // fflush(stdout);
     if (--flash_counter == 0) {
@@ -99,6 +103,7 @@
 
 uint8_t hal_flash_align(uint8_t flash_id)
 {
+    (void)flash_id;
     return sim_flash_align;
 }
 
@@ -115,7 +120,7 @@
 
 int flash_area_open(uint8_t id, const struct flash_area **area)
 {
-    int i;
+    uint32_t i;
 
     for (i = 0; i < flash_areas->num_slots; i++) {
         if (flash_areas->slots[i].id == id)
@@ -133,6 +138,7 @@
 
 void flash_area_close(const struct flash_area *area)
 {
+    (void)area;
 }
 
 /*
@@ -169,7 +175,7 @@
 
 int flash_area_to_sectors(int idx, int *cnt, struct flash_area *ret)
 {
-    int i;
+    uint32_t i;
     struct area *slot;
 
     for (i = 0; i < flash_areas->num_slots; i++) {
@@ -183,7 +189,7 @@
 
     slot = &flash_areas->slots[i];
 
-    if (slot->num_areas > *cnt) {
+    if (slot->num_areas > (uint32_t)*cnt) {
         printf("Too many areas in slot\n");
         abort();
     }
@@ -197,7 +203,7 @@
 int flash_area_get_sectors(int fa_id, uint32_t *count,
                            struct flash_sector *sectors)
 {
-    int i;
+    uint32_t i;
     struct area *slot;
 
     for (i = 0; i < flash_areas->num_slots; i++) {