From 35aa1a273bc407271f8a1e7b91989b9e6787879c Mon Sep 17 00:00:00 2001 From: David Gibson Date: Fri, 16 May 2008 13:21:51 +1000 Subject: dtc: Simplify error handling for unparseable input Currently, main() tests if it got a valid input tree from whichever dt_from_*() function it invoked and if not, die()s. For one thing, this test has, for no good reason, three different ways for those functions to communicate a failure to provide input (bi NULL, bi->dt NULL, or bi->error non-zero). For another, in every case save one, if the dt_from_*() functions are unable to provide input they will immediately die() (with a more specific error message) rather than proceeding to the test in main(). Therefore, this patch removes this test, making the one case that could have triggered it (in dt_from_source()) call die() directly instead. With this change, the error field in struct boot_info is now unused, so remove it. Signed-off-by: David Gibson --- dtc.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'dtc.c') diff --git a/dtc.c b/dtc.c index c641491..6d67c9a 100644 --- a/dtc.c +++ b/dtc.c @@ -201,9 +201,6 @@ int main(int argc, char *argv[]) if (inf && inf->file != stdin) fclose(inf->file); - if (! bi || ! bi->dt || bi->error) - die("Couldn't read input tree\n"); - fill_fullpaths(bi->dt, ""); process_checks(force, bi); -- cgit v1.2.3