Move headers for ELF-based operations together

diff --git a/include/libelfu/analysis.h b/include/libelfu/analysis.h
deleted file mode 100644 (file)
index f3d4ddb..0000000
--- a/include/libelfu/analysis.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef __LIBELFU_ANALYSIS_H_
-#define __LIBELFU_ANALYSIS_H_
-
-#include <libelf.h>
-#include <gelf.h>
-
-#include <libelfu/types.h>
-
-int elfu_segmentContainsSection(GElf_Phdr *phdr, GElf_Shdr *shdr);
-
-#endif

diff --git a/include/libelfu/elfops.h b/include/libelfu/elfops.h
new file mode 100644 (file)
index 0000000..a57069d
--- /dev/null
+++ b/include/libelfu/elfops.h
@@ -0,0 +1,20 @@
+#ifndef __LIBELFU_ELFOPS_H_
+#define __LIBELFU_ELFOPS_H_
+
+#include <libelf.h>
+#include <gelf.h>
+
+#include <libelfu/types.h>
+
+size_t elfu_scnSizeFile(const GElf_Shdr *shdr);
+
+char* elfu_sectionName(Elf *e, Elf_Scn *scn);
+Elf_Scn* elfu_sectionByName(Elf *e, char *name);
+
+int elfu_segmentContainsSection(GElf_Phdr *phdr, GElf_Shdr *shdr);
+Elf_Scn* elfu_firstSectionInSegment(Elf *e, GElf_Phdr *phdr);
+Elf_Scn* elfu_lastSectionInSegment(Elf *e, GElf_Phdr *phdr);
+
+void elfu_fixupPhdrSelfRef(Elf *e);
+
+#endif

diff --git a/include/libelfu/fixup.h b/include/libelfu/fixup.h
deleted file mode 100644 (file)
index 6fb6620..0000000
--- a/include/libelfu/fixup.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef __LIBELFU_FIXUP_H__
-#define __LIBELFU_FIXUP_H__
-
-#include <libelf.h>
-#include <gelf.h>
-
-void elfu_fixupPhdrSelfRef(Elf *e);
-
-#endif

diff --git a/include/libelfu/libelfu.h b/include/libelfu/libelfu.h
index 271b0ce8a1c77cc0ce801927c3178170db4f482d..961235fbd50886ad6aa8d11c5358ccab23d46c09 100644 (file)
--- a/include/libelfu/libelfu.h
+++ b/include/libelfu/libelfu.h
@@ -4,9 +4,7 @@
 
 #include <libelfu/types.h>
 
-#include <libelfu/analysis.h>
-#include <libelfu/fixup.h>
-#include <libelfu/lookup.h>
+#include <libelfu/elfops.h>
 #include <libelfu/model.h>
 
 

diff --git a/include/libelfu/lookup.h b/include/libelfu/lookup.h
deleted file mode 100644 (file)
index 2506512..0000000
--- a/include/libelfu/lookup.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef __LIBELFU_LOOKUP_H_
-#define __LIBELFU_LOOKUP_H_
-
-#include <libelf.h>
-#include <gelf.h>
-
-#include <libelfu/types.h>
-
-char* elfu_sectionName(Elf *e, Elf_Scn *scn);
-
-Elf_Scn* elfu_sectionByName(Elf *e, char *name);
-
-Elf_Scn* elfu_firstSectionInSegment(Elf *e, GElf_Phdr *phdr);
-Elf_Scn* elfu_lastSectionInSegment(Elf *e, GElf_Phdr *phdr);
-
-size_t elfu_scnSizeFile(const GElf_Shdr *shdr);
-
-#endif