From b7ab2674931f1bb9a7e6da594f587ae84c293238 Mon Sep 17 00:00:00 2001
From: norly <ny-git@enpas.org>
Date: Fri, 24 May 2013 03:48:14 +0100
Subject: [PATCH] Move section-in-segment.c to generic/

---
 include/libelfu/elfops.h                        | 1 -
 include/libelfu/generic.h                       | 2 ++
 src/elfops/section-in-segment.c                 | 4 ++--
 src/{elfops => generic}/phdr-contains-section.c | 2 +-
 src/printing/sections.c                         | 2 +-
 src/printing/segments.c                         | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)
 rename src/{elfops => generic}/phdr-contains-section.c (85%)

diff --git a/include/libelfu/elfops.h b/include/libelfu/elfops.h
index b5e8a3f..58da4cf 100644
--- a/include/libelfu/elfops.h
+++ b/include/libelfu/elfops.h
@@ -10,7 +10,6 @@
    char* elfu_eScnName(Elf *e, Elf_Scn *scn);
 Elf_Scn* elfu_eScnByName(Elf *e, char *name);
 
-     int elfu_ePhdrContainsScn(GElf_Phdr *phdr, GElf_Shdr *shdr);
 Elf_Scn* elfu_eScnFirstInSegment(Elf *e, GElf_Phdr *phdr);
 Elf_Scn* elfu_eScnLastInSegment(Elf *e, GElf_Phdr *phdr);
 
diff --git a/include/libelfu/generic.h b/include/libelfu/generic.h
index 70157f7..f5b0e0f 100644
--- a/include/libelfu/generic.h
+++ b/include/libelfu/generic.h
@@ -6,4 +6,6 @@
 
 size_t elfu_gScnSizeFile(const GElf_Shdr *shdr);
 
+int elfu_gPhdrContainsScn(GElf_Phdr *phdr, GElf_Shdr *shdr);
+
 #endif
diff --git a/src/elfops/section-in-segment.c b/src/elfops/section-in-segment.c
index 143c03f..185da36 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_ePhdrContainsScn(phdr, &shdr)) {
+        && elfu_gPhdrContainsScn(phdr, &shdr)) {
       return scn;
     }
 
@@ -59,7 +59,7 @@ Elf_Scn* elfu_eScnLastInSegment(Elf *e, GElf_Phdr *phdr)
       continue;
     }
 
-    if (elfu_ePhdrContainsScn(phdr, &shdr)) {
+    if (elfu_gPhdrContainsScn(phdr, &shdr)) {
       if (!last) {
         last = scn;
       } else {
diff --git a/src/elfops/phdr-contains-section.c b/src/generic/phdr-contains-section.c
similarity index 85%
rename from src/elfops/phdr-contains-section.c
rename to src/generic/phdr-contains-section.c
index 7a89d61..4c1f2cf 100644
--- a/src/elfops/phdr-contains-section.c
+++ b/src/generic/phdr-contains-section.c
@@ -4,7 +4,7 @@
 #include <libelfu/libelfu.h>
 
 
-int elfu_ePhdrContainsScn(GElf_Phdr *phdr, GElf_Shdr *shdr)
+int elfu_gPhdrContainsScn(GElf_Phdr *phdr, GElf_Shdr *shdr)
 {
   size_t secStart = shdr->sh_offset;
   size_t secEnd   = shdr->sh_offset + shdr->sh_size;
diff --git a/src/printing/sections.c b/src/printing/sections.c
index 3cdf270..71431d1 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_ePhdrContainsScn(&phdr, &shdr)) {
+    if (elfu_gPhdrContainsScn(&phdr, &shdr)) {
       printf("     %d %s\n", i, segmentTypeStr(phdr.p_type));
     }
   }
diff --git a/src/printing/segments.c b/src/printing/segments.c
index f7ffd54..444f115 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_ePhdrContainsScn(phdr, &shdr)) {
+    if (elfu_gPhdrContainsScn(phdr, &shdr)) {
       printf("       %10u %s\n", elf_ndxscn(scn), elfu_eScnName(e, scn));
     }
 
-- 
2.30.2