refactor(load): variables in a for loop scope
Reduce scope of indexing variables to the for loops.
Explicitly casting a 32-bit value to 16-bit.
Signed-off-by: J-Alves <joao.alves@arm.com>
Change-Id: I4dbf820510c6f3fe7cc9d1d369a95af826a54936
diff --git a/src/load.c b/src/load.c
index d59bc5d..d27eded 100644
--- a/src/load.c
+++ b/src/load.c
@@ -970,7 +970,6 @@
struct vm *primary;
struct mem_range mem_ranges_available[MAX_MEM_RANGES];
struct vm_locked primary_vm_locked;
- size_t i;
bool success = true;
/**
@@ -1000,7 +999,7 @@
params->mem_ranges, sizeof(params->mem_ranges));
/* Round the last addresses down to the page size. */
- for (i = 0; i < params->mem_ranges_count; ++i) {
+ for (size_t i = 0UL; i < params->mem_ranges_count; ++i) {
mem_ranges_available[i].end = pa_init(align_down(
pa_addr(mem_ranges_available[i].end), PAGE_SIZE));
}
@@ -1008,9 +1007,9 @@
primary = vm_find(HF_PRIMARY_VM_ID);
primary_vm_locked = vm_lock(primary);
- for (i = 0; i < manifest->vm_count; ++i) {
+ for (size_t i = 0UL; i < manifest->vm_count; ++i) {
const struct manifest_vm *manifest_vm = &manifest->vm[i];
- ffa_id_t vm_id = HF_VM_ID_OFFSET + i;
+ ffa_id_t vm_id = (ffa_id_t)(HF_VM_ID_OFFSET + i);
uint64_t mem_size;
paddr_t secondary_mem_begin;
paddr_t secondary_mem_end;