Arthur Heymans has uploaded this change for review.

View Change

layout.c: Use the 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>
---
M layout.c
1 file changed, 6 insertions(+), 11 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/44/31244/1

diff --git a/layout.c b/layout.c
index e10bb73..384a513 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.