diff options
author | norly <ny-git@enpas.org> | 2013-02-23 15:36:30 +0000 |
---|---|---|
committer | norly <ny-git@enpas.org> | 2013-02-23 15:36:30 +0000 |
commit | 6f12fafdc4102a9b8c3ffee060cab48f50f4c37d (patch) | |
tree | dfed7011c7fb4a81383f84b0ef121b2ff0fe19ba /src/printing | |
parent | 58b6f8de8862c9ccba763d3607afb5495727e4d6 (diff) |
Remove ELFU_BOOL
Diffstat (limited to 'src/printing')
-rw-r--r-- | src/printing/sections.c | 11 | ||||
-rw-r--r-- | src/printing/segments.c | 10 |
2 files changed, 14 insertions, 7 deletions
diff --git a/src/printing/sections.c b/src/printing/sections.c index 6241a73..be7a907 100644 --- a/src/printing/sections.c +++ b/src/printing/sections.c @@ -10,25 +10,28 @@ void printSegmentsWithSection(Elf *e, Elf_Scn *scn) { GElf_Phdr phdr; + GElf_Shdr shdr; int i; size_t n; + if (gelf_getshdr(scn, &shdr) != &shdr) { + fprintf(stderr, "gelf_getshdr() failed: %s\n", elf_errmsg(-1)); + return; + } + if (elf_getphdrnum(e, &n)) { fprintf(stderr, "elf_getphdrnum() failed: %s\n", elf_errmsg(-1)); return; } for (i = 0; i < n; i++) { - ELFU_BOOL isInSeg; - if (gelf_getphdr(e, i, &phdr) != &phdr) { fprintf(stderr, "getphdr() failed for #%d: %s\n", i, elf_errmsg(-1)); continue; } - isInSeg = elfu_segmentContainsSection(&phdr, scn); - if (isInSeg == ELFU_TRUE) { + if (elfu_segmentContainsSection(&phdr, &shdr)) { printf(" %d %s\n", i, segmentTypeStr(phdr.p_type)); } } diff --git a/src/printing/segments.c b/src/printing/segments.c index 6d8cac7..1f431d6 100644 --- a/src/printing/segments.c +++ b/src/printing/segments.c @@ -26,10 +26,14 @@ void printSectionsInSegment(Elf *e, GElf_Phdr *phdr) scn = elf_getscn(e, 0); while (scn) { - ELFU_BOOL isInSeg; + GElf_Shdr shdr; - isInSeg = elfu_segmentContainsSection(phdr, scn); - if (isInSeg == ELFU_TRUE) { + if (gelf_getshdr(scn, &shdr) != &shdr) { + fprintf(stderr, "gelf_getshdr() failed: %s\n", elf_errmsg(-1)); + continue; + } + + if (elfu_segmentContainsSection(phdr, &shdr)) { printf(" %10u %s\n", elf_ndxscn(scn), elfu_sectionName(e, scn)); } |