--- a/traceservices/tracefw/ulogger/src/uloggerserver/uloggerserver.cpp	Fri May 14 13:32:10 2010 +0100
+++ b/traceservices/tracefw/ulogger/src/uloggerserver/uloggerserver.cpp	Thu Jul 01 17:02:22 2010 +0100
@@ -276,7 +276,7 @@
 	TInt ret= KErrNone;
 	//check configuration file in user path (\\ulogger\\uloggerconfig.ini)	
 
-	ret = GetInstalledInputPlugins(activePluginsArray);
+	ret = GetInstalledInputPluginsL(activePluginsArray);
 	if(ret==KErrNone)
 		{
 		ret = KErrNotFound;
@@ -334,7 +334,7 @@
 		return KErrNotFound;
 	else
 		{
-		TInt ret = GetValues(aMediaName,aListBuffer);
+		TInt ret = GetValuesL(aMediaName,aListBuffer);
 		if(ret == KErrNotFound) //this error indicate that there is no section in config file, plug-in exists
 			ret = KErrNone;
 		return ret;
@@ -347,7 +347,7 @@
 Function to get values from the configuration file (i.e. for filters,plugin settings)
 This should leave with KErrNotFound if it cannot find the configuration file
 */
-TInt CULoggerServer::GetValues(const TDesC8 &aSectionName, RArray<TPtrC8>& aListBuffer)
+TInt CULoggerServer::GetValuesL(const TDesC8 &aSectionName, RArray<TPtrC8>& aListBuffer)
 {	
 	TPtrC8 key;
 	TPtrC8 val;
@@ -386,7 +386,7 @@
 @return KErrNone, if successful, otherwise one of the other system-wide
         error codes.
 */
-TInt CULoggerServer::SetActiveFilter(RArray<TUint32> aCategory, TInt aFilterType)
+TInt CULoggerServer::SetActiveFilterL(RArray<TUint32> aCategory, TInt aFilterType)
 {
 	TInt error = KErrNone;
 	if(aFilterType == 1)
@@ -490,7 +490,7 @@
 @return KErrNone, if successful, otherwise one of the other system-wide
         error codes.
 */
-TInt CULoggerServer::SetBufferSize(TInt aSize)
+TInt CULoggerServer::SetBufferSizeL(TInt aSize)
 	{
 	if(aSize > KMaxBufferSize || aSize < 1)
 		return KErrArgument;
@@ -532,7 +532,7 @@
 @return KErrNone, if successful, otherwise one of the other system-wide
         error codes.
 */
-TInt CULoggerServer::SetDataNotificationSize(TInt aSize)
+TInt CULoggerServer::SetDataNotificationSizeL(TInt aSize)
 	{
 	if(aSize > KMaxDnsSize || aSize < 0)
 		return KErrArgument;
@@ -644,7 +644,7 @@
 	RArray<TPtrC8> aValues;
 	if(aFilterType == 1)
 		{
-		ret = GetValues(KPrimaryFilterSection,aValues);
+		ret = GetValuesL(KPrimaryFilterSection,aValues);
 		if(ret==KErrNone)	
 			{
 			TInt i =0;
@@ -664,7 +664,7 @@
 		}
 	else if(aFilterType == 2)
 		{
-		ret = GetValues(KSecondaryFilterSection,aValues);
+		ret = GetValuesL(KSecondaryFilterSection,aValues);
 		if(ret==KErrNone)	
 			{
 			TInt i =0;
@@ -739,7 +739,7 @@
 	
 
 
-TInt CULoggerServer::GetInstalledInputPlugins(RArray<TPtrC8>& aListBuffer)
+TInt CULoggerServer::GetInstalledInputPluginsL(RArray<TPtrC8>& aListBuffer)
 	{
 	#if defined(__LIGHTLOGGER_ENABLED) && defined(__VERBOSE_MODE)
 	__MARK_METHOD("CULoggerServer::GetInstalledControlPlugins")
@@ -773,7 +773,7 @@
 */
 TInt CULoggerServer::GetActiveOutputPlugin(RArray<TPtrC8>& aListBuffer)
 	{
-	TInt errCode = GetValues(KActiveSection,aListBuffer);
+	TInt errCode = GetValuesL(KActiveSection,aListBuffer);
 	//plugins are received as, e.g. '1 uloggerfileplugin' (.ini file syntax)
 	//we have to remove number from array
 	for(TInt i=0; i<aListBuffer.Count(); ++i)
@@ -813,7 +813,7 @@
 */
 TInt CULoggerServer::GetActiveInputPlugin(RArray<TPtrC8>& aListBuffer)
 	{
-	return GetValues(KActiveControlSection,aListBuffer);
+	return GetValuesL(KActiveControlSection,aListBuffer);
 	}
 
 /**
@@ -884,7 +884,7 @@
 	if(iBtraceOpen == EFalse)
 		{
 		if(iIsBooting)
-			error = TraceSettingsOnBoot();
+			error = TraceSettingsOnBootL();
 		else
 			error = iTrace.Open();
 
@@ -1015,9 +1015,8 @@
 Gets the Trace settings on boot
 @return none
 */
-TInt CULoggerServer::TraceSettingsOnBoot()
+TInt CULoggerServer::TraceSettingsOnBootL()
 {
-
 	TInt trace = FALSE;
 	
 	RArray<TUint32> category;
@@ -1027,9 +1026,9 @@
 	
 	TInt bufferSize = iTrace.BufferSize(); //To get the buffer size set at boot	
 	if(bufferSize <= 0 && bufferSize > KMaxBufferSize)
-		SetBufferSize(KMaxBufferSize); //Update config
+		SetBufferSizeL(KMaxBufferSize); //Update config
 	else
-		SetBufferSize(bufferSize); //Update config
+		SetBufferSizeL(bufferSize); //Update config
 	for(TUint i=0; i<KMaxPrimaryFiltersLimit; i++)
 	{
 		trace = iTrace.Filter(i);
@@ -1347,7 +1346,7 @@
 			
 			if(errCode == KErrNone)
 				{
-				errCode = SetActiveFilter(filterArray, EPrimaryFilter);
+				errCode = SetActiveFilterL(filterArray, EPrimaryFilter);
 				result.Num(errCode);
 			
 				//create acknowledment
@@ -1405,7 +1404,7 @@
 				break;
 			
 			//create ack
-			errCode = SetActiveFilter(filterArray, ESecondaryFilter);
+			errCode = SetActiveFilterL(filterArray, ESecondaryFilter);
 			result.Num(errCode);
 			data = inputData->CreatePackage((void*)result.Ptr(), result.Length());
 		
@@ -1436,7 +1435,7 @@
 				TInt bufSize;
 				TLex8 lex(aArguments[0]);
 				if((errCode = lex.Val(bufSize)) == KErrNone)
-					errCode = SetBufferSize(bufSize);
+					errCode = SetBufferSizeL(bufSize);
 				}
 			else
 				errCode = KErrArgument;
@@ -1485,7 +1484,7 @@
 				TInt dns;
 				TLex8 lex(aArguments[0]);
 				if((errCode = lex.Val(dns)) == KErrNone)
-					errCode = SetDataNotificationSize(dns);
+					errCode = SetDataNotificationSizeL(dns);
 					else
 						errCode = KErrArgument;
 				}
@@ -1937,7 +1936,7 @@
 			#endif
 			
 			RArray<TPtrC8> tmpArray;
-			errCode = GetInstalledInputPlugins(tmpArray);
+			errCode = GetInstalledInputPluginsL(tmpArray);
 
 			result.Num(errCode);
 			data = inputData->CreatePackage((void*)result.Ptr(), result.Length());
@@ -2015,7 +2014,7 @@
 	TInt errCode = 0;
 	CPlugin::TPluginInterface interfaceId;
 	//assign filter value
-	aFilter==EOutputPluginFilter ? interfaceId=MOutputPlugin::iInterfaceId : interfaceId=MInputPlugin::iInterfaceId;
+	interfaceId = (aFilter == EOutputPluginFilter ? MOutputPlugin::iInterfaceId : MInputPlugin::iInterfaceId);
 	
 	//filter plugins
 	TInt i=0;
@@ -2056,7 +2055,7 @@
 	if(aPluginFilter == EOutputPluginFilter)
 		GetInstalledOutputPlugins(pluginsArray);
 	else if(aPluginFilter == EInputPluginFilter)
-		GetInstalledInputPlugins(pluginsArray);
+		GetInstalledInputPluginsL(pluginsArray);
 
 	for(TInt i=0; i<pluginsArray.Count(); ++i)
 		if(aPluginName.Compare(pluginsArray[i])==0)