summaryrefslogtreecommitdiff
path: root/payloads
diff options
context:
space:
mode:
authorJacob Garber <jgarber1@ualberta.ca>2019-06-28 10:58:56 -0600
committerMartin Roth <martinroth@google.com>2019-07-07 20:19:49 +0000
commita711e9c44dfc0c50dd1a05a8cf34d393093300b4 (patch)
treef32d68a7e1cf549bbf0ad919fc63826afb94d652 /payloads
parent37bec0b3971efa18f6fcc405edfb4272d215752d (diff)
downloadcoreboot-a711e9c44dfc0c50dd1a05a8cf34d393093300b4.tar.xz
payloads/coreinfo: Use correct integer types for loop indices
Make sure that the type of the loop index matches the type of the upper bound. This fixes several -Wsign-compare warnings. Change-Id: I73a88355d86288609e03f7a6fcaec14dfedac203 Signed-off-by: Jacob Garber <jgarber1@ualberta.ca> Reviewed-on: https://review.coreboot.org/c/coreboot/+/33863 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
Diffstat (limited to 'payloads')
-rw-r--r--payloads/coreinfo/coreboot_module.c2
-rw-r--r--payloads/coreinfo/coreinfo.c20
-rw-r--r--payloads/coreinfo/pci_module.c2
-rw-r--r--payloads/coreinfo/timestamps_module.c6
4 files changed, 13 insertions, 17 deletions
diff --git a/payloads/coreinfo/coreboot_module.c b/payloads/coreinfo/coreboot_module.c
index d294288cf7..66c258249c 100644
--- a/payloads/coreinfo/coreboot_module.c
+++ b/payloads/coreinfo/coreboot_module.c
@@ -195,7 +195,7 @@ static int parse_header(void *addr, int len)
/* Now, walk the tables. */
ptr += header->header_bytes;
- for (i = 0; i < header->table_entries; i++) {
+ for (u32 j = 0; j < header->table_entries; j++) {
struct cb_record *rec = (struct cb_record *)ptr;
switch (rec->tag) {
diff --git a/payloads/coreinfo/coreinfo.c b/payloads/coreinfo/coreinfo.c
index 649bfde837..b731abfbf5 100644
--- a/payloads/coreinfo/coreinfo.c
+++ b/payloads/coreinfo/coreinfo.c
@@ -132,7 +132,7 @@ static void print_time_and_date(void)
static void print_menu(void)
{
- int i, j;
+ int j;
char menu[80];
char *ptr = menu;
@@ -140,11 +140,11 @@ static void print_menu(void)
for (j = 0; j < SCREEN_X; j++)
waddch(menuwin, ' ');
- for (i = 0; i < ARRAY_SIZE(categories); i++) {
+ for (size_t i = 0; i < ARRAY_SIZE(categories); i++) {
if (categories[i].count == 0)
continue;
- ptr += sprintf(ptr, "F%d: %s ", i + 1, categories[i].name);
+ ptr += sprintf(ptr, "F%zu: %s ", i + 1, categories[i].name);
}
mvwprintw(menuwin, 1, 0, menu);
@@ -215,9 +215,9 @@ static void handle_category_key(struct coreinfo_cat *cat, int key)
static void print_no_modules_selected(void)
{
- int height = getmaxy(stdscr), i;
+ int height = getmaxy(stdscr);
- for (i = 0; i < ARRAY_SIZE(categories); i++)
+ for (size_t i = 0; i < ARRAY_SIZE(categories); i++)
if (categories[i].count > 0)
return;
@@ -227,9 +227,7 @@ static void print_no_modules_selected(void)
static int first_nonempty_category(void)
{
- int i;
-
- for (i = 0; i < ARRAY_SIZE(categories); i++)
+ for (size_t i = 0; i < ARRAY_SIZE(categories); i++)
if (categories[i].count > 0)
return i;
return 0;
@@ -268,7 +266,7 @@ static void loop(void)
if (key >= '1' && key <= '9')
ch = key - '1';
- if (ch >= 0 && ch <= ARRAY_SIZE(categories)) {
+ if (ch >= 0 && (unsigned int)ch <= ARRAY_SIZE(categories)) {
if (ch == ARRAY_SIZE(categories))
continue;
if (categories[ch].count == 0)
@@ -289,7 +287,7 @@ static void loop(void)
int main(void)
{
- int i, j;
+ int j;
if (CONFIG(LP_USB))
usb_initialize();
@@ -310,7 +308,7 @@ int main(void)
werase(modwin);
- for (i = 0; i < ARRAY_SIZE(categories); i++) {
+ for (size_t i = 0; i < ARRAY_SIZE(categories); i++) {
for (j = 0; j < categories[i].count; j++)
categories[i].modules[j]->init();
}
diff --git a/payloads/coreinfo/pci_module.c b/payloads/coreinfo/pci_module.c
index 3060161fe0..cb53ed69f7 100644
--- a/payloads/coreinfo/pci_module.c
+++ b/payloads/coreinfo/pci_module.c
@@ -51,7 +51,7 @@ static void swap(struct pci_devices *a, struct pci_devices *b)
static int partition(struct pci_devices *list, int len)
{
- int val = list[len / 2].device;
+ pcidev_t val = list[len / 2].device;
int index = 0;
int i;
diff --git a/payloads/coreinfo/timestamps_module.c b/payloads/coreinfo/timestamps_module.c
index fe2d2b5c6b..5468844f89 100644
--- a/payloads/coreinfo/timestamps_module.c
+++ b/payloads/coreinfo/timestamps_module.c
@@ -29,9 +29,7 @@ static unsigned long tick_freq_mhz;
static const char *timestamp_name(uint32_t id)
{
- int i;
-
- for (i = 0; i < ARRAY_SIZE(timestamp_ids); i++) {
+ for (size_t i = 0; i < ARRAY_SIZE(timestamp_ids); i++) {
if (timestamp_ids[i].id == id)
return timestamp_ids[i].name;
}
@@ -184,7 +182,7 @@ static int timestamps_module_init(void)
prev_stamp = base_time;
total_time = 0;
- for (int i = 0; i < n_entries; i++) {
+ for (u32 i = 0; i < n_entries; i++) {
uint64_t stamp;
const struct timestamp_entry *tse = &timestamps->entries[i];