From 9e42376c384d1f81deac2cabd8fb423f902b42f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= Date: Sat, 16 Jun 2012 00:11:16 +0000 Subject: Remove exit() call from show_id MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Acked-by: Carl-Daniel Hailfinger --- flashrom.c | 5 ++++- layout.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/flashrom.c b/flashrom.c index 518e3d4..0fdcd5f 100644 --- a/flashrom.c +++ b/flashrom.c @@ -1787,7 +1787,10 @@ int doit(struct flashctx *flash, int force, const char *filename, int read_it, #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 @@ int show_id(uint8_t *bios, int size, int force) "\n\n", mainboard_vendor, mainboard_part, lb_vendor, lb_part); - exit(1); + return 1; } } -- cgit v1.1