[flashrom-gerrit] Change in ...flashrom[master]: layout.c: Use the libflashrom function for included arguments

[Nico Huber (Code Review)]

Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/c/flashrom/+/31244 )

Change subject: layout.c: Use the libflashrom function for included arguments
......................................................................

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 
Reviewed-on: https://review.coreboot.org/c/flashrom/+/31244
Tested-by: Nico Huber 
Reviewed-by: Nico Huber 
---
M layout.c
1 file changed, 6 insertions(+), 11 deletions(-)

Approvals:
  Nico Huber: Verified; Looks good to me, approved

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