Turn elfu_gPhdrContainsScn into a macro

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

diff --git a/src/printing/sections.c b/src/printing/sections.c
index be7a9072ae05aa304cf6cb28b19b25a6e2cdfb32..ec0ff439aac42bd412c09bb6bf6c19729caff8ef 100644 (file)
--- a/src/printing/sections.c
+++ b/src/printing/sections.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 
-#include <libelf.h>
-#include <gelf.h>
+#include <libelf/libelf.h>
+#include <libelf/gelf.h>
 
 #include <libelfu/libelfu.h>
 #include "printing.h"
@@ -31,7 +31,7 @@ void printSegmentsWithSection(Elf *e, Elf_Scn *scn)
       continue;
     }
 
-    if (elfu_segmentContainsSection(&phdr, &shdr)) {
+    if (PHDR_CONTAINS_SCN_IN_MEMORY(&phdr, &shdr)) {
       printf("     %d %s\n", i, segmentTypeStr(phdr.p_type));
     }
   }
@@ -42,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));
 }