unsigned: fix loop variables

When compiling with more alarms, signed vs unsigned comparison issues are raised. Hence, fix them before actually enabling additional checks. Signed-off-by: Norbert Manthey <[email protected]>
KernelTestFramework · Aug 21, 2020 · d81aa6f · d81aa6f
1 parent 074e6fe
commit d81aa6f
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/arch/x86/boot/multiboot.c b/arch/x86/boot/multiboot.c
@@ -59,7 +59,7 @@ void display_multiboot_mmap(void) {
         return;
     }
 
-    for (int i = 0; i < multiboot_mmap_num; i++) {
+    for (unsigned int i = 0; i < multiboot_mmap_num; i++) {
         multiboot_memory_map_t *entry = &multiboot_mmap[i];
 
         if (entry->type != MULTIBOOT_MEMORY_UNDEFINED) {
@@ -85,7 +85,7 @@ unsigned mbi_get_avail_memory_ranges_num(void) {
     unsigned num = 0;
 
     if (has_mbi_flag(MULTIBOOT_INFO_MEM_MAP)) {
-        for (int i = 0; i < multiboot_mmap_num; i++) {
+        for (unsigned int i = 0; i < multiboot_mmap_num; i++) {
             multiboot_memory_map_t *entry = &multiboot_mmap[i];
 
             if (entry->type == MULTIBOOT_MEMORY_AVAILABLE)
@@ -102,7 +102,7 @@ int mbi_get_avail_memory_range(unsigned index, addr_range_t *r) {
     unsigned avail = 0;
 
     if (has_mbi_flag(MULTIBOOT_INFO_MEM_MAP)) {
-        for (int i = 0; i < multiboot_mmap_num; i++) {
+        for (unsigned int i = 0; i < multiboot_mmap_num; i++) {
             multiboot_memory_map_t *entry = &multiboot_mmap[i];
 
             if (entry->type != MULTIBOOT_MEMORY_AVAILABLE)
@@ -135,7 +135,7 @@ int mbi_get_memory_range(paddr_t pa, addr_range_t *r) {
     paddr_t _start, _end;
 
     if (has_mbi_flag(MULTIBOOT_INFO_MEM_MAP)) {
-        for (int i = 0; i < multiboot_mmap_num; i++) {
+        for (unsigned int i = 0; i < multiboot_mmap_num; i++) {
             multiboot_memory_map_t *entry = &multiboot_mmap[i];
 
             _start = _paddr(entry->addr);

diff --git a/common/acpi.c b/common/acpi.c
@@ -42,7 +42,7 @@ static unsigned nr_cpus;
 static inline uint8_t get_checksum(void *ptr, size_t len) {
     uint8_t checksum = 0;
 
-    for (int i = 0; i < len; i++)
+    for (unsigned int i = 0; i < len; i++)
         checksum += *((uint8_t *) ptr + i);
 
     return checksum;
@@ -142,7 +142,7 @@ static inline xsdt_t *acpi_find_xsdt(const rsdp_rev2_t *rsdp) {
 }
 
 static void acpi_dump_tables(void) {
-    for (int i = 0; i < max_acpi_tables; i++) {
+    for (unsigned int i = 0; i < max_acpi_tables; i++) {
         acpi_table_t *tab = acpi_tables[i];
         acpi_table_hdr_t *hdr = &tab->header;
 
@@ -193,7 +193,7 @@ static unsigned process_madt_entries(void) {
 }
 
 acpi_table_t *acpi_find_table(uint32_t signature) {
-    for (int i = 0; i < max_acpi_tables; i++) {
+    for (unsigned int i = 0; i < max_acpi_tables; i++) {
         acpi_table_t *tab = acpi_tables[i];
 
         if (tab->header.signature == signature)
@@ -217,7 +217,7 @@ void init_acpi(void) {
     if (rsdp->rev < 2) {
         rsdt_t *rsdt = acpi_find_rsdt(rsdp);
 
-        for (int i = 0; i < ACPI_NR_TABLES(rsdt); i++) {
+        for (unsigned int i = 0; i < ACPI_NR_TABLES(rsdt); i++) {
             acpi_table_t *tab = acpi_map_table(rsdt->entry[i]);
 
             if (get_checksum(tab, tab->header.length) == 0x0)
@@ -227,7 +227,7 @@ void init_acpi(void) {
     else {
         xsdt_t *xsdt = acpi_find_xsdt((rsdp_rev2_t *) rsdp);
 
-        for (int i = 0; i < ACPI_NR_TABLES(xsdt); i++) {
+        for (unsigned int i = 0; i < ACPI_NR_TABLES(xsdt); i++) {
             paddr_t tab_pa = _ul(xsdt->entry[i].high) << 32 | xsdt->entry[i].low;
             acpi_table_t *tab = acpi_map_table(tab_pa);
 

diff --git a/drivers/vga.c b/drivers/vga.c
@@ -41,7 +41,7 @@ static inline void write_vga_buffer(void) {
 void vga_write(const char *buf, size_t len, vga_color_t color) {
     static int row = 0, col = 0;
 
-    for (int i = 0; i < len; i++) {
+    for (unsigned int i = 0; i < len; i++) {
         char c = buf[i];
 
         /* Newline on LF or when columns limit is hit */

diff --git a/mm/pmm.c b/mm/pmm.c
@@ -213,7 +213,7 @@ void init_pmm(void) {
     num = mbi_get_avail_memory_ranges_num();
 
     /* Skip low memory range */
-    for (int i = 1; i < num; i++)
+    for (unsigned int i = 1; i < num; i++)
         total_size += process_memory_range(i);
 
     display_frames_count(total_size);

diff --git a/smp/mptables.c b/smp/mptables.c
@@ -37,7 +37,7 @@ static unsigned nr_cpus;
 static inline uint8_t get_mp_checksum(void *ptr, size_t len) {
     uint8_t checksum = 0;
 
-    for (int i = 0; i < len; i++)
+    for (unsigned int i = 0; i < len; i++)
         checksum += *((uint8_t *) ptr + i);
 
     return checksum;

diff --git a/smp/smp.c b/smp/smp.c
@@ -103,7 +103,7 @@ void smp_init(void) {
 
     printk("Initializing SMP support (CPUs: %u)\n", nr_cpus);
 
-    for (int i = 0; i < nr_cpus; i++)
+    for (unsigned int i = 0; i < nr_cpus; i++)
         boot_cpu(i);
 }