Refactor mdoel-related code

3 files changed, 24 insertions, 18 deletions

diff --git a/include/libelfu/libelfu.h b/include/libelfu/libelfu.h
index 3c62aad..1fc613a 100644
--- a/include/libelfu/libelfu.h
+++ b/include/libelfu/libelfu.h
@@ -6,7 +6,8 @@
 
 #include <libelfu/generic.h>
 #include <libelfu/elfops.h>
-#include <libelfu/model.h>
+#include <libelfu/modeltypes.h>
+#include <libelfu/modelops.h>
 
 
 #endif
diff --git a/include/libelfu/modelops.h b/include/libelfu/modelops.h
new file mode 100644
index 0000000..9475eba
--- /dev/null
+++ b/include/libelfu/modelops.h
@@ -0,0 +1,20 @@
+#ifndef __LIBELFU_MODELOPS_H__
+#define __LIBELFU_MODELOPS_H__
+
+#include <elf.h>
+#include <gelf.h>
+
+#include <libelfu/modeltypes.h>
+
+
+size_t elfu_mCountScns(ElfuElf *me);
+size_t elfu_mCountPhdrs(ElfuElf *me);
+
+char* elfu_mScnName(ElfuElf *me, ElfuScn *ms);
+
+int elfu_mCheck(ElfuElf *me);
+
+ElfuElf* elfu_mFromElf(Elf *e);
+    void elfu_mToElf(ElfuElf *me, Elf *e);
+
+#endif
diff --git a/include/libelfu/model.h b/include/libelfu/modeltypes.h
index 588d57a..18f6671 100644
--- a/include/libelfu/model.h
+++ b/include/libelfu/modeltypes.h
@@ -1,12 +1,11 @@
-#ifndef __LIBELFU_MODEL_H__
-#define __LIBELFU_MODEL_H__
+#ifndef __LIBELFU_MODELTYPES_H__
+#define __LIBELFU_MODELTYPES_H__
 
 #include <sys/queue.h>
 
 #include <elf.h>
 #include <gelf.h>
 
-
 typedef struct ElfuData {
   Elf_Data data;
 
@@ -41,18 +40,4 @@ typedef struct {
 } ElfuElf;
 
 
-
-size_t elfu_countSections(ElfuElf *me);
-size_t elfu_countPHDRs(ElfuElf *me);
-
-char* elfu_modelScnName(ElfuElf *me, ElfuScn *ms);
-
-int elfu_modelCheck(ElfuElf *me);
-
-ElfuPhdr* elfu_modelFromPhdr(GElf_Phdr *phdr);
-ElfuScn* elfu_modelFromSection(Elf_Scn *scn);
-ElfuElf* elfu_modelFromElf(Elf *e);
-
-void elfu_modelToElf(ElfuElf *me, Elf *e);
-
 #endif