diff options
author | norly <ny-git@enpas.org> | 2013-05-27 03:57:16 +0100 |
---|---|---|
committer | norly <ny-git@enpas.org> | 2013-05-27 03:57:16 +0100 |
commit | 6a9a293ebbe91ff82defbfabc30f6c23ec270a54 (patch) | |
tree | 9d11da6acae186703130c584005ed51ea6a3846e /src | |
parent | 29dfd585e8f8d87d978259919f74815493899f01 (diff) |
Turn elfu_gPhdrContainsScn into a macro
Diffstat (limited to 'src')
-rw-r--r-- | src/elfops/section-in-segment.c | 4 | ||||
-rw-r--r-- | src/generic/phdr-contains-section.c | 19 | ||||
-rw-r--r-- | src/printing/sections.c | 2 | ||||
-rw-r--r-- | src/printing/segments.c | 2 |
4 files changed, 4 insertions, 23 deletions
diff --git a/src/elfops/section-in-segment.c b/src/elfops/section-in-segment.c index 185da36..76a997d 100644 --- a/src/elfops/section-in-segment.c +++ b/src/elfops/section-in-segment.c @@ -25,7 +25,7 @@ Elf_Scn* elfu_eScnFirstInSegment(Elf *e, GElf_Phdr *phdr) } if (shdr.sh_offset == phdr->p_offset - && elfu_gPhdrContainsScn(phdr, &shdr)) { + && PHDR_CONTAINS_SCN_IN_MEMORY(phdr, &shdr)) { return scn; } @@ -59,7 +59,7 @@ Elf_Scn* elfu_eScnLastInSegment(Elf *e, GElf_Phdr *phdr) continue; } - if (elfu_gPhdrContainsScn(phdr, &shdr)) { + if (PHDR_CONTAINS_SCN_IN_MEMORY(phdr, &shdr)) { if (!last) { last = scn; } else { diff --git a/src/generic/phdr-contains-section.c b/src/generic/phdr-contains-section.c deleted file mode 100644 index 4c1f2cf..0000000 --- a/src/generic/phdr-contains-section.c +++ /dev/null @@ -1,19 +0,0 @@ -#include <libelf/libelf.h> -#include <libelf/gelf.h> - -#include <libelfu/libelfu.h> - - -int elfu_gPhdrContainsScn(GElf_Phdr *phdr, GElf_Shdr *shdr) -{ - size_t secStart = shdr->sh_offset; - size_t secEnd = shdr->sh_offset + shdr->sh_size; - size_t segStart = phdr->p_offset; - size_t segEnd = phdr->p_offset + phdr->p_memsz; - - if (secStart < segStart || secEnd > segEnd) { - return 0; - } - - return 1; -} diff --git a/src/printing/sections.c b/src/printing/sections.c index 71431d1..ec0ff43 100644 --- a/src/printing/sections.c +++ b/src/printing/sections.c @@ -31,7 +31,7 @@ void printSegmentsWithSection(Elf *e, Elf_Scn *scn) continue; } - if (elfu_gPhdrContainsScn(&phdr, &shdr)) { + if (PHDR_CONTAINS_SCN_IN_MEMORY(&phdr, &shdr)) { printf(" %d %s\n", i, segmentTypeStr(phdr.p_type)); } } diff --git a/src/printing/segments.c b/src/printing/segments.c index 444f115..c7b5cb2 100644 --- a/src/printing/segments.c +++ b/src/printing/segments.c @@ -33,7 +33,7 @@ void printSectionsInSegment(Elf *e, GElf_Phdr *phdr) continue; } - if (elfu_gPhdrContainsScn(phdr, &shdr)) { + if (PHDR_CONTAINS_SCN_IN_MEMORY(phdr, &shdr)) { printf(" %10u %s\n", elf_ndxscn(scn), elfu_eScnName(e, scn)); } |