--- a/kernel/eka/nkern/win32/vectors.cpp	Wed Sep 22 10:53:45 2010 +0100
+++ b/kernel/eka/nkern/win32/vectors.cpp	Mon Sep 27 10:52:00 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1998-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1998-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of the License "Eclipse Public License v1.0"
@@ -12,13 +12,15 @@
 //
 // Description:
 // e32\nkern\win32\vectors.cpp
-// 
+//
 //
 
 #include "nk_priv.h"
 
-inline TInt Invoke(TLinAddr aHandler,const TInt* aArgs)
-	{return (TExecHandler(aHandler))(aArgs[0],aArgs[1],aArgs[2],aArgs[3]);}
+inline TInt Invoke(TLinAddr aHandler, const TInt* aArgs)
+	{
+	return (TExecHandler(aHandler))(aArgs[0], aArgs[1], aArgs[2], aArgs[3]);
+	}
 
 /**	Executive dispatcher.
 	This is hooked by EUSER to handle executive dispatch into the kernel.
@@ -29,15 +31,16 @@
 EXPORT_C TInt __fastcall Dispatch(TInt aFunction, TInt* aArgs)
 	{
 	NThread& me = *static_cast<NThread*>(TheScheduler.iCurrentThread);
-	__NK_ASSERT_ALWAYS(!me.iDiverted);
+	__NK_ASSERT_ALWAYS(!me.iDiverting);
 	
 	EnterKernel();
 
 	if (aFunction & 0x800000)
 		{
-		aFunction &= 0x7fffff;
 		// fast exec
 		const SFastExecTable* table = me.iFastExecTable;
+
+		aFunction &= 0x7fffff;
 		if (aFunction == 0)
 			{
 			// special case fast exec call
@@ -45,38 +48,44 @@
 			LeaveKernel();
 			return 0;
 			}
-		if (TUint(aFunction)<TUint(table->iFastExecCount))
+
+		if (TUint(aFunction) < TUint(table->iFastExecCount))
 			{
 			NKern::Lock();
-			TInt r = Invoke(table->iFunction[aFunction-1],aArgs);
+			TInt r = Invoke(table->iFunction[aFunction-1], aArgs);
 			NKern::Unlock();
 			LeaveKernel();
 			return r;
 			}
+
 		// invalid exec number passed, so ensure we invoke the invalid exec
 		// handler by setting an illegal slow exec number
 		aFunction = -1;
 		}
 
 	// slow exec
+	const SSlowExecTable* table = (const SSlowExecTable*)((const TUint8*)me.iSlowExecTable - _FOFF(SSlowExecTable, iEntries));
 
-	
-	const SSlowExecTable* table = (const SSlowExecTable*)((const TUint8*)me.iSlowExecTable - _FOFF(SSlowExecTable,iEntries));
 	if (TUint(aFunction) >= TUint(table->iSlowExecCount))
-		return Invoke(table->iInvalidExecHandler,aArgs);
+		return Invoke(table->iInvalidExecHandler, aArgs);
 
 	const SSlowExecEntry& e = table->iEntries[aFunction];
+
 	if (e.iFlags & KExecFlagClaim)
 		NKern::LockSystem();
+
 	if (e.iFlags & KExecFlagPreprocess)
 		{
 		// replace the first argument with the result of preprocessing
 		TPreprocessHandler preprocesser = (TPreprocessHandler)table->iPreprocessHandler;
 		preprocesser(aArgs, e.iFlags);
 		}
-	TInt r = Invoke(e.iFunction,aArgs);
+
+	TInt r = Invoke(e.iFunction, aArgs);
+
 	if (e.iFlags & KExecFlagRelease)
 		NKern::UnlockSystem();
+
 	LeaveKernel();
 	return r;
 	}