Merge cloneScn() into reladd.c

[centaur.git] / include / libelfu / modelops.h

diff --git a/include/libelfu/modelops.h b/include/libelfu/modelops.h
index fec6821add902d67204b49f176eacdf29e78bd85..3a5d7ead82574db1380ecdefd9d9205f76bacb15 100644 (file)
--- a/include/libelfu/modelops.h
+++ b/include/libelfu/modelops.h
@@ -7,7 +7,7 @@
 #include <libelfu/types.h>
 
 
-#define ELFU_SYMSTR(symtabscn, off) (((char*)(symtabscn)->linkptr->data.d_buf) + (off))
+#define ELFU_SYMSTR(symtabscn, off) ((symtabscn)->linkptr->databuf + (off))
 
 
 GElf_Word elfu_mSymtabLookupVal(ElfuElf *me, ElfuScn *msst, GElf_Word entry);
@@ -18,8 +18,12 @@ void elfu_mSymtabFlatten(ElfuElf *me);
 void elfu_mRelocate(ElfuElf *metarget, ElfuScn *mstarget, ElfuScn *msrt);
 
 
-size_t elfu_mPhdrCount(ElfuElf *me);
-void elfu_mPhdrUpdateChildOffsets(ElfuPhdr *mp);
+typedef void* (PhdrHandlerFunc)(ElfuElf *me, ElfuPhdr *mp, void *aux1, void *aux2);
+    void* elfu_mPhdrForall(ElfuElf *me, PhdrHandlerFunc f, void *aux1, void *aux2);
+   size_t elfu_mPhdrCount(ElfuElf *me);
+     void elfu_mPhdrUpdateChildOffsets(ElfuPhdr *mp);
+ElfuPhdr* elfu_mPhdrAlloc();
+     void elfu_mPhdrDestroy(ElfuPhdr* mp);
 
 
 typedef void* (SectionHandlerFunc)(ElfuElf *me, ElfuScn *ms, void *aux1, void *aux2);
@@ -29,6 +33,12 @@ typedef void* (SectionHandlerFunc)(ElfuElf *me, ElfuScn *ms, void *aux1, void *a
  ElfuScn* elfu_mScnByOldscn(ElfuElf *me, ElfuScn *oldscn);
     char* elfu_mScnName(ElfuElf *me, ElfuScn *ms);
 ElfuScn** elfu_mScnSortedByOffset(ElfuElf *me, size_t *count);
+ ElfuScn* elfu_mScnAlloc();
+     void elfu_mScnDestroy(ElfuScn* ms);
+
+
+ElfuElf* elfu_mElfAlloc();
+    void elfu_mElfDestroy(ElfuElf* me);
 
 
 GElf_Addr elfu_mLayoutGetSpaceInPhdr(ElfuElf *me, GElf_Word size,
@@ -42,8 +52,6 @@ void elfu_mRelocate(ElfuElf *metarget, ElfuScn *mstarget, ElfuScn *msrt);
 
 int elfu_mCheck(ElfuElf *me);
 
-ElfuScn* elfu_mCloneScn(ElfuScn *ms);
-
 
 void elfu_mDumpPhdr(ElfuElf *me, ElfuPhdr *mp);
 void elfu_mDumpScn(ElfuElf *me, ElfuScn *ms);