turning list elements into allocated objects

1 files changed, 18 insertions, 18 deletions

diff --git a/src/list.c b/src/list.c
index 07341c57..e9bb4851 100644
--- a/src/list.c
+++ b/src/list.c
@@ -9,28 +9,28 @@ void listAddAfter( List *list, ListEl *prev_el, ListEl *new_el )
 {
 	/* Set the previous pointer of new_el to prev_el. We do
 	 * this regardless of the state of the list. */
-	new_el->prev = prev_el; 
+	new_el->list_prev = prev_el; 
 
 	/* Set forward pointers. */
 	if (prev_el == 0) {
 		/* There was no prev_el, we are inserting at the head. */
-		new_el->next = list->head;
+		new_el->list_next = list->head;
 		list->head = new_el;
 	} 
 	else {
 		/* There was a prev_el, we can access previous next. */
-		new_el->next = prev_el->next;
-		prev_el->next = new_el;
+		new_el->list_next = prev_el->list_next;
+		prev_el->list_next = new_el;
 	} 
 
 	/* Set reverse pointers. */
-	if (new_el->next == 0) {
+	if (new_el->list_next == 0) {
 		/* There is no next element. Set the tail pointer. */
 		list->tail = new_el;
 	}
 	else {
 		/* There is a next element. Set it's prev pointer. */
-		new_el->next->prev = new_el;
+		new_el->list_next->list_prev = new_el;
 	}
 
 	/* Update list length. */
@@ -41,28 +41,28 @@ void listAddBefore( List *list, ListEl *next_el, ListEl *new_el)
 {
 	/* Set the next pointer of the new element to next_el. We do
 	 * this regardless of the state of the list. */
-	new_el->next = next_el; 
+	new_el->list_next = next_el; 
 
 	/* Set reverse pointers. */
 	if (next_el == 0) {
 		/* There is no next elememnt. We are inserting at the tail. */
-		new_el->prev = list->tail;
+		new_el->list_prev = list->tail;
 		list->tail = new_el;
 	} 
 	else {
 		/* There is a next element and we can access next's previous. */
-		new_el->prev = next_el->prev;
-		next_el->prev = new_el;
+		new_el->list_prev = next_el->list_prev;
+		next_el->list_prev = new_el;
 	} 
 
 	/* Set forward pointers. */
-	if (new_el->prev == 0) {
+	if (new_el->list_prev == 0) {
 		/* There is no previous element. Set the head pointer.*/
 		list->head = new_el;
 	}
 	else {
 		/* There is a previous element, set it's next pointer to new_el. */
-		new_el->prev->next = new_el;
+		new_el->list_prev->list_next = new_el;
 	}
 
 	list->listLen++;
@@ -71,16 +71,16 @@ void listAddBefore( List *list, ListEl *next_el, ListEl *new_el)
 ListEl *listDetach( List *list, ListEl *el )
 {
 	/* Set forward pointers to skip over el. */
-	if (el->prev == 0) 
-		list->head = el->next; 
+	if (el->list_prev == 0) 
+		list->head = el->list_next; 
 	else
-		el->prev->next = el->next; 
+		el->list_prev->list_next = el->list_next; 
 
 	/* Set reverse pointers to skip over el. */
-	if (el->next == 0) 
-		list->tail = el->prev; 
+	if (el->list_next == 0) 
+		list->tail = el->list_prev; 
 	else
-		el->next->prev = el->prev; 
+		el->list_next->list_prev = el->list_prev; 
 
 	/* Update List length and return element we detached. */
 	list->listLen--;