Nico Huber merged this change.

View Change

Approvals: Nico Huber: Verified; Looks good to me, approved
layout.c: Use the libflashrom function for included arguments

Use the libflashrom function to determine whether included regions are
present in the layout file.

Change-Id: I5e9375baad763612e179262973413a7161acba8b
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/31244
Tested-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Nico Huber <nico.h@gmx.de>
---
M layout.c
1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/layout.c b/layout.c
index 5080e3e..f757783 100644
--- a/layout.c
+++ b/layout.c
@@ -135,24 +135,19 @@
return 0;
}

-/* returns the index of the entry (or a negative value if it is not found) */
+/* returns -1 if an entry is not found, 0 if found. */
static int find_romentry(struct flashrom_layout *const l, char *name)
{
- int i;
-
if (l->num_entries == 0)
return -1;

msg_gspew("Looking for region \"%s\"... ", name);
- for (i = 0; i < l->num_entries; i++) {
- if (!strcmp(l->entries[i].name, name)) {
- l->entries[i].included = 1;
- msg_gspew("found.\n");
- return i;
- }
+ if (flashrom_layout_include_region(l, name)) {
+ msg_gspew("not found.\n");
+ return -1;
}
- msg_gspew("not found.\n");
- return -1;
+ msg_gspew("found.\n");
+ return 0;
}

/* process -i arguments

To view, visit change 31244. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I5e9375baad763612e179262973413a7161acba8b
Gerrit-Change-Number: 31244
Gerrit-PatchSet: 4
Gerrit-Owner: Arthur Heymans <arthur@aheymans.xyz>
Gerrit-Reviewer: Angel Pons <th3fanbus@gmail.com>
Gerrit-Reviewer: Nico Huber <nico.h@gmx.de>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-MessageType: merged