MCL/sf/os/kernelhwsrv: comparison userlibandfileserver/fileserver/sfsrv/cl

equal deleted inserted replaced

-:c1f20ce4abcf
+:3e88ff8f41d5
 // Description:
 //
 #include "cl_std.h"
 #include "cl_scan.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cl_scanTraces.h"
-#endif
 const TInt KDirStackGranularity=8;
 /** Replace long names in path and filename with their sohrter version (if exists). Optionally appends
 filename to path name creating fully qualified file name.
 @param aFs The file server session.
 @return A pointer to the new directory scan object.
 */
 	{
-	OstTrace1(TRACE_BORDER, EFSRV_ECDIRSCANNEWLC, "sess %x", aFs.Handle());
+	TRACE1(UTF::EBorder, UTraceModuleEfsrv::ECDirScanNewLC, MODULEUID, aFs.Handle());
 	CDirScan* scan=new(ELeave) CDirScan(aFs);
 	CleanupStack::PushL(scan);
 	scan->iStack=CDirStack::NewL();
-	OstTrace1(TRACE_BORDER, EFSRV_ECDIRSCANNEWLCRETURN, "CDirScan* %x", scan);
+	TRACE1(UTF::EBorder, UTraceModuleEfsrv::ECDirScanNewLCReturn, MODULEUID, scan);
 	return scan;
 	}
 @param aFs The file server session.
 @return A pointer to the new directory scan object.
 */
 	{
-	OstTrace1(TRACE_BORDER, EFSRV_ECDIRSCANNEWL, "sess %x", aFs.Handle());
+	TRACE1(UTF::EBorder, UTraceModuleEfsrv::ECDirScanNewL, MODULEUID, aFs.Handle());
 	CDirScan* scan=CDirScan::NewLC(aFs);
 	CleanupStack::Pop();
-	OstTrace1(TRACE_BORDER, EFSRV_ECDIRSCANNEWLRETURN, "CDirScan* %x", scan);
+	TRACE1(UTF::EBorder, UTraceModuleEfsrv::ECDirScanNewLReturn, MODULEUID, scan);
 	return scan;
 	}
 Desctructor.
 Frees all resources owned by the object, prior to its destruction.
 */
 	{
-	OstTrace1(TRACE_BORDER, EFSRV_ECDIRSCANDESTRUCTOR, "this %x", this);
+	TRACE1(UTF::EBorder, UTraceModuleEfsrv::ECDirScanDestructor, MODULEUID, this);
 	delete iStack;
-	OstTrace0(TRACE_BORDER, EFSRV_ECDIRSCANDESTRUCTORRETURN, "");
+	TRACE0(UTF::EBorder, UTraceModuleEfsrv::ECDirScanDestructorReturn, MODULEUID);
 	}
 @param anEntrySortKey The order in which the directories are scanned by
 NextL(). This flag is defined in TEntryKey.
 @param aScanDir       The direction of the scan. The default is downwards.
 */
 	{
-	OstTraceExt4(TRACE_BORDER, EFSRV_ECDIRSCANSETSCANDATAL, "this %x anEntryAttMask %x anEntrySortKey %d aScanDir %d", (TUint) this, (TUint) anEntryAttMask, (TUint) anEntrySortKey, (TUint) aScanDir);
+	TRACEMULT5(UTF::EBorder, UTraceModuleEfsrv::ECDirScanSetScanDataL, MODULEUID, (TUint)
-	OstTraceData(TRACE_BORDER, EFSRV_ECDIRSCANSETSCANDATAL_EFILEPATH, "FilePath %S", aMatchName.Ptr(), aMatchName.Length()<<1);
+		this, aMatchName, anEntryAttMask, anEntrySortKey, (TUint) aScanDir);
 	TInt r = Fs().Parse(aMatchName,iFullPath);
 	if (r != KErrNone)
 		{
-		OstTrace1(TRACE_BORDER, EFSRV_ECDIRSCANSETSCANDATALRETURN1, "r %d", r);
+		TRACERET1(UTF::EBorder, UTraceModuleEfsrv::ECDirScanSetScanDataLReturn, MODULEUID, r);
 		User::Leave(r);
 		}
 	iScanning = ETrue;
 	iEntryAttMask=anEntryAttMask;
 	iAbbreviatedPath.Set(_L("\\"));
 	iScanDir=aScanDir;
 	if (aScanDir==EScanDownTree)
 		iFullPath.PopDir();
-	OstTrace1(TRACE_BORDER, EFSRV_ECDIRSCANSETSCANDATALRETURN2, "r %d", KErrNone);
+	TRACE1(UTF::EBorder, UTraceModuleEfsrv::ECDirScanSetScanDataLReturn, MODULEUID, KErrNone);
 	}
 void CDirScan::UpdateAbbreviatedPath()
 //
 // Set the abbreviated path based on the full path
 @param aDirEntries On return, a pointer to an array containing filtered entries
 from the next directory in the structure. NULL if there are
 no more directories in the structure.
 */
 	{
-	OstTrace1(TRACE_BORDER, EFSRV_ECDIRSCANNEXTL, "this %x", this);
+	TRACE1(UTF::EBorder, UTraceModuleEfsrv::ECDirScanNextL, MODULEUID, this);
 	if (iScanDir==EScanUpTree)
 		ScanUpTreeL(aDirEntries);
 	else
 		ScanDownTreeL(aDirEntries);
-	OstTraceExt2(TRACE_BORDER, EFSRV_ECDIRSCANNEXTLRETURN, "r %d DirEntries %d", (TUint) KErrNone, (TUint) aDirEntries ? (*aDirEntries).Count() : 0);
+	TRACE2(UTF::EBorder, UTraceModuleEfsrv::ECDirScanNextLReturn, MODULEUID,
+		KErrNone, aDirEntries ? (*aDirEntries).Count() : 0);
 	}
 void CDirScan::ScanUpTreeL(CDir*& aDirEntries)
 //
 // Get the next directory starting from the bottom of the tree
 					}
 				}
 			}
 		if (r != KErrNone)
 			{
-			OstTrace1(TRACE_BORDER, EFSRV_ECDIRSCANLEAVE1, "r %d", r);
+			TRACERET1(UTF::EBorder, UTraceModuleEfsrv::ECDirScanLeave, MODULEUID, r);
 			User::LeaveIfError(r);
 			}
 		CDir* dirList;
 		//	Start by searching for directories only	from top to bottom
 			aDirEntries = CDirFactory::NewL();
 			}
 		else if (r != KErrNone)
 			{
 			iScanning = EFalse;
-			OstTrace1(TRACE_BORDER, EFSRV_ECDIRSCANLEAVE2, "r %d", r);
+			TRACERET1(UTF::EBorder, UTraceModuleEfsrv::ECDirScanLeave, MODULEUID, r);
 			User::Leave(r);
 			}
 		iScanning= EFalse;
 //
 	{
 	TInt r = Fs().GetDir(iFullPath.FullName(),iEntryAttMask,iEntrySortMask,aDirEntries);
 	if (r != KErrNone)
 		{
-		OstTrace1(TRACE_BORDER, EFSRV_ECDIRSCANLEAVE3, "r %d", r);
+		TRACERET1(UTF::EBorder, UTraceModuleEfsrv::ECDirScanLeave, MODULEUID, r);
 		User::Leave(r);
 		}
 	}
 void CDirScan::ScanDownTreeL(CDir*& aDirEntries)
 //
 	{
 	CDir* dirEntries = NULL;
 	TInt r;
 	aDirEntries=NULL;
-	if(iStack->IsEmpty())
+	if(iStack && iStack->IsEmpty())
 	    return;
 	CDirList* list=iStack->Peek();
 	while (!list->MoreEntries())
 		{
 	TPtrC dirName=list->Next().iName;
 	r=iFullPath.AddDir(dirName);
 	if (r==KErrGeneral)	//	Adding dirName makes iFullPath>256 characters
 		{
-		OstTrace1(TRACE_BORDER, EFSRV_ECDIRSCANLEAVE4, "r %d", KErrTooBig);
+		TRACE1(UTF::EBorder, UTraceModuleEfsrv::ECDirScanLeave, MODULEUID, KErrTooBig);
 		User::Leave(KErrTooBig);
 		}
 	//	Get all valid entries in this directory
 		r = Fs().GetDir(iFullPath.DriveAndPath(),
 									   KEntryAttDir|KEntryAttMatchExclusive|(iEntryAttMask&KEntryAttMatchMask),
 									   iEntrySortMask,dirList);
 		if (r != KErrNone)
 			{
-			OstTrace1(TRACE_BORDER, EFSRV_ECDIRSCANLEAVE5, "r %d", r);
+			TRACERET1(UTF::EBorder, UTraceModuleEfsrv::ECDirScanLeave, MODULEUID, r);
 			User::Leave(r);
 			}
 		iStack->PushL(*dirList);
 		CleanupStack::Pop();	// dirEntries
 		UpdateAbbreviatedPath();
 		aDirEntries = CDirFactory::NewL();
 		}
 	else
 		{
 		iScanning = EFalse;
-		OstTrace1(TRACE_BORDER, EFSRV_ECDIRSCANLEAVE6, "r %d", r);
+		TRACERET1(UTF::EBorder, UTraceModuleEfsrv::ECDirScanLeave, MODULEUID, r);
 		User::Leave(r);
 		}
 	}
 	TInt r=iDirStack.Append(nextLevel);
 	if (r!=KErrNone)
 		{
 		delete nextLevel;
-		OstTrace1(TRACE_BORDER, EFSRV_ECDIRSCANLEAVE7, "r %d", r);
+		TRACERET1(UTF::EBorder, UTraceModuleEfsrv::ECDirScanLeave, MODULEUID, r);
 		User::Leave(r);
 		}
 	}
 void CDirStack::Pop()
 		{
 		TThreadId theId;
 		TInt r = iFs->GetOpenFileList(iScanPos,iEntryListPos,theId,array);
 		if (r != KErrNone)
 			{
-			OstTrace1(TRACE_BORDER, EFSRV_ECDIRSCANLEAVE8, "r %d", r);
+			TRACERET1(UTF::EBorder, UTraceModuleEfsrv::ECDirScanLeave, MODULEUID, r);
 			User::Leave(r);
 			}
 		TInt count=array.Count();
 		if (count==0)
 			{

branch	RCL_3
changeset 44	3e88ff8f41d5
parent 43	c1f20ce4abcf
child 45	9e2d4f7f5028