Re: [PATCH v2 4/9] dump: Remove the section if when calculating the memory offset

[Richard Henderson]

On 3/10/22 03:08, Janosch Frank wrote:

When s->shdr_num is 0 we'll add 0 bytes of section headers which is
equivalent to not adding section headers but with the multiplication
we can remove a if/else.

Signed-off-by: Janosch Frank
---
  dump/dump.c | 24 
  1 file changed, 8 insertions(+), 16 deletions(-)


Reviewed-by: Richard Henderson 

r~

[PATCH v2 4/9] dump: Remove the section if when calculating the memory offset

[Janosch Frank]

When s->shdr_num is 0 we'll add 0 bytes of section headers which is
equivalent to not adding section headers but with the multiplication
we can remove a if/else.

Signed-off-by: Janosch Frank 
---
 dump/dump.c | 24 
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/dump/dump.c b/dump/dump.c
index c5ca6027ae..316c636f24 100644
--- a/dump/dump.c
+++ b/dump/dump.c
@@ -1808,23 +1808,15 @@ static void dump_init(DumpState *s, int fd, bool 
has_format,
 }
 
 if (s->dump_info.d_class == ELFCLASS64) {
-if (s->shdr_num) {
-s->memory_offset = sizeof(Elf64_Ehdr) +
-   sizeof(Elf64_Phdr) * s->phdr_num +
-   sizeof(Elf64_Shdr) * s->shdr_num + s->note_size;
-} else {
-s->memory_offset = sizeof(Elf64_Ehdr) +
-   sizeof(Elf64_Phdr) * s->phdr_num + s->note_size;
-}
+s->memory_offset = sizeof(Elf64_Ehdr) +
+   sizeof(Elf64_Phdr) * s->phdr_num +
+   sizeof(Elf64_Shdr) * s->shdr_num +
+   s->note_size;
 } else {
-if (s->shdr_num) {
-s->memory_offset = sizeof(Elf32_Ehdr) +
-   sizeof(Elf32_Phdr) * s->phdr_num +
-   sizeof(Elf32_Shdr) * s->shdr_num + s->note_size;
-} else {
-s->memory_offset = sizeof(Elf32_Ehdr) +
-   sizeof(Elf32_Phdr) * s->phdr_num + s->note_size;
-}
+s->memory_offset = sizeof(Elf32_Ehdr) +
+   sizeof(Elf32_Phdr) * s->phdr_num +
+   sizeof(Elf32_Shdr) * s->shdr_num +
+   s->note_size;
 }
 
 return;
-- 
2.32.0