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

mkimage: Move argument processing into its own function

Browse Source 
At present main() is very long. Split out the argument processing to make
it easier to follow.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2016-02-22 22:55:33 -07:00
committed by Tom Rini
parent fd1000b9c1
commit 0b443dee6b
1 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
tools/mkimage.c
View File

@@ -67,18 +67,9 @@ static void show_image_types(void)
fprintf(stderr, "\n"); fprintf(stderr, "\n");
} }
int main(int argc, char **argv) static void process_args(int argc, char **argv)
{ {
int ifd = -1;
struct stat sbuf;
char *ptr; char *ptr;
int retval = 0;
struct image_type_params *tparams = NULL;
int pad_len = 0;
int dfd;
params.cmdname = *argv;
params.addr = params.ep = 0;
while (--argc > 0 && **++argv == '-') { while (--argc > 0 && **++argv == '-') {
while (*++*argv) { while (*++*argv) {
@@ -216,6 +207,25 @@ NXTARG: ;
if (argc != 1) if (argc != 1)
usage(); usage();
params.imagefile = *argv;
}
int main(int argc, char **argv)
{
int ifd = -1;
struct stat sbuf;
char *ptr;
int retval = 0;
struct image_type_params *tparams = NULL;
int pad_len = 0;
int dfd;
params.cmdname = *argv;
params.addr = 0;
params.ep = 0;
process_args(argc, argv);
/* set tparams as per input type_id */ /* set tparams as per input type_id */
tparams = imagetool_get_type(params.type); tparams = imagetool_get_type(params.type);
@@ -240,8 +250,6 @@ NXTARG: ;
params.ep += tparams->header_size; params.ep += tparams->header_size;
} }
params.imagefile = *argv;
if (params.fflag){ if (params.fflag){
if (tparams->fflag_handle) if (tparams->fflag_handle)
/* /*