From 67973fb4f73411e08f0de39fed0ca21f97de73eb Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Sun, 15 Jan 2017 23:20:00 +0900 Subject: 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 --- tools/fiptool/fiptool.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'tools') diff --git a/tools/fiptool/fiptool.c b/tools/fiptool/fiptool.c index d51d6ab96..46b872679 100644 --- a/tools/fiptool/fiptool.c +++ b/tools/fiptool/fiptool.c @@ -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]; -- cgit v1.2.3