When opening the OS image fails we used to print a message *which* file could not be opened. This message is no longer printed since we now fail in read_file_2 when there is an error. Move the message in the read_file_2 failure path to print it again. file_detect_type() needs no handling for ret < 0, in case of failure it returns filetype_unknown which is handled later, so we can remove the error handling there.
Signed-off-by: Sascha Hauer <[email protected]> --- common/bootm.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/common/bootm.c b/common/bootm.c index 169000cccb..36f6c41bbd 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -562,18 +562,15 @@ int bootm_boot(struct bootm_data *bootm_data) data->os_entry = bootm_data->os_entry; ret = read_file_2(data->os_file, &size, &data->os_header, PAGE_SIZE); - if (ret < 0 && ret != -EFBIG) + if (ret < 0 && ret != -EFBIG) { + printf("could not open %s: %s\n", data->os_file, + strerror(-ret)); goto err_out; + } if (size < PAGE_SIZE) goto err_out; os_type = file_detect_type(data->os_header, PAGE_SIZE); - if ((int)os_type < 0) { - printf("could not open %s: %s\n", data->os_file, - strerror(-os_type)); - ret = (int)os_type; - goto err_out; - } if (!data->force && os_type == filetype_unknown) { printf("Unknown OS filetype (try -f)\n"); -- 2.19.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
