tequilaOS/platform_external_dtc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

dtc: Fix error reporting in push_input_file()

Browse source 
Error reporting in push_input_file() is a mess.  One error results in
a message and exit(1), others result in a message and return 0 - which
is turned into an exit(1) at one callsite.  The other callsite doesn't
check errors, but probably should.  One of the error conditions gives
a message, but can only be the result of an internal programming
error, not a user error.

So.  Clean that up by making push_input_file() a void function, using
die() to report errors and quit.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
David Gibson 2008-02-26 16:44:29 +11:00 committed by Jon Loeliger
parent 2512a7eb5c
commit 7c635dcb2f
2 changed files with 9 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
dtc-lexer.l
View file

@ -59,10 +59,7 @@ static int dts_version; /* = 0 */
<INCLUDE>\"[^"\n]*\" { <INCLUDE>\"[^"\n]*\" {
yytext[strlen(yytext) - 1] = 0; yytext[strlen(yytext) - 1] = 0;
if (!push_input_file(yytext + 1)) { push_input_file(yytext + 1);
/* Some unrecoverable error.*/
exit(1);
}
yy_pop_state(); yy_pop_state();
} }
@ -243,21 +240,16 @@ struct incl_file *incl_file_stack;
static int incl_depth = 0; static int incl_depth = 0;
int push_input_file(const char *filename) void push_input_file(const char *filename)
{ {
struct incl_file *incl_file; struct incl_file *incl_file;
struct dtc_file *newfile; struct dtc_file *newfile;
struct search_path search, *searchptr = NULL; struct search_path search, *searchptr = NULL;
if (!filename) { assert(filename);
yyerror("No include file name given.");
return 0;
}
if (incl_depth++ >= MAX_INCLUDE_DEPTH) { if (incl_depth++ >= MAX_INCLUDE_DEPTH)
yyerror("Includes nested too deeply"); die("Includes nested too deeply");
return 0;
}
if (srcpos_file) { if (srcpos_file) {
search.dir = srcpos_file->dir; search.dir = srcpos_file->dir;
@ -267,11 +259,9 @@ int push_input_file(const char *filename)
} }
newfile = dtc_open_file(filename, searchptr); newfile = dtc_open_file(filename, searchptr);
if (!newfile) { if (!newfile)
yyerrorf("Couldn't open \"%s\": %s", die("Couldn't open \"%s\": %s", filename, strerror(errno));
filename, strerror(errno));
exit(1);
}
incl_file = xmalloc(sizeof(struct incl_file)); incl_file = xmalloc(sizeof(struct incl_file));
@ -292,8 +282,6 @@ int push_input_file(const char *filename)
yylineno = 1; yylineno = 1;
yyin = newfile->file; yyin = newfile->file;
yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE)); yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE));
return 1;
} }

2
srcpos.h
View file

@ -75,7 +75,7 @@ extern void yyerrorf(char const *, ...) __attribute__((format(printf, 1, 2)));
extern struct dtc_file *srcpos_file; extern struct dtc_file *srcpos_file;
extern int push_input_file(const char *filename); extern void push_input_file(const char *filename);
extern int pop_input_file(void); extern int pop_input_file(void);
struct search_path { struct search_path {