commit 0a05d67baba067c823d198937001563c311367b6
author Stefan Reinauer <stepan@coresystems.de> Sat Apr 14 16:32:59 2007 +0000
committer Stefan Reinauer <stefan.reinauer@coreboot.org> Sat Apr 14 16:32:59 2007 +0000
tree f2ef244e3641ca25f81b8c0eda533601eef075ec
parent 9a37ba6e9cba7d3126e7706e7dc00004d532fe2e

Exit on return code of read_layout and print error message to stderr instead of stdout

Corresponding to flashrom svn r104 and coreboot v2 svn r2610.

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>

flashrom.c

diff --git a/flashrom.c b/flashrom.c
index fddefea..04c8600 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -303,7 +303,8 @@
 			break;
 		case 'l':
 			tempstr=strdup(optarg);
-			read_romlayout(tempstr);
+			if (read_romlayout(tempstr))
+				exit(1);
 			break;
 		case 'i':
 			tempstr=strdup(optarg);

layout.c

diff --git a/layout.c b/layout.c
index 5478782..8ba2e41 100644
--- a/layout.c
+++ b/layout.c
@@ -106,7 +106,8 @@
 	romlayout=fopen (name, "r");
 	
 	if(!romlayout) {
-		printf("Error while opening rom layout (%s).\n", name);
+		fprintf(stderr, "ERROR: Could not open rom layout (%s).\n", 
+				name);
 		return -1;
 	}