From: "Timm Bäder" <tbaeder@redhat.com>
To: elfutils-devel@sourceware.org
Subject: [PATCH 13/14] segment_report_module: Inline consider_dyn() into only caller
Date: Thu, 12 Nov 2020 16:04:11 +0100 [thread overview]
Message-ID: <20201112150412.2137981-14-tbaeder@redhat.com> (raw)
In-Reply-To: <20201112150412.2137981-1-tbaeder@redhat.com>
Signed-off-by: Timm Bäder <tbaeder@redhat.com>
---
libdwfl/dwfl_segment_report_module.c | 40 +++++++++-------------------
1 file changed, 12 insertions(+), 28 deletions(-)
diff --git a/libdwfl/dwfl_segment_report_module.c b/libdwfl/dwfl_segment_report_module.c
index 7c97784f..0679453e 100644
--- a/libdwfl/dwfl_segment_report_module.c
+++ b/libdwfl/dwfl_segment_report_module.c
@@ -784,33 +784,6 @@ dwfl_segment_report_module (Dwfl *dwfl, int ndx, const char *name,
GElf_Addr dynstr_vaddr = 0;
GElf_Xword dynstrsz = 0;
bool execlike = false;
- inline bool consider_dyn (GElf_Sxword tag, GElf_Xword val)
- {
- switch (tag)
- {
- default:
- return false;
-
- case DT_DEBUG:
- execlike = true;
- break;
-
- case DT_SONAME:
- soname_stroff = val;
- break;
-
- case DT_STRTAB:
- dynstr_vaddr = val;
- break;
-
- case DT_STRSZ:
- dynstrsz = val;
- break;
- }
-
- return soname_stroff != 0 && dynstr_vaddr != 0 && dynstrsz != 0;
- }
-
const size_t dyn_entsize = (ei_class == ELFCLASS32
? sizeof (Elf32_Dyn) : sizeof (Elf64_Dyn));
void *dyn_data = NULL;
@@ -848,7 +821,18 @@ dwfl_segment_report_module (Dwfl *dwfl, int ndx, const char *name,
GElf_Sxword tag = is32 ? d32[i].d_tag : d64[i].d_tag;
GElf_Xword val = is32 ? d32[i].d_un.d_val : d64[i].d_un.d_val;
- if (consider_dyn (tag, val))
+ if (tag == DT_DEBUG)
+ execlike = true;
+ else if (tag == DT_SONAME)
+ soname_stroff = val;
+ else if (tag == DT_STRTAB)
+ dynstr_vaddr = val;
+ else if (tag == DT_STRSZ)
+ dynstrsz = val;
+ else
+ continue;
+
+ if (soname_stroff != 0 && dynstr_vaddr != 0 && dynstrsz != 0)
break;
}
}
--
2.26.2
next prev parent reply other threads:[~2020-11-12 15:04 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-12 15:03 Removing gnu99 constructs from elfutils Timm Bäder
2020-11-12 15:03 ` [PATCH 01/14] segment_report_module: Get rid of variable-length arrays Timm Bäder
2020-11-18 23:04 ` Mark Wielaard
2020-11-12 15:04 ` [PATCH 02/14] segment_report_module: Pull segment_read into file scope Timm Bäder
2020-11-18 23:18 ` Mark Wielaard
2020-11-12 15:04 ` [PATCH 03/14] segment_report_module: Remove nested finish() function Timm Bäder
2020-11-19 11:18 ` Mark Wielaard
2020-11-12 15:04 ` [PATCH 04/14] segment_report_module: Remove nested release_buffer() function Timm Bäder
2020-11-19 11:24 ` Mark Wielaard
2020-11-12 15:04 ` [PATCH 05/14] segment_report_module: Pull finish_portion() info file scope Timm Bäder
2020-11-19 11:48 ` Mark Wielaard
2020-11-12 15:04 ` [PATCH 06/14] segment_report_module: Pull read_portion() into " Timm Bäder
2020-11-12 15:04 ` [PATCH 07/14] segment_report_module: Use a struct for build id information Timm Bäder
2020-11-12 15:04 ` [PATCH 08/14] segment_report_module: Pull consider_notes() into file scope Timm Bäder
2020-11-12 15:04 ` [PATCH 09/14] segment_report_module: Get rid of nested final_read() function Timm Bäder
2020-11-12 15:04 ` [PATCH 10/14] segment_report_module: Use one loop for p32/p64 arrays Timm Bäder
2020-11-12 15:04 ` [PATCH 11/14] segment_report_module: Inline read_phdr() into only caller Timm Bäder
2020-11-12 15:04 ` [PATCH 12/14] segment_report_module: Unify d32/d64 loops Timm Bäder
2020-11-12 15:04 ` Timm Bäder [this message]
2020-11-12 15:04 ` [PATCH 14/14] segment_report_module: Inline consider_phdr() into only caller Timm Bäder
2020-11-12 16:52 ` Navin P
2020-11-13 7:41 ` Timm Bäder
2020-11-13 8:00 ` Navin P
2020-11-13 12:38 ` Removing gnu99 constructs from elfutils Mark Wielaard
2020-11-13 14:09 ` Timm Bäder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201112150412.2137981-14-tbaeder@redhat.com \
--to=tbaeder@redhat.com \
--cc=elfutils-devel@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).