Clean up ELF-related files and functions

[centaur.git] / src / printing / sections.c

diff --git a/src/printing/sections.c b/src/printing/sections.c
index 6241a733a7b396240c0a6559b54b9672a052beb7..e06f3b7904097450f0ca573cadaaf7f94b6d7d37 100644 (file)
--- 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_ePhdrContainsScn(&phdr, &shdr)) {
       printf("     %d %s\n", i, segmentTypeStr(phdr.p_type));
     }
   }
@@ -39,7 +42,7 @@ void printSection(Elf *e, Elf_Scn *scn)
 {
   printf("  %jd: %s\n",
           (uintmax_t) elf_ndxscn(scn),
-          elfu_sectionName(e, scn));
+          elfu_eScnName(e, scn));
 }