X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Ftime.c;h=29d8ddb13ca8ebad3c9ef43a8887a1be5386826b;hb=e9406092ff4b38cc548c7ade1f18329247016b36;hp=449afcd94b0ac810464a4399821b0d298ab5a5f1;hpb=d0b4559f2936f6d9f06be0f7c3c51527a480ec0d;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/time.c b/KernelLand/Kernel/time.c
index 449afcd9..29d8ddb1 100644
--- a/KernelLand/Kernel/time.c
+++ b/KernelLand/Kernel/time.c
@@ -117,7 +117,8 @@ tTimer *Time_CreateTimer(int Delta, tTimerCallback *Callback, void *Argument)
  */
 void Time_ScheduleTimer(tTimer *Timer, int Delta)
 {
-	tTimer	*t, *p;
+	tTimer	*t;
+	tTimer	**prev_next;
 
 	// Sanity checks
 	if( !Timer )	return ;
@@ -134,9 +135,10 @@ void Time_ScheduleTimer(tTimer *Timer, int Delta)
 	// Add into list (sorted)
 	SHORTLOCK(&gTimers_ListLock);
 //	Mutex_Release( &Timer->Lock );	// Prevent deadlocks
-	for( p = (tTimer*)&gTimers, t = gTimers; t; p = t, t = t->Next )
+	for( prev_next = &gTimers, t = gTimers; t; prev_next = &t->Next, t = t->Next )
 	{
-		ASSERT( p != t ); ASSERT( CheckMem(t, sizeof(tTimer)) );
+		ASSERT( prev_next != &t->Next );
+		ASSERT( CheckMem(t, sizeof(tTimer)) );
 		if( t == Timer )
 		{
 			LOG("Double schedule - increasing delta");
@@ -147,9 +149,9 @@ void Time_ScheduleTimer(tTimer *Timer, int Delta)
 		if( t->FiresAfter > Timer->FiresAfter )	break;
 	}
 	Timer->Next = t;
-	p->Next = Timer;
+	*prev_next = Timer;
 	Timer->bActive = 1;
-	LOG(" %p %p %p", p, Timer, t);
+	LOG(" %p %p %p", prev_next, Timer, t);
 	SHORTREL(&gTimers_ListLock);
 }
 
@@ -158,17 +160,19 @@ void Time_ScheduleTimer(tTimer *Timer, int Delta)
  */
 void Time_RemoveTimer(tTimer *Timer)
 {
-	tTimer	*t, *p;
+	tTimer	*t;
+	tTimer	**prev_next;
 
 	if( !Timer )	return ;
 	
 	SHORTLOCK(&gTimers_ListLock);
-	for( p = (tTimer*)&gTimers, t = gTimers; t; p = t, t = t->Next )
+	for( prev_next = &gTimers, t = gTimers; t; prev_next = &t->Next, t = t->Next )
 	{
-		ASSERT( p != t ); ASSERT( CheckMem(t, sizeof(tTimer)) );
+		ASSERT( prev_next != &t->Next );
+		ASSERT( CheckMem(t, sizeof(tTimer)) );
 		if( t == Timer )
 		{
-			p->Next = t->Next;
+			*prev_next = t->Next;
 			break ;
 		}
 	}