From c76af00e00b540ce7ddbc44d145bc2e70927a799 Mon Sep 17 00:00:00 2001
From: norly <ny-git@enpas.org>
Date: Thu, 27 Jun 2013 03:05:12 +0100
Subject: [PATCH] Remove unneeded struct member and fix references to it

---
 include/libelfu/types.h  | 1 -
 src/libelfu/model/elf.c  | 4 ++--
 src/libelfu/model/phdr.c | 8 ++++----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/include/libelfu/types.h b/include/libelfu/types.h
index ab9f76c..d6a7584 100644
--- 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 46dc120..a25aa89 100644
--- 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 9889f39..b694eb9 100644
--- 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);
   }
 
-- 
2.30.2