Remove unneeded struct member and fix references to it

diff --git a/include/libelfu/types.h b/include/libelfu/types.h
index ab9f76ceee987ede5acd898a3446c3c8bc3bf177..d6a758459d5add55a53899151508964b69f6e375 100644 (file)
--- a/include/libelfu/types.h
+++ b/include/libelfu/types.h
@@ -68,7 +68,6 @@ typedef struct ElfuScn {
   struct ElfuReltab reltab;
 
   CIRCLEQ_ENTRY(ElfuScn) elemChildScn;
-  CIRCLEQ_ENTRY(ElfuScn) elem;
 } ElfuScn;
 
 

diff --git a/src/libelfu/model/elf.c b/src/libelfu/model/elf.c
index 46dc120951c3dfe99f11de9736480693506cc40b..a25aa89e89637c5a1d0feccc2e0deec04b1f0084 100644 (file)
--- a/src/libelfu/model/elf.c
+++ b/src/libelfu/model/elf.c
@@ -42,8 +42,8 @@ void elfu_mElfDestroy(ElfuElf* me)
     elfu_mPhdrDestroy(mp);
   }
 
-  CIRCLEQ_FOREACH(ms, &me->orphanScnList, elem) {
-    CIRCLEQ_REMOVE(&me->orphanScnList, ms, elem);
+  CIRCLEQ_FOREACH(ms, &me->orphanScnList, elemChildScn) {
+    CIRCLEQ_REMOVE(&me->orphanScnList, ms, elemChildScn);
     elfu_mScnDestroy(ms);
   }
 

diff --git a/src/libelfu/model/phdr.c b/src/libelfu/model/phdr.c
index 9889f39cf82716833887df86812a9f06467c50b9..b694eb9598928b1e9ef38de2747cfab34ab633cd 100644 (file)
--- a/src/libelfu/model/phdr.c
+++ b/src/libelfu/model/phdr.c
@@ -199,13 +199,13 @@ void elfu_mPhdrDestroy(ElfuPhdr* mp)
 
   assert(mp);
 
-  CIRCLEQ_FOREACH(mp2, &mp->childPhdrList, elem) {
-    CIRCLEQ_REMOVE(&mp->childPhdrList, mp2, elem);
+  CIRCLEQ_FOREACH(mp2, &mp->childPhdrList, elemChildPhdr) {
+    CIRCLEQ_REMOVE(&mp->childPhdrList, mp2, elemChildPhdr);
     elfu_mPhdrDestroy(mp2);
   }
 
-  CIRCLEQ_FOREACH(ms, &mp->childScnList, elem) {
-    CIRCLEQ_REMOVE(&mp->childScnList, ms, elem);
+  CIRCLEQ_FOREACH(ms, &mp->childScnList, elemChildScn) {
+    CIRCLEQ_REMOVE(&mp->childScnList, ms, elemChildScn);
     elfu_mScnDestroy(ms);
   }