| Message ID | 20180226211801.16060-3-semen.protsenko@linaro.org |
|---|---|
| State | Accepted |
| Commit | 64e6a49a11ab8226dfda00036044841ca87b94d8 |
| Headers | show |
| Series | Provide partition names to commands in environment | expand |
On Mon, 26 Feb 2018 23:18:00 +0200 Sam Protsenko <semen.protsenko@linaro.org> wrote: > Refactor the code for "part start" and "part size" commands to avoid > code duplication. > > Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org> > --- > cmd/part.c | 61 > +++++++++++++++++++++++-------------------------------------- 1 file > changed, 23 insertions(+), 38 deletions(-) > > diff --git a/cmd/part.c b/cmd/part.c > index fd8825a7ec..ec791fdc5d 100644 > --- a/cmd/part.c > +++ b/cmd/part.c > @@ -22,6 +22,11 @@ > #include <part.h> > #include <vsprintf.h> > > +enum cmd_part_info { > + CMD_PART_INFO_START = 0, > + CMD_PART_INFO_SIZE, > +}; > + > static int do_part_uuid(int argc, char * const argv[]) > { > int part; > @@ -108,7 +113,7 @@ static int do_part_list(int argc, char * const > argv[]) return 0; > } > > -static int do_part_start(int argc, char * const argv[]) > +static int do_part_info(int argc, char * const argv[], enum > cmd_part_info param) { > struct blk_desc *desc; > disk_partition_t info; > @@ -138,7 +143,17 @@ static int do_part_start(int argc, char * const > argv[]) return 1; > } > > - snprintf(buf, sizeof(buf), LBAF, info.start); > + switch (param) { > + case CMD_PART_INFO_START: > + snprintf(buf, sizeof(buf), LBAF, info.start); > + break; > + case CMD_PART_INFO_SIZE: > + snprintf(buf, sizeof(buf), LBAF, info.size); > + break; > + default: > + printf("** Unknown cmd_part_info value: %d\n", > param); > + return 1; > + } > > if (argc > 3) > env_set(argv[3], buf); > @@ -148,44 +163,14 @@ static int do_part_start(int argc, char * const > argv[]) return 0; > } > > -static int do_part_size(int argc, char * const argv[]) > +static int do_part_start(int argc, char * const argv[]) > { > - struct blk_desc *desc; > - disk_partition_t info; > - char buf[512] = { 0 }; > - char *endp; > - int part; > - int err; > - int ret; > - > - if (argc < 3) > - return CMD_RET_USAGE; > - if (argc > 4) > - return CMD_RET_USAGE; > - > - ret = blk_get_device_by_str(argv[0], argv[1], &desc); > - if (ret < 0) > - return 1; > - > - part = simple_strtoul(argv[2], &endp, 0); > - if (*endp == '\0') { > - err = part_get_info(desc, part, &info); > - if (err) > - return 1; > - } else { > - part = part_get_info_by_name(desc, argv[2], &info); > - if (part == -1) > - return 1; > - } > - > - snprintf(buf, sizeof(buf), LBAF, info.size); > - > - if (argc > 3) > - env_set(argv[3], buf); > - else > - printf("%s\n", buf); > + return do_part_info(argc, argv, CMD_PART_INFO_START); > +} > > - return 0; > +static int do_part_size(int argc, char * const argv[]) > +{ > + return do_part_info(argc, argv, CMD_PART_INFO_SIZE); > } > > static int do_part(cmd_tbl_t *cmdtp, int flag, int argc, char * > const argv[]) Reviewed-by: Lukasz Majewski <lukma@denx.de> Best regards, Lukasz Majewski -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd@denx.de
On Mon, Feb 26, 2018 at 11:18:00PM +0200, Sam Protsenko wrote: > Refactor the code for "part start" and "part size" commands to avoid > code duplication. > > Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org> > Reviewed-by: Lukasz Majewski <lukma@denx.de> Applied to u-boot/master, thanks! -- Tom
diff --git a/cmd/part.c b/cmd/part.c index fd8825a7ec..ec791fdc5d 100644 --- a/cmd/part.c +++ b/cmd/part.c @@ -22,6 +22,11 @@ #include <part.h> #include <vsprintf.h> +enum cmd_part_info { + CMD_PART_INFO_START = 0, + CMD_PART_INFO_SIZE, +}; + static int do_part_uuid(int argc, char * const argv[]) { int part; @@ -108,7 +113,7 @@ static int do_part_list(int argc, char * const argv[]) return 0; } -static int do_part_start(int argc, char * const argv[]) +static int do_part_info(int argc, char * const argv[], enum cmd_part_info param) { struct blk_desc *desc; disk_partition_t info; @@ -138,7 +143,17 @@ static int do_part_start(int argc, char * const argv[]) return 1; } - snprintf(buf, sizeof(buf), LBAF, info.start); + switch (param) { + case CMD_PART_INFO_START: + snprintf(buf, sizeof(buf), LBAF, info.start); + break; + case CMD_PART_INFO_SIZE: + snprintf(buf, sizeof(buf), LBAF, info.size); + break; + default: + printf("** Unknown cmd_part_info value: %d\n", param); + return 1; + } if (argc > 3) env_set(argv[3], buf); @@ -148,44 +163,14 @@ static int do_part_start(int argc, char * const argv[]) return 0; } -static int do_part_size(int argc, char * const argv[]) +static int do_part_start(int argc, char * const argv[]) { - struct blk_desc *desc; - disk_partition_t info; - char buf[512] = { 0 }; - char *endp; - int part; - int err; - int ret; - - if (argc < 3) - return CMD_RET_USAGE; - if (argc > 4) - return CMD_RET_USAGE; - - ret = blk_get_device_by_str(argv[0], argv[1], &desc); - if (ret < 0) - return 1; - - part = simple_strtoul(argv[2], &endp, 0); - if (*endp == '\0') { - err = part_get_info(desc, part, &info); - if (err) - return 1; - } else { - part = part_get_info_by_name(desc, argv[2], &info); - if (part == -1) - return 1; - } - - snprintf(buf, sizeof(buf), LBAF, info.size); - - if (argc > 3) - env_set(argv[3], buf); - else - printf("%s\n", buf); + return do_part_info(argc, argv, CMD_PART_INFO_START); +} - return 0; +static int do_part_size(int argc, char * const argv[]) +{ + return do_part_info(argc, argv, CMD_PART_INFO_SIZE); } static int do_part(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
Refactor the code for "part start" and "part size" commands to avoid code duplication. Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org> --- cmd/part.c | 61 +++++++++++++++++++++++-------------------------------------- 1 file changed, 23 insertions(+), 38 deletions(-)