sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

payloads/coreinfo: Use correct integer types for loop indices

Browse Source 
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>
This commit is contained in:
Jacob Garber
2019-06-28 10:58:56 -06:00
committed by Martin Roth
parent 37bec0b397
commit a711e9c44d
4 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
payloads/coreinfo/coreboot_module.c
View File

@@ -195,7 +195,7 @@ static int parse_header(void *addr, int len)
/* Now, walk the tables. */ /* Now, walk the tables. */
ptr += header->header_bytes; 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; struct cb_record *rec = (struct cb_record *)ptr;
switch (rec->tag) { switch (rec->tag) {

20
payloads/coreinfo/coreinfo.c
View File

@@ -132,7 +132,7 @@ static void print_time_and_date(void)
static void print_menu(void) static void print_menu(void)
{ {
int i, j; int j;
char menu[80]; char menu[80];
char *ptr = menu; char *ptr = menu;
@@ -140,11 +140,11 @@ static void print_menu(void)
for (j = 0; j < SCREEN_X; j++) for (j = 0; j < SCREEN_X; j++)
waddch(menuwin, ' '); 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) if (categories[i].count == 0)
continue; 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); 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) 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) if (categories[i].count > 0)
return; return;
@@ -227,9 +227,7 @@ static void print_no_modules_selected(void)
static int first_nonempty_category(void) static int first_nonempty_category(void)
{ {
int i; for (size_t i = 0; i < ARRAY_SIZE(categories); i++)
for (i = 0; i < ARRAY_SIZE(categories); i++)
if (categories[i].count > 0) if (categories[i].count > 0)
return i; return i;
return 0; return 0;
@@ -268,7 +266,7 @@ static void loop(void)
if (key >= '1' && key <= '9') if (key >= '1' && key <= '9')
ch = key - '1'; ch = key - '1';
if (ch >= 0 && ch <= ARRAY_SIZE(categories)) { if (ch >= 0 && (unsigned int)ch <= ARRAY_SIZE(categories)) {
if (ch == ARRAY_SIZE(categories)) if (ch == ARRAY_SIZE(categories))
continue; continue;
if (categories[ch].count == 0) if (categories[ch].count == 0)
@@ -289,7 +287,7 @@ static void loop(void)
int main(void) int main(void)
{ {
int i, j; int j;
if (CONFIG(LP_USB)) if (CONFIG(LP_USB))
usb_initialize(); usb_initialize();
@@ -310,7 +308,7 @@ int main(void)
werase(modwin); 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++) for (j = 0; j < categories[i].count; j++)
categories[i].modules[j]->init(); categories[i].modules[j]->init();
} }

2
payloads/coreinfo/pci_module.c
View File

@@ -51,7 +51,7 @@ static void swap(struct pci_devices *a, struct pci_devices *b)
static int partition(struct pci_devices *list, int len) 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 index = 0;
int i; int i;

6
payloads/coreinfo/timestamps_module.c
View File

@@ -29,9 +29,7 @@ static unsigned long tick_freq_mhz;
static const char *timestamp_name(uint32_t id) static const char *timestamp_name(uint32_t id)
{ {
int i; for (size_t i = 0; i < ARRAY_SIZE(timestamp_ids); i++) {
for (i = 0; i < ARRAY_SIZE(timestamp_ids); i++) {
if (timestamp_ids[i].id == id) if (timestamp_ids[i].id == id)
return timestamp_ids[i].name; return timestamp_ids[i].name;
} }
@@ -184,7 +182,7 @@ static int timestamps_module_init(void)
prev_stamp = base_time; prev_stamp = base_time;
total_time = 0; total_time = 0;
for (int i = 0; i < n_entries; i++) { for (u32 i = 0; i < n_entries; i++) {
uint64_t stamp; uint64_t stamp;
const struct timestamp_entry *tse = &timestamps->entries[i]; const struct timestamp_entry *tse = &timestamps->entries[i];