From c5c86efb59ea91a64543b2b50ee1bebf6aa8a6e7 Mon Sep 17 00:00:00 2001
From: norly <ny-git@enpas.org>
Date: Sat, 23 Feb 2013 15:45:17 +0000
Subject: [PATCH] Move headers for ELF-based operations together

---
 include/libelfu/analysis.h             | 11 -----------
 include/libelfu/{lookup.h => elfops.h} | 10 ++++++----
 include/libelfu/fixup.h                |  9 ---------
 include/libelfu/libelfu.h              |  4 +---
 4 files changed, 7 insertions(+), 27 deletions(-)
 delete mode 100644 include/libelfu/analysis.h
 rename include/libelfu/{lookup.h => elfops.h} (68%)
 delete mode 100644 include/libelfu/fixup.h

diff --git a/include/libelfu/analysis.h b/include/libelfu/analysis.h
deleted file mode 100644
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/lookup.h b/include/libelfu/elfops.h
similarity index 68%
rename from include/libelfu/lookup.h
rename to include/libelfu/elfops.h
index 2506512..a57069d 100644
--- a/include/libelfu/lookup.h
+++ b/include/libelfu/elfops.h
@@ -1,18 +1,20 @@
-#ifndef __LIBELFU_LOOKUP_H_
-#define __LIBELFU_LOOKUP_H_
+#ifndef __LIBELFU_ELFOPS_H_
+#define __LIBELFU_ELFOPS_H_
 
 #include <libelf.h>
 #include <gelf.h>
 
 #include <libelfu/types.h>
 
-char* elfu_sectionName(Elf *e, Elf_Scn *scn);
+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);
 
-size_t elfu_scnSizeFile(const GElf_Shdr *shdr);
+void elfu_fixupPhdrSelfRef(Elf *e);
 
 #endif
diff --git a/include/libelfu/fixup.h b/include/libelfu/fixup.h
deleted file mode 100644
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 271b0ce..961235f 100644
--- 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>
 
 
-- 
2.30.2