dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-01 00:32:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve error handling in fit_common

Browse Source 
Make the error handling common, and make sure the file is always closed
on error. Rename the parameter to be more description and add comments.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2014-06-02 22:04:52 -06:00
committed by Tom Rini
parent 4f427a421f
commit ef0af64b1c
4 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tools/fit_common.c
View File

@@ -38,8 +38,8 @@ int fit_check_image_types(uint8_t type)
return EXIT_FAILURE;
}
int mmap_fdt(char *cmdname, const char *fname, void **blobp,
struct stat *sbuf, int useunlink)
int mmap_fdt(const char *cmdname, const char *fname, void **blobp,
struct stat *sbuf, bool delete_on_error)
{
void *ptr;
int fd;
@@ -50,17 +50,13 @@ int mmap_fdt(char *cmdname, const char *fname, void **blobp,
if (fd < 0) {
fprintf(stderr, "%s: Can't open %s: %s\n",
cmdname, fname, strerror(errno));
if (useunlink)
unlink(fname);
return -1;
goto err;
}
if (fstat(fd, sbuf) < 0) {
fprintf(stderr, "%s: Can't stat %s: %s\n",
cmdname, fname, strerror(errno));
if (useunlink)
unlink(fname);
return -1;
goto err;
}
errno = 0;
@@ -68,19 +64,23 @@ int mmap_fdt(char *cmdname, const char *fname, void **blobp,
if ((ptr == MAP_FAILED) || (errno != 0)) {
fprintf(stderr, "%s: Can't read %s: %s\n",
cmdname, fname, strerror(errno));
if (useunlink)
unlink(fname);
return -1;
goto err;
}
/* check if ptr has a valid blob */
if (fdt_check_header(ptr)) {
fprintf(stderr, "%s: Invalid FIT blob\n", cmdname);
if (useunlink)
unlink(fname);
return -1;
goto err;
}
*blobp = ptr;
return fd;
err:
if (fd >= 0)
close(fd);
if (delete_on_error)
unlink(fname);
return -1;
}