commit 4ff95da6f631409e1b3340bb972e91deec0ec924
author Dominik Ermel <dominik.ermel@nordicsemi.no> Mon Aug 07 13:53:29 2023 +0000
committer Dominik Ermel <56024351+de-nordic@users.noreply.github.com> Tue Aug 22 14:24:03 2023 +0200
tree 422ad18d8d6744287ea1dd58efcdac42d27030b6
parent 2c61caf606b5dedfab4294c51a2ab1ef517396f9

bootuil: Replace flash_area_id_to_image with flash_area_to_image

Move flash_area_get_id inside the function and rename it.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>

boot/bootutil/src/bootutil_public.c

diff --git a/boot/bootutil/src/bootutil_public.c b/boot/bootutil/src/bootutil_public.c
index 2795415..afa601c 100644
--- a/boot/bootutil/src/bootutil_public.c
+++ b/boot/bootutil/src/bootutil_public.c
@@ -472,10 +472,11 @@
 
 #ifndef MCUBOOT_BOOTUTIL_LIB_FOR_DIRECT_XIP
 
-static int flash_area_id_to_image(int id)
+static int flash_area_to_image(const struct flash_area *fa)
 {
 #if BOOT_IMAGE_NUMBER > 1
     uint8_t i = 0;
+    int id = flash_area_get_id(fa);
 
     while (i < BOOT_IMAGE_NUMBER) {
         if (FLASH_AREA_IMAGE_PRIMARY(i) == id || (FLASH_AREA_IMAGE_SECONDARY(i) == id)) {
@@ -485,7 +486,7 @@
         ++i;
     }
 #else
-    (void)id;
+    (void)fa;
 #endif
     return 0;
 }
@@ -535,8 +536,7 @@
                 } else {
                     swap_type = BOOT_SWAP_TYPE_TEST;
                 }
-                rc = boot_write_swap_info(fa, swap_type,
-                                          flash_area_id_to_image(flash_area_get_id(fa)));
+                rc = boot_write_swap_info(fa, swap_type, flash_area_to_image(fa));
             }
         }
         break;