Remove exit() call from show_id
The only caller is able to check the return code and handle it
correctly.
Corresponding to flashrom svn r1545.
Signed-off-by: Niklas Söderlund <niso@kth.se>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
diff --git a/flashrom.c b/flashrom.c
index 518e3d4..0fdcd5f 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -1787,7 +1787,10 @@
#if CONFIG_INTERNAL == 1
if (programmer == PROGRAMMER_INTERNAL)
- show_id(newcontents, size, force);
+ if (show_id(newcontents, size, force)) {
+ ret = 1;
+ goto out;
+ }
#endif
}
diff --git a/layout.c b/layout.c
index 379ee8c..0512638 100644
--- a/layout.c
+++ b/layout.c
@@ -137,7 +137,7 @@
"\n\n",
mainboard_vendor, mainboard_part, lb_vendor,
lb_part);
- exit(1);
+ return 1;
}
}