From dfec4035ddaa10861d83a795848731d7a792f09b Mon Sep 17 00:00:00 2001
From: Chris Young <chris@unsatisfactorysoftware.co.uk>
Date: Mon, 6 Oct 2008 18:20:16 +0000
Subject: List traversing tidy-up.

svn path=/trunk/netsurf/; revision=5499
---
 amiga/gui.c      | 21 ++++++++-------------
 amiga/object.c   |  5 +++--
 amiga/schedule.c | 20 ++++++++++----------
 amiga/tree.c     |  9 +++++----
 4 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/amiga/gui.c b/amiga/gui.c
index 76d1c2d9e..9fed117c1 100755
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -424,10 +424,12 @@ void ami_handle_msg(void)
 	struct InputEvent *ie;
 	struct Node *tabnode;
 
-	node = (struct nsObject *)window_list->mlh_Head;
+	node = (struct nsObject *)GetHead((struct List *)window_list);
 
-	while(nnode=(struct nsObject *)(node->dtz_Node.mln_Succ))
+	do
 	{
+		nnode=(struct nsObject *)GetSucc((struct Node *)node);
+
 		gwin = node->objstruct;
 
 		if(node->Type == AMINS_TVWINDOW)
@@ -715,9 +717,7 @@ void ami_handle_msg(void)
 			tgw.shared = gwin;
 			gui_window_place_caret(&tgw,gwin->c_x,gwin->c_y,gwin->c_h);
 		}
-
-		node = nnode;
-	}
+	} while(node = nnode);
 }
 
 void ami_handle_appmsg(void)
@@ -1553,19 +1553,14 @@ void ami_close_all_tabs(struct gui_window_2 *gwin)
 	{
 		tab = GetHead(&gwin->tab_list);
 
-		while(ntab=GetSucc(tab))
+		do
 		{
+			ntab=GetSucc(tab);
 			GetClickTabNodeAttrs(tab,
 								TNA_UserData,&gwin->bw,
 								TAG_DONE);
 			browser_window_destroy(gwin->bw);
-			tab=ntab;
-		}
-
-		GetClickTabNodeAttrs(tab,
-							TNA_UserData,&gwin->bw,
-							TAG_DONE);
-		browser_window_destroy(gwin->bw);
+		} while(tab=ntab);
 	}
 	else
 	{
diff --git a/amiga/object.c b/amiga/object.c
index f13451bfb..4dbf2c056 100755
--- a/amiga/object.c
+++ b/amiga/object.c
@@ -61,14 +61,15 @@ void FreeObjList(struct MinList *objlist)
 	struct nsObject *node;
 	struct nsObject *nnode;
 
-	node = (struct nsObject *)objlist->mlh_Head;
+	node = (struct nsObject *)GetHead((struct List *)objlist);
 
-	while(nnode=(struct nsObject *)(node->dtz_Node.mln_Succ))
+	while(nnode=(struct nsObject *)GetSucc((struct Node *)node))
 	{
 		if(node->Type == AMINS_CALLBACK)
 			ami_remove_timer_event((struct nscallback *)node->objstruct);
 
 		DelObject(node);
+
 		node=nnode;
 	}
 
diff --git a/amiga/schedule.c b/amiga/schedule.c
index 4c80d9227..e7a5e9f95 100755
--- a/amiga/schedule.c
+++ b/amiga/schedule.c
@@ -93,10 +93,12 @@ void schedule_remove(void (*callback)(void *p), void *p)
 
 	if(IsMinListEmpty(schedule_list)) return;
 
-	node = (struct nsObject *)schedule_list->mlh_Head;
+	node = (struct nsObject *)GetHead((struct List *)schedule_list);
 
-	while(nnode=(struct nsObject *)(node->dtz_Node.mln_Succ))
+	do
 	{
+		nnode=(struct nsObject *)GetSucc((struct Node *)node);
+
 		nscb = node->objstruct;
 		if(!nscb) continue;
 
@@ -105,9 +107,7 @@ void schedule_remove(void (*callback)(void *p), void *p)
 			ami_remove_timer_event(nscb);
 			DelObject(node);
 		}
-
-		node=nnode;
-	}
+	} while(node=nnode);
 }
 
 /**
@@ -127,10 +127,12 @@ void schedule_run(void)
 
 	GetSysTime(&tv);
 
-	node = (struct nsObject *)schedule_list->mlh_Head;
+	node = (struct nsObject *)GetHead((struct List *)schedule_list);
 
-	while(nnode=(struct nsObject *)(node->dtz_Node.mln_Succ))
+	do
 	{
+		nnode=(struct nsObject *)GetSucc((struct Node *)node);
+
 		if((node->Type == AMINS_CALLBACK) && (node->objstruct))
 		{
 			nscb = node->objstruct;
@@ -144,9 +146,7 @@ void schedule_run(void)
 				callback(p);
 			}
 		}
-
-		node=nnode;
-	}
+	} while(node=nnode);
 }
 
 void ami_remove_timer_event(struct nscallback *nscb)
diff --git a/amiga/tree.c b/amiga/tree.c
index 230467ffc..b88444a91 100755
--- a/amiga/tree.c
+++ b/amiga/tree.c
@@ -290,13 +290,14 @@ void free_browserlist(struct List *list)
 
 	if(IsListEmpty(list)) return;
 
-    node = list->lh_Head;
-    while (nextnode = node->ln_Succ)
+    node = GetHead(list);
+
+	do
     {
+    	nextnode = GetSucc(node);
 		FreeVec(node->ln_Name);
         FreeListBrowserNode(node);
-        node = nextnode;
-    }
+    } while(node = nextnode);
 }
 
 void ami_add_elements(struct treeview_window *twin,struct node *root,WORD *gen)
-- 
cgit v1.2.3