andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fiptool: remove always true conditional 

The conditional

  if (desc != NULL)
          ...

is always true here because we assert it 6 lines above:

  assert(desc != NULL);

Remove the if-conditional and concatenate the printf() calls.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Masahiro Yamada 2017-01-15 23:20:00 +09:00
parent 40866aaf1c
commit 67973fb4f7
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/fiptool/fiptool.c
View File

@ -554,12 +554,10 @@ static int info_cmd(int argc, char *argv[])
assert(desc != NULL);
printf("%s: ", desc->name);
image_size = image->size;
printf("offset=0x%llX, size=0x%llX",
(unsigned long long)image_offset,
(unsigned long long)image_size);
if (desc != NULL)
printf(", cmdline=\"--%s\"",
desc->cmdline_name);
printf("offset=0x%llX, size=0x%llX, cmdline=\"--%s\"",
(unsigned long long)image_offset,
(unsigned long long)image_size,
desc->cmdline_name);
if (verbose) {
unsigned char md[SHA256_DIGEST_LENGTH];