diff options
author | David Gibson <david@gibson.dropbear.id.au> | 2008-05-16 13:21:51 +1000 |
---|---|---|
committer | Jon Loeliger <jdl@jdl.com> | 2008-05-19 14:07:40 -0500 |
commit | 35aa1a273bc407271f8a1e7b91989b9e6787879c (patch) | |
tree | 75b31de3a2abb5f52bb24bb3bd82c598ec688a8f /treesource.c | |
parent | 1577696b6d09acafa055957ecc6071b305d6fe9d (diff) | |
download | dtc-35aa1a273bc407271f8a1e7b91989b9e6787879c.zip dtc-35aa1a273bc407271f8a1e7b91989b9e6787879c.tar.gz dtc-35aa1a273bc407271f8a1e7b91989b9e6787879c.tar.bz2 |
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 <david@gibson.dropbear.id.au>
Diffstat (limited to 'treesource.c')
-rw-r--r-- | treesource.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/treesource.c b/treesource.c index 3c24e7f..468d6b1 100644 --- a/treesource.c +++ b/treesource.c @@ -36,9 +36,11 @@ struct boot_info *dt_from_source(const char *fname) yyin = srcpos_file->file; if (yyparse() != 0) - return NULL; + die("Unable to parse input tree\n"); + + if (treesource_error) + die("Syntax error parsing input tree\n"); - the_boot_info->error = treesource_error; return the_boot_info; } |