len0rd/dtc
1
0
Fork 0
mirror of https://github.com/dgibson/dtc.git synced 2025-10-13 16:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

dtc: Make dtc_open_file() die() if unable to open requested file

Browse source 
All current callers of dtc_open_file() immediately die() if it returns
an error.  In a non-interative tool like dtc, it's hard to see what
you could sensibly do to recover from a failure to open an input file
in any case.

Therefore, make dtc_open_file() itself die() if there's an error
opening the requested file.  This removes the need for error checking
at the callsites, and ensures a consistent error message in all cases.
While we're at it, change the rror message from fstree.c when we fail
to open the input directory to match dtc_open_file()'s error message.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
David Gibson 2008-03-06 12:16:55 +11:00 • committed by Jon Loeliger
parent 6c2e4d61f8
commit f7ea3708c3
4 changed files with 6 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

11
srcpos.c
View file

@ -82,9 +82,8 @@ struct dtc_file *dtc_open_file(const char *fname,
if (fname[0] == '/') {
file->file = fopen(fname, "r");
if (!file->file)
goto out;
goto fail;
file->name = strdup(fname);
return file;
@ -98,15 +97,13 @@ struct dtc_file *dtc_open_file(const char *fname,
return file;
if (errno != ENOENT)
goto out;
goto fail;
search = search->next;
}
out:
free(file->dir);
free(file);
return NULL;
fail:
die("Couldn't open \"%s\": %s\n", fname, strerror(errno));
}
void dtc_close_file(struct dtc_file *file)