commit 67973fb4f73411e08f0de39fed0ca21f97de73eb
author Masahiro Yamada <yamada.masahiro@socionext.com> Sun Jan 15 23:20:00 2017 +0900
committer Masahiro Yamada <yamada.masahiro@socionext.com> Fri Jan 27 13:21:21 2017 +0900
tree 84b637d3ab31242bb06b7bb0ff57bac2b26ab3a3
parent 40866aaf1c60b31d46b1b969598e3403a4d8a6c1

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>

tools/fiptool/fiptool.c

diff --git a/tools/fiptool/fiptool.c b/tools/fiptool/fiptool.c
index d51d6ab..46b8726 100644
--- a/tools/fiptool/fiptool.c
+++ b/tools/fiptool/fiptool.c
@@ -554,12 +554,10 @@
 		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];