smallsolar/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mkimage: Use a consistent parameter for struct imgtool *

Browse Source 
Use the same 'itl' (for image-tool) whenever this parameter is passed
around. This makes it easier to recognise. Move away from using the word
'parameters', since it contains essentially all of the info about the
tool, not just parameters. Use 'info' instead.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2025-07-31 12:29:06 +12:00
parent 8855e0de5c
commit 1a9f81779e
35 changed files with 604 additions and 621 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
tools/imagetool.c
View File

@@ -30,13 +30,13 @@ static int imagetool_verify_print_header_by_type(
void *ptr,
struct stat *sbuf,
struct imgtool_funcs *tparams,
struct imgtool *params);
struct imgtool *itl);
int imagetool_verify_print_header(
void *ptr,
struct stat *sbuf,
struct imgtool_funcs *tparams,
struct imgtool *params)
struct imgtool *itl)
{
int retval = -1;
struct imgtool_funcs **curr;
@@ -46,7 +46,7 @@ int imagetool_verify_print_header(
struct imgtool_funcs **end = __stop_image_type;
if (tparams)
return imagetool_verify_print_header_by_type(ptr, sbuf, tparams, params);
return imagetool_verify_print_header_by_type(ptr, sbuf, tparams, itl);
for (curr = start; curr != end; curr++) {
/*
@@ -57,7 +57,7 @@ int imagetool_verify_print_header(
continue;
if ((*curr)->verify_header) {
retval = (*curr)->verify_header((unsigned char *)ptr,
sbuf->st_size, params);
sbuf->st_size, itl);
if (retval == 0) {
/*
@@ -65,12 +65,12 @@ int imagetool_verify_print_header(
* successful
*/
if ((*curr)->print_header) {
if (!params->quiet)
(*curr)->print_header(ptr, params);
if (!itl->quiet)
(*curr)->print_header(ptr, itl);
} else {
fprintf(stderr,
"%s: print_header undefined for %s\n",
params->cmdname, (*curr)->name);
itl->cmdname, (*curr)->name);
}
break;
}
@@ -79,7 +79,7 @@ int imagetool_verify_print_header(
if (retval != 0) {
fprintf(stderr, "%s: cannot detect image type\n",
params->cmdname);
itl->cmdname);
}
return retval;
@@ -89,35 +89,35 @@ static int imagetool_verify_print_header_by_type(
void *ptr,
struct stat *sbuf,
struct imgtool_funcs *tparams,
struct imgtool *params)
struct imgtool *itl)
{
int retval = -1;
if (tparams->verify_header) {
retval = tparams->verify_header((unsigned char *)ptr,
sbuf->st_size, params);
sbuf->st_size, itl);
if (retval == 0) {
/*
* Print the image information if verify is successful
*/
if (tparams->print_header) {
if (!params->quiet)
tparams->print_header(ptr, params);
if (!itl->quiet)
tparams->print_header(ptr, itl);
} else {
fprintf(stderr,
"%s: print_header undefined for %s\n",
params->cmdname, tparams->name);
itl->cmdname, tparams->name);
}
} else {
fprintf(stderr,
"%s: verify_header failed for %s with exit code %d\n",
params->cmdname, tparams->name, retval);
itl->cmdname, tparams->name, retval);
}
} else {
fprintf(stderr, "%s: verify_header undefined for %s\n",
params->cmdname, tparams->name);
itl->cmdname, tparams->name);
}
return retval;
@@ -150,7 +150,7 @@ int imagetool_save_subimage(
return 0;
}
int imagetool_get_filesize(struct imgtool *params, const char *fname)
int imagetool_get_filesize(struct imgtool *itl, const char *fname)
{
struct stat sbuf;
int fd;
@@ -158,13 +158,13 @@ int imagetool_get_filesize(struct imgtool *params, const char *fname)
fd = open(fname, O_RDONLY | O_BINARY);
if (fd < 0) {
fprintf(stderr, "%s: Can't open %s: %s\n",
params->cmdname, fname, strerror(errno));
itl->cmdname, fname, strerror(errno));
return -1;
}
if (fstat(fd, &sbuf) < 0) {
fprintf(stderr, "%s: Can't stat %s: %s\n",
params->cmdname, fname, strerror(errno));
itl->cmdname, fname, strerror(errno));
close(fd);
return -1;
}