FCL/sf/os/kernelhwsrv: comparison userlibandfileserver/fileserver/sfat/sl

equal deleted inserted replaced

-:a41df078684a
+:4122176ea935
 /**
 @file
 @internalTechnology
 */
+//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+//!!
+//!! WARNING!! DO NOT edit this file !! '\sfat' component is obsolete and is not being used. '\sfat32'replaces it
+//!!
+//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 #include "sl_std.h"
 #include "sl_cache.h"
 #include "sl_leafdir_cache.h"
 #include "sl_dir_cache.h"
 {
 if(!CheckVolumeTheSame())
 User::Leave(KErrGeneral);
-	//-- get drive capabilities
+//-- get drive capabilities
 TLocalDriveCapsV2Buf capsBuf;
-	User::LeaveIfError(LocalDrive()->Caps(capsBuf));
+User::LeaveIfError(LocalDrive()->Caps(capsBuf));
 //-- the volume is the same as it was on original MountL()
 //-- we need to re-initialize for the case when the media was removed, FAT or directory structure changed on other device and the media returned back.
 DoDismount();
 Reset the last leaf dir or invalidate leaf dir cache if leaf dir cache is
 instantiated.
 */
 void CFatMountCB::InvalidateLeafDirCache()
-	{
+{
 if (iLeafDirCache)
-	{
+{
 iLeafDirCache->Reset();
-	}
+}
 else
-	{
+{
 User::Free(iLastLeafDir);
 iLastLeafDir=NULL;
-	}
+}
-	}
+}
 //-------------------------------------------------------------------------------------------------------------------
 /**
 Delete mount's caches
 if(ReadOnly() && aOperation == RFs::EFinal_RW)
 {
 User::Leave(KErrAccessDenied); //-- can't override RO flag
 }
-		(void)LocalDrive()->Finalise(ETrue);
+(void)LocalDrive()->Finalise(ETrue);
 if(aOperation == RFs::EFinal_RO)
 {
 SetReadOnly(ETrue);
 return;
 //-- if the client sets aVolume.iVolSizeAsync flag there, RFs::Volume() will be asynchronous, i.e the _current_ number of free clusters
 //-- will be returned.
 const TBool bSyncOp = !aVolume.iVolSizeAsync;
 aVolume.iVolSizeAsync = EFalse; //-- reset this flag in order it not to be reused on the client side
-	__PRINT2(_L("CFatMountCB::VolumeL() drv:%d, synch:%d"), DriveNumber(), bSyncOp);
+__PRINT2(_L("CFatMountCB::VolumeL() drv:%d, synch:%d"), DriveNumber(), bSyncOp);
 const TDriveInfo& drvInfo=aVolume.iDrive;
 #if defined(__EPOC32__)
 // if RAM drive, cap size according to HAL.
 if (drvInfo.iType==EMediaRam)
 __ASSERT_ALWAYS(aName.Length()<=KVolumeLabelSize,User::Leave(KErrBadName));
 TBuf8<KVolumeLabelSize> buf8(KVolumeLabelSize);
 buf8.Zero();
-	LocaleUtils::ConvertFromUnicodeL(buf8, aName, TFatUtilityFunctions::EOverflowActionLeave);
+LocaleUtils::ConvertFromUnicodeL(buf8, aName, TFatUtilityFunctions::EOverflowActionLeave);
-	aName.Zero();
+aName.Zero();
-	LocaleUtils::ConvertToUnicodeL(aName, buf8); // adjust aName (which may contain more underscores after this line than before)
+LocaleUtils::ConvertToUnicodeL(aName, buf8); // adjust aName (which may contain more underscores after this line than before)
 const TInt lengthOfBuf8=buf8.Length();
 // Pad to end with spaces if not empty.
 if (lengthOfBuf8>0 && lengthOfBuf8<KVolumeLabelSize)
 {
 TFileName fileName;
 TEntryPos startPos;
 TFatDirEntry startEntry;
 TRAPD(ret,DoFindL(name,KEntryAttMaskSupported,
-			    		startPos,startEntry,dumPos,dumEntry,
+startPos,startEntry,dumPos,dumEntry,
-			    		fileName,KErrNotFound,
+fileName,KErrNotFound,
-			    		&iFileCreationHelper,
+&iFileCreationHelper,
-			    		leafDir));
+leafDir));
 if (ret!=KErrNotFound && ret!=KErrNone)
 User::Leave(ret);
 if (ret!=KErrNotFound)
 {
 User::Leave(KErrAccessDenied);
 }
 TShortName shortName;
 if (iFileCreationHelper.GetValidatedShortName(shortName) == KErrNotFound)
-	{
+{
-	GenerateShortNameL(dirPos.iCluster,name,shortName,ETrue);
+GenerateShortNameL(dirPos.iCluster,name,shortName,ETrue);
-	}
+}
 TInt numEntries=1;
 if (isOriginalNameLegal==EFalse)
 numEntries=NumberOfVFatEntries(name.Length());
 dumPos=dirPos;
 if (iFileCreationHelper.IsNewEntryPosFound())
-	{
+{
-	dumPos = iFileCreationHelper.EntryAddingPos();
+dumPos = iFileCreationHelper.EntryAddingPos();
-	}
+}
 AddDirEntryL(dumPos,numEntries);    //  Directory entry in leaf directory
 TInt startCluster;
 FOREVER
 {
 }
 TFatDirEntry fatDirEntry;
 fatDirEntry.SetName(shortName);
 fatDirEntry.SetAttributes(KEntryAttDir);
 TTime now;
-	now.UniversalTime();
+now.UniversalTime();
 fatDirEntry.SetTime(now, TimeOffset());
 fatDirEntry.SetCreateTime(now, TimeOffset());
 fatDirEntry.SetStartCluster(startCluster);
 fatDirEntry.SetSize(0);
 if (isOriginalNameLegal)
 //-- copy "." directory entry to the buffer
 //-- "." directory entry
 TFatDirEntry entry;
 TTime now;
-	now.UniversalTime();
+now.UniversalTime();
 entry.SetTime(now, TimeOffset() );
 entry.SetAttributes(KEntryAttDir);
 entry.SetCurrentDirectory();
 entry.SetStartCluster(aStartCluster);
 Mem::Copy(&buf[0],&entry,KSizeOfFatDirEntry);
 MoveToDosEntryL(dosEntryPos,dosEntry);
 if (!IsDirectoryEmptyL(StartCluster(dosEntry)))
 User::Leave(KErrInUse);
 // Remove the directory from cache before erasing
 if(iLeafDirCache && iLeafDirCache->CacheCount() > 0)
-	{
+{
-	iLeafDirCache->RemoveDirL(StartCluster(dosEntry));
+iLeafDirCache->RemoveDirL(StartCluster(dosEntry));
-	}
+}
 EraseDirEntryL(dirEntryPos,dirEntry);
 FAT().FreeClusterListL(StartCluster(dosEntry));
 FAT().FlushL();
 }
 @param   aNewName           a new entry name
 @param   aMode              specifies renaming / replacing
 @param   aNewDosEntryPos    on exit contains new entry Pos.
 */
 void CFatMountCB::DoRenameOrReplaceL(const TDesC& aOldName, const TDesC& aNewName, TRenMode aMode, TEntryPos& aNewName_DosEntryPos)
-	{
+{
 __PRINT3(_L("CFatMountCB::DoRenameOrReplaceL() mode:%d old:%S, new:%S"), aMode, &aOldName, &aNewName);
 const TBool namesAreIdentical = FileNamesIdentical(aOldName, aNewName); //-- this is case-insensitive.
 const TBool renameMode = (aMode == EModeRename);
 const TBool replaceMode = !renameMode;
 TFileName fileName;
 iFileCreationHelper.InitialiseL(ptrNewName);
 TFatDirEntry startEntry;
 TRAP(nRes, DoFindL(ptrNewName, KEntryAttMaskSupported,
-	    		newName_VFatEntryPos, startEntry, aNewName_DosEntryPos, newName_DosEntry,
+newName_VFatEntryPos, startEntry, aNewName_DosEntryPos, newName_DosEntry,
-	    		fileName, KErrNotFound,
+fileName, KErrNotFound,
-	    		&iFileCreationHelper,
+&iFileCreationHelper,
-	    		leafDir));
+leafDir));
 if (nRes!=KErrNone && nRes!=KErrNotFound)
 User::Leave(nRes);
 const TBool newFileExists = (nRes == KErrNone); //-- ETrue if 'aNewName' file exists.
 const TBool bNewNameIsVFAT = !IsLegalDosName(ptrNewName, EFalse, EFalse, EFalse, EFalse, ETrue);
 if(renameMode && newFileExists)
-	{
+{
 if(!namesAreIdentical)
 {
 if ((newName_DosEntry.Attributes()&KEntryAttDir) != (oldName_DosEntry.Attributes()&KEntryAttDir))
-	{
+{
-	User::Leave(KErrAccessDenied); 	//-- leave with KErrAccessDenied if it is trying to rename a file
+User::Leave(KErrAccessDenied);  //-- leave with KErrAccessDenied if it is trying to rename a file
-									//		to a dir or vice versa.
+//      to a dir or vice versa.
-	}
+}
 User::Leave(KErrAlreadyExists); //-- can't rename file if the file with 'aNewName' already exists
 }
 else
-	{
+{
 if(!bNewNameIsVFAT && !bOldNameIsVFAT)
 return; //-- renaming DOS name to itself
-	}
+}
 //-- allow renaming entry to itself. "namesAreIdentical" is case-insensitive. use case: "FILE" -> "File"
-	}
+}
 //---------------------------------------------------------------------------------------------------------------------------
 if(replaceMode && newFileExists)
-	{
+{
 //---------------------------------------------------------------------------------------------------------------------------
 //-- replace contents of the 'aNewName' with 'aOldName' and remove 'aOldName' entries.
 //-- check if we are still trying to replace the file with itself, probably using short name alias
 if(aNewName_DosEntryPos == oldName_DosEntryPos)
 newName_DosEntry.SetSize(oldName_DosEntry.Size());
 newName_DosEntry.SetTime(oldName_DosEntry.Time(TTimeIntervalSeconds(0)), TTimeIntervalSeconds(0));
 newName_DosEntry.SetAttributes(oldName_DosEntry.Attributes());
 if(IsRuggedFSys())
-	{
+{
-	//-- Note 1.
+//-- Note 1.
 //-- set a special Id in reserved section for old and new entries.
 //-- if write fails before the old entry gets erased, we will have 2 entries pointing to the same clusterchain.
 //-- ScanDrive is responsible for fixing this situation by erasing entry with ID KReservedIdOldEntry.
 //-- note that  SetRuggedFatEntryId() uses "LastAccessTime" DOS FAT entry field to store the ID.
 //-- in normal situation this field isn't used, though Windows checkdisk can chack its validiy.
 //-- KReservedIdNewEntry == 0x0000 that corresponds to year 1980.
-	            newName_DosEntry.SetRuggedFatEntryId(KReservedIdNewEntry);
+newName_DosEntry.SetRuggedFatEntryId(KReservedIdNewEntry);
-	            oldName_DosEntry.SetRuggedFatEntryId(KReservedIdOldEntry);
+oldName_DosEntry.SetRuggedFatEntryId(KReservedIdOldEntry);
-	            WriteDirEntryL(oldName_DosEntryPos, oldName_DosEntry);
+WriteDirEntryL(oldName_DosEntryPos, oldName_DosEntry);
 }
 //-- write 'aNewName' DOS dir. entry data back
 WriteDirEntryL(aNewName_DosEntryPos, newName_DosEntry);
 FAT().FreeClusterListL(newNameStartCluster);
 if(IsRuggedFSys())
 FAT().FlushL();
-	}
+}
 else //if(replaceMode && newFileExists)
-	{
+{
 //---------------------------------------------------------------------------------------------------------------------------
 //-- Renaming 'aOldName' to 'aNewName': add 'aNewName' entry set and remove 'aOldName' entryset
 TFatDirEntry newDosEntry = oldName_DosEntry;
 //-- generate short name for the 'aNewName' entryset and make new DOS entry
 if(bNewNameIsVFAT)
-	{//-- need to generate a short name for VFAT entryset DOS entry
+{//-- need to generate a short name for VFAT entryset DOS entry
 TShortName shortName;
-		    if (iFileCreationHelper.GetValidatedShortName(shortName) == KErrNotFound)
+if (iFileCreationHelper.GetValidatedShortName(shortName) == KErrNotFound)
-		    	{
+{
-		        GenerateShortNameL(aNewName_DosEntryPos.Cluster(), ptrNewName, shortName, ETrue);
+GenerateShortNameL(aNewName_DosEntryPos.Cluster(), ptrNewName, shortName, ETrue);
-		    	}
+}
 newDosEntry.SetName(shortName);
-	}
+}
 else
-	{//-- just use 'aNewName' as DOS name.
+{//-- just use 'aNewName' as DOS name.
 TBuf8<KFatDirNameSize+1> tmp; //-- the name may be "XXXXXXXX.YYY"
 tmp.Copy(ptrNewName);
 newDosEntry.SetName(DosNameToStdFormat(tmp));
-	}
+}
 if(IsRuggedFSys())
-	{//-- the the note(1) above
+{//-- the the note(1) above
 newDosEntry.SetRuggedFatEntryId(KReservedIdNewEntry);
 oldName_DosEntry.SetRuggedFatEntryId(KReservedIdOldEntry);
 WriteDirEntryL(oldName_DosEntryPos, oldName_DosEntry);
-	}
+}
 //-- add new entryset to the directory
 aNewName_DosEntryPos.iPos = 0;
 aNewName_DosEntryPos.iCluster = aNewName_ParentDirPos.Cluster();
-	    if (iFileCreationHelper.IsNewEntryPosFound())
+if (iFileCreationHelper.IsNewEntryPosFound())
-	    	{
+{
-	    	aNewName_DosEntryPos = iFileCreationHelper.EntryAddingPos();
+aNewName_DosEntryPos = iFileCreationHelper.EntryAddingPos();
-	    	}
+}
 if(bNewNameIsVFAT)
-	{
+{
 const TInt numEntries = NumberOfVFatEntries(ptrNewName.Length());
 AddDirEntryL(aNewName_DosEntryPos, numEntries);
 WriteDirEntryL(aNewName_DosEntryPos, newDosEntry, ptrNewName);
 }
 else
 //-- erase old entryset.
 EraseDirEntryL(oldName_FirstEntryPos, oldName_FirstEntry);
 //-- if we have renamed (moved) a directory, need to update its pointer to parent directory ('..' entry)
 if((newDosEntry.Attributes() & KEntryAttDir))
-	{
+{
 TEntryPos parentPtrEntPos(StartCluster(newDosEntry), 1*KSizeOfFatDirEntry);
 TFatDirEntry chFatEnt;
 ReadDirEntryL(parentPtrEntPos, chFatEnt);
 const TUint parentDirStartCluster_Old = StartCluster(chFatEnt);
 TUint parentDirStartCluster_New = aNewName_ParentDirPos.Cluster();
 if(parentDirStartCluster_New == RootClusterNum() && parentDirStartCluster_New != 0)
-	{//-- we are in the root directory. for some reason, '..' entries of the directories in the root dir.
+{//-- we are in the root directory. for some reason, '..' entries of the directories in the root dir.
-	//-- must have starting cluster 0
+//-- must have starting cluster 0
 parentDirStartCluster_New = 0;
-	}
+}
 if(parentDirStartCluster_Old != parentDirStartCluster_New)
-	{
+{
 chFatEnt.SetStartCluster(parentDirStartCluster_New);
 WriteDirEntryL(parentPtrEntPos, chFatEnt);
-	}
+}
 // Invalidate leaf dir cache as it is hard to track the dir structure changes now
 if (iLeafDirCache)
-	{
+{
 iLeafDirCache->Reset();
-	}
+}
-	}
+}
-	}//else if(replaceMode && newFileExists)
+}//else if(replaceMode && newFileExists)
 iFileCreationHelper.Close();
-	}
+}
 //-----------------------------------------------------------------------------------------
 /**
 Rename 'aOldName' file/directory to 'aNewName'
 entryPos.iPos=0;
 TEntryPos startPos;
 TFatDirEntry startEntry;
 DoFindL(fullName.Mid(namePos),KEntryAttMaskSupported,
-		startPos,startEntry,entryPos,entry,
+startPos,startEntry,entryPos,entry,
-		fileName,KErrNotFound,
+fileName,KErrNotFound,
-		NULL,
+NULL,
-		leafDir);
+leafDir);
 anEntry.iAtt=entry.Attributes();
 anEntry.iSize=entry.Size();
 anEntry.iModified=entry.Time(TimeOffset());
-	if (fileName.Length()==0)
+if (fileName.Length()==0)
 {
 TBuf8<0x20> dosName(DosNameFromStdFormat(entry.Name()));
 LocaleUtils::ConvertToUnicodeL(fileName,dosName);
 }
 if ((TUint)anEntry.iSize>=sizeof(TCheckedUid))
 att|=setAttMask;
 att&=(~aClearAttMask);
 firstEntry.SetAttributes(att);
 }
 if (aSetAttMask&KEntryAttModified)
-		{
+{
-		firstEntry.SetTime(aTime,TimeOffset());
+firstEntry.SetTime(aTime,TimeOffset());
-		}
+}
 WriteDirEntryL(firstEntryPos,firstEntry);
 }
 //-----------------------------------------------------------------------------------------
 TPtrC name(fullName.Mid(nPos));
 TInt ret = KErrNone;
 iFileCreationHelper.Close();
 if (anOpen == EFileCreate || anOpen == EFileReplace)
-	{
+{
-	iFileCreationHelper.InitialiseL(name);
+iFileCreationHelper.InitialiseL(name);
 TRAP(ret,FindEntryStartL(fullName,KEntryAttMaskSupported,firstEntry,firstEntryPos,&iFileCreationHelper));
-	}
+}
 else
 {
 TRAP(ret,FindEntryStartL(fullName,KEntryAttMaskSupported,firstEntry,firstEntryPos));
 }
 User::Leave(KErrNotFound);
 //-- here we try to either create or replace file
 CheckWritableL();
-	TLeafDirData leafDir;
+TLeafDirData leafDir;
 TInt numEntries = iFileCreationHelper.NumOfAddingEntries();
 TShortName shortName;
 if (iFileCreationHelper.GetValidatedShortName(shortName) == KErrNotFound)
-	{
+{
 firstEntryPos.iCluster=FindLeafDirL(fullName.Left(nPos), leafDir);
 GenerateShortNameL(firstEntryPos.iCluster,name,shortName,ETrue);
-	}
+}
 if (iFileCreationHelper.IsNewEntryPosFound())
-	    	{
+{
-	    	firstEntryPos = iFileCreationHelper.EntryAddingPos();
+firstEntryPos = iFileCreationHelper.EntryAddingPos();
-	    	}
+}
 else
-	{
+{
-	firstEntryPos.iCluster=FindLeafDirL(fullName.Left(nPos), leafDir);
+firstEntryPos.iCluster=FindLeafDirL(fullName.Left(nPos), leafDir);
-	firstEntryPos.iPos=0;
+firstEntryPos.iPos=0;
-	}
+}
 AddDirEntryL(firstEntryPos,numEntries);
 firstEntry.InitZ();
 firstEntry.SetName(shortName);
 firstEntry.SetStartCluster(0);
 TTime now;
-		now.UniversalTime();
+now.UniversalTime();
 firstEntry.SetCreateTime(now, TimeOffset() );
 if (iFileCreationHelper.IsTrgNameLegalDosName())
 WriteDirEntryL(firstEntryPos,firstEntry);
 else
 TFileName fileName;
 TEntryPos startPos;
 TFatDirEntry startEntry;
 DoFindL(dirPath.Mid(dirPos),
-		KEntryAttMatchMask|KEntryAttMatchExclusive,
+KEntryAttMatchMask|KEntryAttMatchExclusive,
-		startPos, startEntry, dosEntryPos, dosEntry,
+startPos, startEntry, dosEntryPos, dosEntry,
-		fileName, KErrPathNotFound,
+fileName, KErrPathNotFound,
-		NULL,
+NULL,
-		leafDir);
+leafDir);
 }
 TPtrC matchName(dirName.Mid(namePos+1));
 TLex lex(aName);
 TInt r;
 TEntryPos entryPos(RootIndicator(),0);
 if (iLeafDirCache == NULL)
-	{
+{
 TInt leaflen=(iLastLeafDir) ? iLastLeafDir->Length() : 0;
 TInt namelen=aName.Length();
 if (leaflen>1 && namelen>=leaflen && *iLastLeafDir==aName.Left(leaflen))
 {
 if (leaflen==namelen)
 return(iLastLeafDirCluster);
 lex.Inc(leaflen-1);
 entryPos.iCluster=iLastLeafDirCluster;
 }
-	}
+}
 else
-	{
+{
 // Skip root directory
 if (iLeafDirCache->CacheCount() > 0 && aName.Length() > 1)
-	{
+{
-	TInt err = iLeafDirCache->FindInCache(aName, aLeafDir);
+TInt err = iLeafDirCache->FindInCache(aName, aLeafDir);
-	if (err == KErrNone)
+if (err == KErrNone)
-		{
+{
-		ASSERT(aLeafDir.iClusterNum > 0);
+ASSERT(aLeafDir.iClusterNum > 0);
-		return aLeafDir.iClusterNum;
+return aLeafDir.iClusterNum;
-		}
+}
-	else if (err != KErrNotFound)
+else if (err != KErrNotFound)
-		{
+{
-		User::LeaveIfError(err);
+User::LeaveIfError(err);
-		}
+}
-	}
+}
-	}
+}
 FOREVER
 {
 lex.Inc(); // Skip path delimiter
 lex.Mark();
 TFileName fileName;
 TEntryPos startPos;
 TFatDirEntry startEntry;
 DoFindL(lex.MarkedToken(),
-		KEntryAttMatchMask|KEntryAttMatchExclusive,
+KEntryAttMatchMask|KEntryAttMatchExclusive,
-		startPos, startEntry, entryPos, entry,
+startPos, startEntry, entryPos, entry,
-		fileName, KErrPathNotFound,
+fileName, KErrPathNotFound,
-		NULL,
+NULL,
-		aLeafDir);
+aLeafDir);
 entryPos.iCluster=StartCluster(entry);
 entryPos.iPos=0;
 }
 if (iLeafDirCache == NULL)
-	{
+{
 AllocBufferL(((CFatMountCB*)this)->iLastLeafDir,aName);
 ((CFatMountCB*)this)->iLastLeafDirCluster=entryPos.iCluster;
-	}
+}
 else
-	{
+{
 if (aName.Length() > 1)
-	{
+{
-	aLeafDir = TLeafDirData(entryPos.iCluster);
+aLeafDir = TLeafDirData(entryPos.iCluster);
 iLeafDirCache->AddToCacheL(aName, aLeafDir);
-	}
+}
-	}
+}
 return entryPos.iCluster;
 }
 //-----------------------------------------------------------------------------------------
 @param  aFileCreationHelper       a helper package for file creations
 @return ETrue if the specified name is found in the cache. In this case aStartEntryPos, aStartEntry, aDosEntryPos, aDosEntry, aFileName will contain valid values
 */
 TBool CFatMountCB::DoRummageDirCacheL(const TUint anAtt, TEntryPos& aStartEntryPos,
-										TFatDirEntry& aStartEntry,	TEntryPos& aDosEntryPos,
+TFatDirEntry& aStartEntry,  TEntryPos& aDosEntryPos,
-										TFatDirEntry& aDosEntry,	TDes& aFileName,
+TFatDirEntry& aDosEntry,    TDes& aFileName,
-										const TFindHelper& aAuxParam,
+const TFindHelper& aAuxParam,
-										XFileCreationHelper* aFileCreationHelper,
+XFileCreationHelper* aFileCreationHelper,
-										const TLeafDirData& aLeafDir) const
+const TLeafDirData& aLeafDir) const
-	{
+{
 TBool bCacheMatchFound = EFalse;
 //-- get an interface to the Dir. cache
 MWTCacheInterface* pDirCache = iRawDisk->DirCacheInterface();
 ASSERT(pDirCache);
 const TUint32 clSize = 1 << ClusterSizeLog2(); //-- media cluster size
 const TUint32 cacheSz = pDirCache->CacheSizeInBytes(); //-- cache size in bytes
 const TUint32 maxDirEntries = cacheSz >> KSizeOfFatDirEntryLog2;  //-- maximal number of dir entries that can be in the cache
-const TUint	  pageSzLog2 = pDirCache->PageSizeInBytesLog2();
+const TUint   pageSzLog2 = pDirCache->PageSizeInBytesLog2();
-TBool ScanMRUPageFirst 	= EFalse;
+TBool ScanMRUPageFirst  = EFalse;
-	TBool MRUPageScanned 	= EFalse;
+TBool MRUPageScanned    = EFalse;
-	// if MRU pos is availale, start with MRU page
+// if MRU pos is availale, start with MRU page
-	if (aLeafDir.iMRUPos.Cluster())
+if (aLeafDir.iMRUPos.Cluster())
-	{
+{
-	ScanMRUPageFirst = ETrue;
+ScanMRUPageFirst = ETrue;
-	DosEntryPos1 = aLeafDir.iMRUPos;
+DosEntryPos1 = aLeafDir.iMRUPos;
-	}
+}
-	TInt numFound = 0;
+TInt numFound = 0;
-	TEntryPos startPos = DosEntryPos1;
+TEntryPos startPos = DosEntryPos1;
-	TInt clusterNum = DosEntryPos1.iCluster;
+TInt clusterNum = DosEntryPos1.iCluster;
 for(TUint32 entryCnt=0; entryCnt < maxDirEntries; ++entryCnt)
 {//-- walk through directory cluster list. The loop is limited by maximal number of dir entries
 //-- that can be cached. Helps to avoid problems with infinite (looped) directories
 if (IsEndOfClusterCh(DosEntryPos1.iCluster))
-	{
+{
-	// refer back to the last stored cluster position
+// refer back to the last stored cluster position
-	//  note aFileCreationHelper may not be initialised for file opening operations
+//  note aFileCreationHelper may not be initialised for file opening operations
-	if (aFileCreationHelper && aFileCreationHelper->IsInitialised() && clusterNum != DosEntryPos1.iCluster)
+if (aFileCreationHelper && aFileCreationHelper->IsInitialised() && clusterNum != DosEntryPos1.iCluster)
-		{
+{
-	    TEntryPos dummyPos(clusterNum, clSize - KSizeOfFatDirEntry);
+TEntryPos dummyPos(clusterNum, clSize - KSizeOfFatDirEntry);
-	    aFileCreationHelper->SetEntryAddingPos(dummyPos);
+aFileCreationHelper->SetEntryAddingPos(dummyPos);
-		aFileCreationHelper->SetIsNewEntryPosFound(ETrue);
+aFileCreationHelper->SetIsNewEntryPosFound(ETrue);
-		}
+}
-	if (ScanMRUPageFirst && !MRUPageScanned)
+if (ScanMRUPageFirst && !MRUPageScanned)
-		{
+{
-	DosEntryPos1 = aDosEntryPos;
+DosEntryPos1 = aDosEntryPos;
-	MRUPageScanned = ETrue;
+MRUPageScanned = ETrue;
-	continue;
+continue;
-		}
+}
 break; //-- this was the last cluster in this directory
-	}
+}
 const TUint32 pageStartPos = CalculatePageOffsetInCluster(DosEntryPos1.iPos, pageSzLog2);
-	DosEntryPos1.iPos = pageStartPos;
+DosEntryPos1.iPos = pageStartPos;
-TBool	PassedPageBoundary = EFalse;
+TBool   PassedPageBoundary = EFalse;
 const TInt64  entryLinPos = MakeLinAddrL(DosEntryPos1); //-- linear media position of the cluster for this directory
 const TUint32 cachePageSz = pDirCache->PosCached(entryLinPos, nCachedLinPos); //-- indicates if entryLinPos is cached
 if(cachePageSz)
 {//-- current page is in the directory cache
 nErr = GetDirEntry(DosEntryPos1, DosEntry1, StartEntry1, aFileName);
 if(nErr != KErrNone)
 break;
 if(DosEntry1.IsEndOfDirectory())
-	{
+{
-	if (aFileCreationHelper && aFileCreationHelper->IsInitialised() && !aFileCreationHelper->IsNewEntryPosFound())
+if (aFileCreationHelper && aFileCreationHelper->IsInitialised() && !aFileCreationHelper->IsNewEntryPosFound())
-		            	{
+{
-		            	// note it is impossible to be at the end of the cluster chain here.
+// note it is impossible to be at the end of the cluster chain here.
-	            		aFileCreationHelper->SetEntryAddingPos(DosEntryPos1);
+aFileCreationHelper->SetEntryAddingPos(DosEntryPos1);
-	            		aFileCreationHelper->SetIsNewEntryPosFound(ETrue);
+aFileCreationHelper->SetIsNewEntryPosFound(ETrue);
-		            	}
+}
-	if (ScanMRUPageFirst && !MRUPageScanned)
+if (ScanMRUPageFirst && !MRUPageScanned)
-		{
+{
-	break;
+break;
-		}
+}
-	// if (!ScanMRUPageFirst || ScanMRUPageFirst && MRUPageScanned)
+// if (!ScanMRUPageFirst || ScanMRUPageFirst && MRUPageScanned)
 goto Exit; //-- this was the last entry in this directory, no reason to look further
-	}
+}
 if (aFileCreationHelper && aFileCreationHelper->IsInitialised() && !aFileCreationHelper->IsNewEntryPosFound())
-		        	{
+{
-		            if (!DosEntry1.IsErased() && !DosEntry1.IsGarbage())
+if (!DosEntry1.IsErased() && !DosEntry1.IsGarbage())
-		            	{
+{
-		            	numFound = 0;
+numFound = 0;
-		            	}
+}
-		            else
+else
-		            	{
+{
-		            	if (numFound == 0)
+if (numFound == 0)
-		            		{
+{
-		            		startPos = DosEntryPos1;
+startPos = DosEntryPos1;
-		            		}
+}
-		            	numFound++;
+numFound++;
-		            	if (numFound == aFileCreationHelper->NumOfAddingEntries())
+if (numFound == aFileCreationHelper->NumOfAddingEntries())
-		            		{
+{
-		            		aFileCreationHelper->SetEntryAddingPos(startPos);
+aFileCreationHelper->SetEntryAddingPos(startPos);
-		            		aFileCreationHelper->SetIsNewEntryPosFound(ETrue);
+aFileCreationHelper->SetIsNewEntryPosFound(ETrue);
-		            		}
+}
-		            	}
+}
-		        	}
+}
 if(MatchEntryAtt(DosEntry1.Attributes(),anAtt))
 {//-- FAT or VFAT dir entry is extracted and attributes match. Compare names then.
 if(StartEntry1.IsVFatEntry())
 {//-- extracted entry is VFAT one, name can be in UNICODE
 // we only check short name candidates for long file names with VFAT entries,
 //  if it is a valid dos name, it will be checked by default
 // note here target name is always fully specified
 if (aFileCreationHelper && aFileCreationHelper->IsInitialised())
-	{
+{
-	aFileCreationHelper->CheckShortNameCandidates(DosEntry1.Name().Ptr());
+aFileCreationHelper->CheckShortNameCandidates(DosEntry1.Name().Ptr());
-	}
+}
 TPtrC ptrAssembledName = RemoveTrailingDots(aFileName);
 if(ptrAssembledName.MatchF(aAuxParam.iTargetName) != KErrNotFound)
 {//-- found match in cache
 // if we are still in the same cluster, check the page boundary by
 /// exam how many entries we have scanned within the cluster
 const TUint entriesLooked =  ((DosEntryPos1.iPos + KSizeOfFatDirEntry)- pageStartPos) >> KSizeOfFatDirEntryLog2;
 if(entriesLooked > nEntries)
-	{
+{
-	PassedPageBoundary = ETrue;
+PassedPageBoundary = ETrue;
 break;
-	}
+}
 // move to next entry before scanning next file
 TRAP(nErr,MoveToNextEntryL(DosEntryPos1));
 if(nErr != KErrNone)
 DosEntryPos1.iCluster = clSave;
 break;
 }
 if (entriesLooked + 1 > nEntries)
-	{
+{
-	PassedPageBoundary = ETrue;
+PassedPageBoundary = ETrue;
 break;
-	}
+}
 } //for(;;)
 } //if(iRawDisk->PosCached(...))
 // if MRU page is not cached or
 // we scan MRU page first and it is not scanned yet, then this must be the MRU page,
 //  we now start to scan from the beginning
 if (ScanMRUPageFirst && !MRUPageScanned)
-	{
+{
-	MRUPageScanned = ETrue;
+MRUPageScanned = ETrue;
-	DosEntryPos1 = aDosEntryPos;
+DosEntryPos1 = aDosEntryPos;
-	DosEntryPos1.iPos = 0;
+DosEntryPos1.iPos = 0;
-	continue;
+continue;
-	}
+}
 // if we just finished scanning a page and still in the same cluster, then we crossed page
-// 	boundary, continue with next page.
+//  boundary, continue with next page.
 // note: although we are in the 'next page' already, this page might not be cached, so we need to
 //  check it via pDirCache->PosCached(entryLinPos, nCachedLinPos) and scan it properly.
 if (PassedPageBoundary)
-	{
+{
-	DosEntryPos1.iPos = CalculatePageOffsetInCluster(DosEntryPos1.iPos, pageSzLog2);
+DosEntryPos1.iPos = CalculatePageOffsetInCluster(DosEntryPos1.iPos, pageSzLog2);
-	PassedPageBoundary = EFalse;
+PassedPageBoundary = EFalse;
-	continue;
+continue;
-	}
+}
 //-- try to move to the next cluster of the directory file
 if(DosEntryPos1.Cluster() < KFatFirstSearchCluster)  //-- small trick to get rid of TRAPping GetNextClusterL()
 break;
 const TInt64  mruPos = MakeLinAddrL(aDosEntryPos);
 pDirCache->MakePageMRU(mruPos);
-	// only update the leaf dir cache when the original cache index is provided
+// only update the leaf dir cache when the original cache index is provided
-	if (aLeafDir.iClusterNum)
+if (aLeafDir.iClusterNum)
-		{
+{
 iLeafDirCache->UpdateMRUPos(TLeafDirData(aLeafDir.iClusterNum, aStartEntryPos));
-		}
+}
 }
 return bCacheMatchFound;
 }
 //-----------------------------------------------------------------------------------------
 const TInt KShortNameCandidatesNum = 4;
 /**
 Constructor of XFileCreationHelper class
 */
 CFatMountCB::XFileCreationHelper::XFileCreationHelper()
-	{
+{
 isInitialised = EFalse;
-	}
+}
 /**
 Destructor of XFileCreationHelper class
 */
 CFatMountCB::XFileCreationHelper::~XFileCreationHelper()
-	{
+{
-	Close();
+Close();
-	}
+}
 /**
 Initialises a TFileCreationHelper object, generate a short name candidate pool.
-@param	aTargetName	Target file name for the potential new file.
+@param  aTargetName Target file name for the potential new file.
-@post	TFileCreationHelper is fully initialised.
+@post   TFileCreationHelper is fully initialised.
 */
 void CFatMountCB::XFileCreationHelper::InitialiseL(const TDesC& aTargetName)
-	{
+{
 // close before use, to avoid memory leak
-	Close();
+Close();
 iTargetName.Set(aTargetName);
-	// generates short name candidate(s)
+// generates short name candidate(s)
 TInt count = 1;
 while (count <= KShortNameCandidatesNum)
-		{
+{
-		TShortName shortNameCandidate = DoGenerateShortNameL(aTargetName, count, ETrue);
+TShortName shortNameCandidate = DoGenerateShortNameL(aTargetName, count, ETrue);
-		TInt err = iShortNameCandidates.Append(shortNameCandidate);
+TInt err = iShortNameCandidates.Append(shortNameCandidate);
-		User::LeaveIfError(err);
+User::LeaveIfError(err);
-		if (count == -1)	// No tilde and number is needed
+if (count == -1)    // No tilde and number is needed
-			{
+{
-			break;
+break;
-			}
+}
-		else
+else
-			count++;
+count++;
-		}
+}
 // calculate number of new entries needed
 iNumOfAddingEntries = 1;
 isTrgNameLegalDosName = IsLegalDosName(aTargetName, EFalse, EFalse, EFalse, EFalse, ETrue);
 if (!isTrgNameLegalDosName)
-	iNumOfAddingEntries = (TUint16) NumberOfVFatEntries(iTargetName.Length());
+iNumOfAddingEntries = (TUint16) NumberOfVFatEntries(iTargetName.Length());
 isNewEntryPosFound = EFalse;
 isInitialised = ETrue;
 }
 /**
 Close function of XFileCreationHelper class
 */
 void CFatMountCB::XFileCreationHelper::Close()
-	{
+{
-	iShortNameCandidates.Close();
+iShortNameCandidates.Close();
-	isInitialised = EFalse;
+isInitialised = EFalse;
-	}
+}
 /**
 Validates short name candidates. If the input dos entry name is found in the short name
 candidate pool, the corresponding short name candidate will be removed from the pool.
-@param	apDosEntryName	An existing short name, to compare with the candidates.
+@param  apDosEntryName  An existing short name, to compare with the candidates.
-@pre 	Object should be initialised
+@pre    Object should be initialised
 */
 void CFatMountCB::XFileCreationHelper::CheckShortNameCandidates(const TUint8* apDosEntryName)
 {
 ASSERT(isInitialised);
 if (!isInitialised)
-	return;
+return;
 if (iShortNameCandidates.Count() > 0)
-	{
+{
-	for (TInt i = 0; i < iShortNameCandidates.Count(); i++)
+for (TInt i = 0; i < iShortNameCandidates.Count(); i++)
-		{
+{
-		if (Mem::Compare(iShortNameCandidates[i].Ptr(), KFatDirNameSize, apDosEntryName, KFatDirNameSize) == 0)
+if (Mem::Compare(iShortNameCandidates[i].Ptr(), KFatDirNameSize, apDosEntryName, KFatDirNameSize) == 0)
-			{
+{
-			iShortNameCandidates.Remove(i);
+iShortNameCandidates.Remove(i);
-			break;
+break;
-			}
+}
-		}
+}
-	}
+}
 }
 /**
 Gets a validated short name from the short name candidate pool.
-@param	aShortName	On return, contains a validated short name if found, otherwise zeroed.
+@param  aShortName  On return, contains a validated short name if found, otherwise zeroed.
-@return	TInt		Returns KErrNone if a validated short name found successfully,
+@return TInt        Returns KErrNone if a validated short name found successfully,
-					 else KErrNotFound is returned.
+else KErrNotFound is returned.
-					Returns KErrNotReady if object is not initialised.
+Returns KErrNotReady if object is not initialised.
-@pre 	Object should be initialised
+@pre    Object should be initialised
 */
 TInt CFatMountCB::XFileCreationHelper::GetValidatedShortName(TShortName& aShortName) const
-	{
+{
-	aShortName.Zero();
+aShortName.Zero();
-	ASSERT(isInitialised);
+ASSERT(isInitialised);
-	if (!isInitialised)
+if (!isInitialised)
-		return KErrNotReady;
+return KErrNotReady;
-	if (iShortNameCandidates.Count() > 0)
+if (iShortNameCandidates.Count() > 0)
-		{
+{
-		aShortName.Copy(iShortNameCandidates[0]);
+aShortName.Copy(iShortNameCandidates[0]);
-		return KErrNone;
+return KErrNone;
-		}
+}
-	return KErrNotFound;
+return KErrNotFound;
-	}
+}
 //-----------------------------------------------------------------------------------------
 /**
 @param  aStartEntry     on return will contain first VFAT dir entry
 @param  aDosEntryPos    the search will start from this position of dir entry, on return it will contain result DOS entry position, last one for VFAT case
 @param  aDosEntry       on return will contain DOS dir entry (the last one for VFAT case)
 @param  aFileName       in the case of VFAT entry and on success here will be returned a long filename
 @param  anError         This function might leave with this given error code
-	@param  aFileCreationHelper       a helper package for file creations
+@param  aFileCreationHelper       a helper package for file creations
 @return ETrue if extracted entry is VFAT one, EFalse, if it's old DOS-style one
 @leave  can leave with anError code on error or if the search has reached the end of directory (!)
 */
 TBool CFatMountCB::DoFindL(const TDesC& aTrgtName,TUint anAtt,
-						TEntryPos& aStartEntryPos,TFatDirEntry& aStartEntry,
+TEntryPos& aStartEntryPos,TFatDirEntry& aStartEntry,
-						TEntryPos& aDosEntryPos,TFatDirEntry& aDosEntry,
+TEntryPos& aDosEntryPos,TFatDirEntry& aDosEntry,
-						TDes& aFileName,TInt anError,
+TDes& aFileName,TInt anError,
-						XFileCreationHelper* aFileCreationHelper,
+XFileCreationHelper* aFileCreationHelper,
-						const TLeafDirData& aLeafDirData) const
+const TLeafDirData& aLeafDirData) const
-	{
+{
 // check that the entry position to be read next is not past the end of the
 // root directory. If this is the case then when GetDirEntryL(..) is called
 // this will lead to MakeLinAddr(..) leaving with KErrDirFull.
 if (IsRootDir(aDosEntryPos)&&(aDosEntryPos.iPos+StartOfRootDirInBytes()>=RootDirEnd()))
 // we need to scan ahead from the mru pos then come back to beginning, if startcluster is provided
 TBool scanAhead = EFalse;
 // if we have a starting cluster number (and it's not root directory in FAT16/12 case)&&
 //  we found a lastScanned entry's cluster (and it's not root directory in FAT16/12 case)&&
 // if we don't have a starting cluster number, we draw back to original scanning algorithm
-if (!IsRootDir(aDosEntryPos) 			// we don't do forward scanning for root dir &
+if (!IsRootDir(aDosEntryPos)            // we don't do forward scanning for root dir &
-		&& aLeafDirData.iClusterNum != 0 	// if we have a starting cluster number &
+&& aLeafDirData.iClusterNum != 0    // if we have a starting cluster number &
-		&& aLeafDirData.iMRUPos.Cluster() != 0) 	// if we have a starting cluster number &
+&& aLeafDirData.iMRUPos.Cluster() != 0)     // if we have a starting cluster number &
-	{
+{
-	scanAhead = ETrue;
+scanAhead = ETrue;
-	aDosEntryPos = aLeafDirData.iMRUPos;
+aDosEntryPos = aLeafDirData.iMRUPos;
-	}
+}
 TInt numFound = 0;
 TEntryPos startPos = aDosEntryPos;
 TInt clustNum = aDosEntryPos.Cluster();
 for (TInt scanCnt = 1; scanCnt <= 2; ++scanCnt)
-	{
+{
-	// if we are not scanning ahead, we don't need this outer for loop
+// if we are not scanning ahead, we don't need this outer for loop
-	if (!scanAhead)
+if (!scanAhead)
-		scanCnt++;
+scanCnt++;
-	TBool found = EFalse;
+TBool found = EFalse;
 FOREVER //FOREVER2 -- walk through all directory entries in the current directory until find a match or directory end
 {
-	        //-- read full directory entry starting from aDosEntryPos. On return aFileName may contain assembled long filename (if the entry is VFAT)
+//-- read full directory entry starting from aDosEntryPos. On return aFileName may contain assembled long filename (if the entry is VFAT)
-	        //-- aDosEntry will contain a DOS entry of the directory entry we have read.
+//-- aDosEntry will contain a DOS entry of the directory entry we have read.
-	        aStartEntryPos=aDosEntryPos;
+aStartEntryPos=aDosEntryPos;
-	        User::LeaveIfError(GetDirEntry(aDosEntryPos, aDosEntry, aStartEntry, aFileName));
+User::LeaveIfError(GetDirEntry(aDosEntryPos, aDosEntry, aStartEntry, aFileName));
-	        if (aDosEntry.IsEndOfDirectory())
+if (aDosEntry.IsEndOfDirectory())
-	            {//-- the end of directory reached.
+{//-- the end of directory reached.
-	            // if new entry position for adding has not been found yet.
+// if new entry position for adding has not been found yet.
-	            // note aFileCreationHelper may not be initialised for pure file opening operations
+// note aFileCreationHelper may not be initialised for pure file opening operations
-	            if (aFileCreationHelper && aFileCreationHelper->IsInitialised() && !aFileCreationHelper->IsNewEntryPosFound())
+if (aFileCreationHelper && aFileCreationHelper->IsInitialised() && !aFileCreationHelper->IsNewEntryPosFound())
-	            	{
+{
-	            	// if MoveToNextEntryL have gone to the next cluster which is the end of cluster chain,
+// if MoveToNextEntryL have gone to the next cluster which is the end of cluster chain,
-	            	//  we pass the last scanned entry position to AddDirEntryL
+//  we pass the last scanned entry position to AddDirEntryL
-	            	if (IsEndOfClusterCh(aDosEntryPos.iCluster))
+if (IsEndOfClusterCh(aDosEntryPos.iCluster))
-	            		{
+{
-	            	    TInt clusterSize=1<<ClusterSizeLog2();
+TInt clusterSize=1<<ClusterSizeLog2();
-	            	    TEntryPos dummyPos(clustNum, clusterSize - KSizeOfFatDirEntry);
+TEntryPos dummyPos(clustNum, clusterSize - KSizeOfFatDirEntry);
-	            	    aFileCreationHelper->SetEntryAddingPos(dummyPos);
+aFileCreationHelper->SetEntryAddingPos(dummyPos);
-	            		aFileCreationHelper->SetIsNewEntryPosFound(ETrue);
+aFileCreationHelper->SetIsNewEntryPosFound(ETrue);
-	            		}
+}
-	            	// or we reached the end of the directory.
+// or we reached the end of the directory.
-	            	else
+else
-	            		{
+{
-	            		aFileCreationHelper->SetEntryAddingPos(aDosEntryPos);
+aFileCreationHelper->SetEntryAddingPos(aDosEntryPos);
-	            		aFileCreationHelper->SetIsNewEntryPosFound(ETrue);
+aFileCreationHelper->SetIsNewEntryPosFound(ETrue);
-	            		}
+}
-	            	}
+}
-	            // if we are scanning ahead and this is the first scanning, we break out to restart scanning
+// if we are scanning ahead and this is the first scanning, we break out to restart scanning
-	            if (scanAhead && scanCnt == 1)
+if (scanAhead && scanCnt == 1)
-	            	{
+{
-	            	break; // from FOREVER, restart scanning
+break; // from FOREVER, restart scanning
-	            	}
+}
-	            // if (!scanAhead || scanAhead && scanCnt == 2)
+// if (!scanAhead || scanAhead && scanCnt == 2)
-	            User::Leave(anError);
+User::Leave(anError);
-	            }
+}
-	        // entry space searching for potential new file/directory creation
+// entry space searching for potential new file/directory creation
-	        if (aFileCreationHelper && aFileCreationHelper->IsInitialised() && !aFileCreationHelper->IsNewEntryPosFound())
+if (aFileCreationHelper && aFileCreationHelper->IsInitialised() && !aFileCreationHelper->IsNewEntryPosFound())
-	        	{
+{
-	            if (!aDosEntry.IsErased() && !aDosEntry.IsGarbage())
+if (!aDosEntry.IsErased() && !aDosEntry.IsGarbage())
-	            	{
+{
-	            	numFound = 0;
+numFound = 0;
-	            	}
+}
-	            else
+else
-	            	{
+{
-	            	if (numFound == 0)
+if (numFound == 0)
-	            		{
+{
-	            		startPos = aDosEntryPos;
+startPos = aDosEntryPos;
-	            		}
+}
-	            	numFound++;
+numFound++;
-	            	if (numFound == aFileCreationHelper->NumOfAddingEntries())
+if (numFound == aFileCreationHelper->NumOfAddingEntries())
-	            		{
+{
-	            		aFileCreationHelper->SetEntryAddingPos(startPos);
+aFileCreationHelper->SetEntryAddingPos(startPos);
-	            		aFileCreationHelper->SetIsNewEntryPosFound(ETrue);
+aFileCreationHelper->SetIsNewEntryPosFound(ETrue);
-	            		}
+}
-	            	}
+}
-	        	}
+}
-	        if (IsRootDir(aDosEntryPos)&&(aDosEntryPos.iPos+StartOfRootDirInBytes()==(RootDirEnd()-KSizeOfFatDirEntry)))
+if (IsRootDir(aDosEntryPos)&&(aDosEntryPos.iPos+StartOfRootDirInBytes()==(RootDirEnd()-KSizeOfFatDirEntry)))
-	            if (aDosEntry.IsErased())
+if (aDosEntry.IsErased())
-	                {
+{
-	                User::Leave(anError);//Allows maximum number of entries in root directory
+User::Leave(anError);//Allows maximum number of entries in root directory
-	                }
+}
-	        const TBool bFileNameEntry = !aDosEntry.IsCurrentDirectory() && !aDosEntry.IsParentDirectory() && !aDosEntry.IsErased() && !aDosEntry.IsGarbage();
+const TBool bFileNameEntry = !aDosEntry.IsCurrentDirectory() && !aDosEntry.IsParentDirectory() && !aDosEntry.IsErased() && !aDosEntry.IsGarbage();
-	        if (bFileNameEntry && MatchEntryAtt(aDosEntry.Attributes(), anAtt))
+if (bFileNameEntry && MatchEntryAtt(aDosEntry.Attributes(), anAtt))
-	            {//-- we have read a filename entry and entry's attributes match required; compare names then.
+{//-- we have read a filename entry and entry's attributes match required; compare names then.
-	            if (trgNameIsWildCard)
+if (trgNameIsWildCard)
-	            	{
+{
-	            	found = ETrue;
+found = ETrue;
-	            	break; //-- we were looking for '*' or '*.*', so will be satisfied with any current file name.
+break; //-- we were looking for '*' or '*.*', so will be satisfied with any current file name.
-	            	}
+}
-	            if (aStartEntry.IsVFatEntry())
+if (aStartEntry.IsVFatEntry())
-	                {//-- we've read a VFAT entry, aFileName is supposed to contain long filename, aDosEntry - DOS entry for this name.
+{//-- we've read a VFAT entry, aFileName is supposed to contain long filename, aDosEntry - DOS entry for this name.
-	                 //-- note: aFileName.Length() may be 0, while DOS entry (short name is OK) in the case of orphaned VFAT entries
+//-- note: aFileName.Length() may be 0, while DOS entry (short name is OK) in the case of orphaned VFAT entries
-	                // we only check short name candidates for long file names with VFAT entries,
+// we only check short name candidates for long file names with VFAT entries,
-	                //  if it is a valid dos name, it will be checked by default
+//  if it is a valid dos name, it will be checked by default
-	                // note, for file creation cases, target name will be always fully specified
+// note, for file creation cases, target name will be always fully specified
-	                if (aFileCreationHelper && aFileCreationHelper->IsInitialised() && trgNameFullySpecified)
+if (aFileCreationHelper && aFileCreationHelper->IsInitialised() && trgNameFullySpecified)
-		            	 {
+{
-		            	 aFileCreationHelper->CheckShortNameCandidates(aDosEntry.Name().Ptr());
+aFileCreationHelper->CheckShortNameCandidates(aDosEntry.Name().Ptr());
-		            	 }
+}
-	                //-- discard trailing dots from aFileName if present
+//-- discard trailing dots from aFileName if present
-	                 TPtrC ptrAssembledName = RemoveTrailingDots(aFileName);
+TPtrC ptrAssembledName = RemoveTrailingDots(aFileName);
-	                 if(ptrAssembledName.MatchF(trgtNameNoDot) != KErrNotFound)
+if(ptrAssembledName.MatchF(trgtNameNoDot) != KErrNotFound)
-	                	 {
+{
-						 found = ETrue;
+found = ETrue;
-	                	 break; //-- OK, found a match.
+break; //-- OK, found a match.
-	                	 }
+}
-	                 else if (trgNameFullySpecified)
+else if (trgNameFullySpecified)
-	                	 {
+{
-	                	 //-- long name assembled by GetDirEntry() doesn't match the target. But if he target name is fully specified,
+//-- long name assembled by GetDirEntry() doesn't match the target. But if he target name is fully specified,
-	                	 //-- we need to compare corresponding DOS entries, because VFAT entries may be damaged, while DOS ones are OK.
+//-- we need to compare corresponding DOS entries, because VFAT entries may be damaged, while DOS ones are OK.
-	                     findHelper.InitialiseL(trgtNameNoDot);
+findHelper.InitialiseL(trgtNameNoDot);
-	                     if(findHelper.MatchDosEntryName(aDosEntry.Name().Ptr()))
+if(findHelper.MatchDosEntryName(aDosEntry.Name().Ptr()))
-	                    	 {
+{
-							 found = ETrue;
+found = ETrue;
-	                    	 break; //-- DOS entries match, success.
+break; //-- DOS entries match, success.
-	                    	 }
+}
-	                	 }
+}
-	                 else if (!trgNameFullySpecified)
+else if (!trgNameFullySpecified)
-	                	 {//-- target name contains wildcards, we need to use MatchF with dos name
+{//-- target name contains wildcards, we need to use MatchF with dos name
-	                     TBuf8<0x20> dosName8(DosNameFromStdFormat(aDosEntry.Name()));
+TBuf8<0x20> dosName8(DosNameFromStdFormat(aDosEntry.Name()));
-	                     TBuf<0x20>  dosName;
+TBuf<0x20>  dosName;
-	                     LocaleUtils::ConvertToUnicodeL(dosName, dosName8); //-- convert DOS name to unicode (implies locale settings)
+LocaleUtils::ConvertToUnicodeL(dosName, dosName8); //-- convert DOS name to unicode (implies locale settings)
-	                     if (dosName.MatchF(trgtNameNoDot)!=KErrNotFound)
+if (dosName.MatchF(trgtNameNoDot)!=KErrNotFound)
-	                    	 {
+{
-							 found = ETrue;
+found = ETrue;
-							 break;
+break;
-	                    	 }
+}
-	                	 }
+}
-	                }
+}
-	            else //if (aStartEntry.IsVFatEntry())
+else //if (aStartEntry.IsVFatEntry())
-	                {//-- we've read a legacy FAT entry, so compare DOS entries
+{//-- we've read a legacy FAT entry, so compare DOS entries
-	                findHelper.InitialiseL(trgtNameNoDot);
+findHelper.InitialiseL(trgtNameNoDot);
-	                if(findHelper.TrgtNameIsLegalDos())
+if(findHelper.TrgtNameIsLegalDos())
-	                    {//-- we are looking for a legal DOS name
+{//-- we are looking for a legal DOS name
-	                    if(trgNameFullySpecified)
+if(trgNameFullySpecified)
-	                        {//-- if the target name is fully specified, we can yse binary comparison of the DOS entries
+{//-- if the target name is fully specified, we can yse binary comparison of the DOS entries
-	                        if(findHelper.MatchDosEntryName(aDosEntry.Name().Ptr()))
+if(findHelper.MatchDosEntryName(aDosEntry.Name().Ptr()))
-	                        	{
+{
-								found = ETrue;
+found = ETrue;
-	                            break;
+break;
-	                        	}
+}
-	                        }
+}
-	                    else
+else
-	                        {//-- target name contains wildcards, we neeed to use MatchF
+{//-- target name contains wildcards, we neeed to use MatchF
-	                        TBuf8<0x20> dosName8(DosNameFromStdFormat(aDosEntry.Name()));
+TBuf8<0x20> dosName8(DosNameFromStdFormat(aDosEntry.Name()));
-	                        TBuf<0x20>  dosName;
+TBuf<0x20>  dosName;
-	                        LocaleUtils::ConvertToUnicodeL(dosName, dosName8); //-- convert DOS name to unicode (implies locale settings)
+LocaleUtils::ConvertToUnicodeL(dosName, dosName8); //-- convert DOS name to unicode (implies locale settings)
-	                        if (dosName.MatchF(trgtNameNoDot)!=KErrNotFound)
+if (dosName.MatchF(trgtNameNoDot)!=KErrNotFound)
-	                        	{
+{
-								found = ETrue;
+found = ETrue;
-	                            break;
+break;
-	                        	}
+}
-	                        }
+}
-	                    } //if(findHelper.TrgtNameIsLegalDos())
+} //if(findHelper.TrgtNameIsLegalDos())
-	                } //else if (aStartEntry.IsVFatEntry())
+} //else if (aStartEntry.IsVFatEntry())
-	            } //if (bFileNameEntry && MatchEntryAtt(aDosEntry.Attributes(),anAtt))
+} //if (bFileNameEntry && MatchEntryAtt(aDosEntry.Attributes(),anAtt))
-	        // record previous cluster number
+// record previous cluster number
-	        clustNum = aDosEntryPos.iCluster;
+clustNum = aDosEntryPos.iCluster;
-	        // this is the 2nd scanning and we have just passed the pos we started.
+// this is the 2nd scanning and we have just passed the pos we started.
-	        if (scanAhead && scanCnt == 2)
+if (scanAhead && scanCnt == 2)
-	        	{
+{
-	        	if (aDosEntryPos.Cluster() == aLeafDirData.iMRUPos.Cluster()
+if (aDosEntryPos.Cluster() == aLeafDirData.iMRUPos.Cluster()
-	        			&& aDosEntryPos.Pos() >= aLeafDirData.iMRUPos.Pos())
+&& aDosEntryPos.Pos() >= aLeafDirData.iMRUPos.Pos())
-	        		{
+{
-	        		User::Leave(anError);
+User::Leave(anError);
-	        		}
+}
-	        	}
+}
-	        MoveToNextEntryL(aDosEntryPos); //-- goto the next entry in the directory
+MoveToNextEntryL(aDosEntryPos); //-- goto the next entry in the directory
-	        if (IsRootDir(aDosEntryPos)&&(aDosEntryPos.iPos+StartOfRootDirInBytes()>=RootDirEnd()))
+if (IsRootDir(aDosEntryPos)&&(aDosEntryPos.iPos+StartOfRootDirInBytes()>=RootDirEnd()))
-	            {
+{
-	            User::Leave(anError);//Allows maximum number of entries in root directory
+User::Leave(anError);//Allows maximum number of entries in root directory
-	            }
+}
-	        if (!scanAhead || scanCnt == 2)
+if (!scanAhead || scanCnt == 2)
-	        	{
+{
-		        if (aDosEntryPos.iCluster && (aDosEntryPos.iPos <= previousPosition))
+if (aDosEntryPos.iCluster && (aDosEntryPos.iPos <= previousPosition))
-		            DoCheckFatForLoopsL(aDosEntryPos.iCluster,previousCluster,changePreviousCluster,count);
+DoCheckFatForLoopsL(aDosEntryPos.iCluster,previousCluster,changePreviousCluster,count);
-		        previousPosition=aDosEntryPos.iPos;
+previousPosition=aDosEntryPos.iPos;
-	        	}
+}
-	    	}	// FOREVER -- the actual scanning is done inside this loop
+}   // FOREVER -- the actual scanning is done inside this loop
 if (found)
-	{
+{
-	break;
+break;
-	}
+}
 // if not found:
-	// if we have not found in the first scanning and we are doing scanning ahead,
+// if we have not found in the first scanning and we are doing scanning ahead,
 //  we need to go back to the starting pos of this dir and scan from start until
 //  we reach lastscannedPos
 if (scanAhead && scanCnt == 1)
-	{
+{
-	aDosEntryPos = TEntryPos(aLeafDirData.iClusterNum, 0);
+aDosEntryPos = TEntryPos(aLeafDirData.iClusterNum, 0);
-	continue;
+continue;
-	}
+}
 else
-	{
+{
-	// there are only two exits: either found or reached end of dir in the 1st scanning
+// there are only two exits: either found or reached end of dir in the 1st scanning
-	ASSERT(0);
+ASSERT(0);
-	break;
+break;
-	}
+}
-	} // for (TInt scanCnt = 1; scanCnt <= 2; ++scanCnt)
+} // for (TInt scanCnt = 1; scanCnt <= 2; ++scanCnt)
 //---------------------------------------------------
 if (iRawDisk->DirCacheInterface() && aDosEntryPos.Cluster())
-	{
+{
-	TInt64 mruPos = MakeLinAddrL(aDosEntryPos);
+TInt64 mruPos = MakeLinAddrL(aDosEntryPos);
 iRawDisk->DirCacheInterface()->MakePageMRU(mruPos);
-	// only update the leaf dir cache when the original cache index is provided
+// only update the leaf dir cache when the original cache index is provided
-	if (aLeafDirData.iClusterNum)
+if (aLeafDirData.iClusterNum)
-		{
+{
 iLeafDirCache->UpdateMRUPos(TLeafDirData(aLeafDirData.iClusterNum, aDosEntryPos));
 }
-	}
+}
 return (aStartEntry.IsVFatEntry());
 }
 //-----------------------------------------------------------------------------------------
 __PRINT(_L("CFatMountCB::FindDosNameL()"));
 TEntryPos startPos;
 TFatDirEntry startEntry;
-TLeafDirData leafDir;			// leaf dir data is zero initialized, no scannig ahead
+TLeafDirData leafDir;           // leaf dir data is zero initialized, no scannig ahead
 DoFindL(aName,anAtt,startPos,startEntry,aDosEntryPos,aDosEntry,aFileName,anError,NULL,leafDir);
 }
 //-----------------------------------------------------------------------------------------
 void CFatMountCB::AddDirEntryL(TEntryPos& aPos,TInt aNumOfEntries)
 dosEntryPos.iCluster=FindLeafDirL(RemoveTrailingDots(aName).Left(namePos), leafDir);
 dosEntryPos.iPos=0;
 TEntryPos startPos;
 TFatDirEntry startEntry;
 DoFindL(RemoveTrailingDots(aName).Mid(namePos),KEntryAttMaskSupported,
-		startPos,startEntry,dosEntryPos,dosEntry,
+startPos,startEntry,dosEntryPos,dosEntry,
-		fileName,KErrNotFound,
+fileName,KErrNotFound,
-		NULL,
+NULL,
-		leafDir);
+leafDir);
 //  Check that reading from aPos for aLength lies within the file
 //  if aPos is within the file, and aLength is too long, read up to EOF
 //  If aPos is beyond the end of the file, return a zero length descriptor
-	TUint32 fileSize = dosEntry.Size();
+TUint32 fileSize = dosEntry.Size();
-	if ((TUint)aPos>=fileSize)
+if ((TUint)aPos>=fileSize)
 User::Leave(KErrEof);
 if ((TUint)(aPos+aLength)>fileSize)
 aLength=fileSize-aPos;
 TInt cluster=StartCluster(dosEntry);
-	TInt pos = aPos;
+TInt pos = aPos;
 TInt endCluster;
 TInt clusterSize=1<<ClusterSizeLog2();      //  Size of file clusters
-	TInt readTotal = 0;
+TInt readTotal = 0;
-	// Total number of clusters in file
+// Total number of clusters in file
 TInt maxClusters=((fileSize+clusterSize-1)>>ClusterSizeLog2());
-	// Read data
+// Read data
 FOREVER
 {
-		//  Get the maximum number of clusters that can be read contiguously
+//  Get the maximum number of clusters that can be read contiguously
 TInt clusterListLen=FAT().CountContiguousClustersL(cluster,endCluster,maxClusters);
 __ASSERT_DEBUG(clusterListLen>0,Fault(EReadFileSectionFailed));
-		//  If start position within this block, then read some data
+//  If start position within this block, then read some data
 if (pos<(clusterListLen<<ClusterSizeLog2()))
 {
-			//  Read the remaining length or the entire cluster block whichever is smaller
+//  Read the remaining length or the entire cluster block whichever is smaller
-			TInt readLength = Min(aLength-readTotal,(clusterListLen<<ClusterSizeLog2())-pos);
+TInt readLength = Min(aLength-readTotal,(clusterListLen<<ClusterSizeLog2())-pos);
-			__ASSERT_DEBUG(readLength>0,Fault(EReadFileSectionFailed));
+__ASSERT_DEBUG(readLength>0,Fault(EReadFileSectionFailed));
-			TInt64 dataAddress=(FAT().DataPositionInBytes(cluster))+pos;
+TInt64 dataAddress=(FAT().DataPositionInBytes(cluster))+pos;
-			iRawDisk->ReadL(dataAddress,readLength,aTrg,aMessage,readTotal);
+iRawDisk->ReadL(dataAddress,readLength,aTrg,aMessage,readTotal);
-			readTotal += readLength;
+readTotal += readLength;
-			if (readTotal == aLength)
+if (readTotal == aLength)
-				return;
+return;
-			pos += readLength;
+pos += readLength;
-			}
+}
-		// Get the next cluster in file
+// Get the next cluster in file
-		pos-=(clusterListLen<<ClusterSizeLog2());
+pos-=(clusterListLen<<ClusterSizeLog2());
 #if defined(_DEBUG)
-		TBool remainingClusters=
+TBool remainingClusters=
 #endif
-			((CFatMountCB*)this)->FAT().GetNextClusterL(endCluster);
+((CFatMountCB*)this)->FAT().GetNextClusterL(endCluster);
-		__ASSERT_DEBUG(remainingClusters,Fault(EReadFileSectionFailed));
+__ASSERT_DEBUG(remainingClusters,Fault(EReadFileSectionFailed));
-		cluster=endCluster;
+cluster=endCluster;
-		}
+}
 }
 //-----------------------------------------------------------------------------------------
 // Write aLength of data from thread relative descriptor to disk
 //
 {
 CheckWritableL();
-	//-- check if we are trying to write to the FAT directly and wait until FAT scan thread finishes in this case.
+//-- check if we are trying to write to the FAT directly and wait until FAT scan thread finishes in this case.
 FAT().RequestRawWriteAccess(aPos, aLength);
 iRawDisk->WriteL(aPos,aLength,aSrc,aMessage,anOffset);
 //-- Note: FAT directory cache will be invalidated in MountL()
 }
 TRAP(r,aMessage.WriteL(2,pVal,0));
 if(r!=KErrNone)
 return(r);
 break;
 }
-		case ELocalTimeForRemovableMediaOn:
+case ELocalTimeForRemovableMediaOn:
-			{
+{
-			FatFileSystem().SetUseLocalTime(ETrue);
+FatFileSystem().SetUseLocalTime(ETrue);
-			break;
+break;
-			}
+}
-		case ELocalTimeForRemovableMediaOff:
+case ELocalTimeForRemovableMediaOff:
-			{
+{
-			FatFileSystem().SetUseLocalTime(EFalse);
+FatFileSystem().SetUseLocalTime(EFalse);
-			break;
+break;
-			}
+}
-		case ELocalTimeUsedOnRemovableMedia:
+case ELocalTimeUsedOnRemovableMedia:
-			{
+{
-			TBool flag = FatFileSystem().GetUseLocalTime();
+TBool flag = FatFileSystem().GetUseLocalTime();
-			TPckgC<TBool> flagPckg(flag);
+TPckgC<TBool> flagPckg(flag);
-			TInt r = aMessage.Write(2, flagPckg);
+TInt r = aMessage.Write(2, flagPckg);
-			if(r!=KErrNone)
+if(r!=KErrNone)
-				return r;
+return r;
-			break;
+break;
-			}
+}
-		case ECreationTime:
+case ECreationTime:
-			{
+{
-			CheckStateConsistentL();
+CheckStateConsistentL();
-			TEntryPos firstEntryPos(RootIndicator(),0);
+TEntryPos firstEntryPos(RootIndicator(),0);
-			TFatDirEntry firstEntry;
+TFatDirEntry firstEntry;
-			//RFs::ControlIO restricts you to use narrow descriptors
+//RFs::ControlIO restricts you to use narrow descriptors
-			//so convert narrow back to wide.
+//so convert narrow back to wide.
-			TBuf8<KMaxPath> fileNameNarrow;
+TBuf8<KMaxPath> fileNameNarrow;
-			aMessage.Read(2, fileNameNarrow);
+aMessage.Read(2, fileNameNarrow);
-			TFileName fileNameWide;
+TFileName fileNameWide;
-			fileNameWide.Copy(fileNameNarrow);
+fileNameWide.Copy(fileNameNarrow);
-			//find the long file name entry
+//find the long file name entry
-			TRAPD(r, FindEntryStartL(fileNameWide,KEntryAttMaskSupported,firstEntry,firstEntryPos) );
+TRAPD(r, FindEntryStartL(fileNameWide,KEntryAttMaskSupported,firstEntry,firstEntryPos) );
-			if(r!=KErrNone)
+if(r!=KErrNone)
 return(r);
-			//Find the corresponding 8.3 short name entry, for metadata
+//Find the corresponding 8.3 short name entry, for metadata
-			MoveToDosEntryL(firstEntryPos,firstEntry);
+MoveToDosEntryL(firstEntryPos,firstEntry);
-			TTime creationTime=0;
+TTime creationTime=0;
-			TPckg<TTime> timePckg(creationTime);
+TPckg<TTime> timePckg(creationTime);
-			SFatDirEntry* sEntry = reinterpret_cast<SFatDirEntry*>(firstEntry.iData);
+SFatDirEntry* sEntry = reinterpret_cast<SFatDirEntry*>(firstEntry.iData);
-			creationTime = DosTimeToTTime(sEntry->iTimeC, sEntry->iDateC);
+creationTime = DosTimeToTTime(sEntry->iTimeC, sEntry->iDateC);
-			r = aMessage.Write(3, timePckg);
+r = aMessage.Write(3, timePckg);
-			if(r!=KErrNone)
+if(r!=KErrNone)
-				return r;
+return r;
-			break;
+break;
-			}
+}
-		case EDisableFATDirCache:
+case EDisableFATDirCache:
-			{
+{
-		    MWTCacheInterface* pDirCache = iRawDisk->DirCacheInterface();
+MWTCacheInterface* pDirCache = iRawDisk->DirCacheInterface();
-		    TUint32 KEDisableFATDirCache = CDynamicDirCache::EDisableCache;
+TUint32 KEDisableFATDirCache = CDynamicDirCache::EDisableCache;
-		    pDirCache->Control(KEDisableFATDirCache, (TUint32) aParam1, NULL);
+pDirCache->Control(KEDisableFATDirCache, (TUint32) aParam1, NULL);
-			break;
+break;
-			}
+}
-		case EDumpFATDirCache:
+case EDumpFATDirCache:
-			{
+{
-		    MWTCacheInterface* pDirCache = iRawDisk->DirCacheInterface();
+MWTCacheInterface* pDirCache = iRawDisk->DirCacheInterface();
-		    TUint32 KEDumpFATDirCache = CDynamicDirCache::EDumpCache;
+TUint32 KEDumpFATDirCache = CDynamicDirCache::EDumpCache;
-		    pDirCache->Control(KEDumpFATDirCache, 0, NULL);
+pDirCache->Control(KEDumpFATDirCache, 0, NULL);
-			break;
+break;
-			}
+}
-		case EFATDirCacheInfo:
+case EFATDirCacheInfo:
-			{
+{
-		    MWTCacheInterface* pDirCache = iRawDisk->DirCacheInterface();
+MWTCacheInterface* pDirCache = iRawDisk->DirCacheInterface();
-		    TUint32 KEFATDirCacheInfo = CDynamicDirCache::ECacheInfo;
+TUint32 KEFATDirCacheInfo = CDynamicDirCache::ECacheInfo;
-		    pDirCache->Control(KEFATDirCacheInfo, 0, NULL);
+pDirCache->Control(KEFATDirCacheInfo, 0, NULL);
-			break;
+break;
-			}
+}
 default: return(KErrNotSupported);
 }
 return(KErrNone);
 //
 // lock media device
 //
 {
 __PRINT(_L("CFatMountCB::Lock"));
-	TInt r=CreateDrive(Drive().DriveNumber());
+TInt r=CreateDrive(Drive().DriveNumber());
 if (r!=KErrNone)
 return r;
 TBusLocalDrive* local;
 r=LocalDrive()->GetLocalDrive(local);
 //
 // Unlock media device
 //
 {
 __PRINT(_L("CFatMountCB::Unlock"));
-	TInt r=CreateDrive(Drive().DriveNumber());
+TInt r=CreateDrive(Drive().DriveNumber());
 if (r!=KErrNone)
 return r;
 TBusLocalDrive* local;
 r=LocalDrive()->GetLocalDrive(local);
 //
 // Clear password from media device
 //
 {
 __PRINT(_L("CFatMountCB::ClearPassword"));
-	TInt r=CreateDrive(Drive().DriveNumber());
+TInt r=CreateDrive(Drive().DriveNumber());
 if (r!=KErrNone)
 return r;
 TBusLocalDrive* local;
 r=LocalDrive()->GetLocalDrive(local);
 // Forcibly erase the password from a media device
 //
 {
 __PRINT(_L("CFatMountCB::ErasePassword"));
-	TInt r=CreateDrive(Drive().DriveNumber());
+TInt r=CreateDrive(Drive().DriveNumber());
 if (r!=KErrNone)
 return r;
 TBusLocalDrive* local;
 r=LocalDrive()->GetLocalDrive(local);
 //
 // Force a remount of the drive
 //
 {
 __PRINT(_L("CFatMountCB::ForceRemountDrive"));
-	TInt r=CreateDrive(Drive().DriveNumber());
+TInt r=CreateDrive(Drive().DriveNumber());
 if (r==KErrNone)
-		r=LocalDrive()->SetMountInfo(aMountInfo,aMountInfoMessageHandle);
+r=LocalDrive()->SetMountInfo(aMountInfo,aMountInfoMessageHandle);
 if (r==KErrNone)
 r=LocalDrive()->ForceRemount(aFlags);
 return(r);
 }
 TFatDirEntry fatDirEntry;
 fatDirEntry.SetName(aNewName);
 fatDirEntry.SetAttributes(KEntryAttVolume);
 TTime now;
-			now.UniversalTime();
+now.UniversalTime();
-			fatDirEntry.SetTime(now, TimeOffset() );
+fatDirEntry.SetTime(now, TimeOffset() );
 fatDirEntry.SetStartCluster(0);
 fatDirEntry.SetSize(0);
 WriteDirEntryL(dirPos, fatDirEntry);
 FAT().FlushL();
 }
 temp = currentPos>>ClusterSizeLog2();
 if ( (currentPos) && ( (currentPos) == (temp<<ClusterSizeLog2()) ) )
 {
 if (!FAT().GetNextClusterL(aPos.iCluster))
 {
-				__PRINT(_L("CFatMountCB::BlockMapReadFromClusterListL corrupt#1"))
+__PRINT(_L("CFatMountCB::BlockMapReadFromClusterListL corrupt#1"))
 User::Leave(KErrCorrupt);
 }
 }
 clusterRelativePos = ClusterRelativePos( aPos.iPos );
 maxClusters = ((aLength + clusterRelativePos - 1)>>ClusterSizeLog2())+1;
 //
 // Walk the FAT, returns error if find an unterminated list or
 // lists that merge.
 //
 TInt CFatMountCB::CheckDisk()
-	{
+{
 __PRINT1(_L("CFatMountCB::CheckDisk() drv:%d"), DriveNumber());
 if(!ConsistentState())
 return KErrCorrupt;
 TInt nRes;
 if(LockStatus()!=0)
 {
-		__PRINT(_L("CFatMountCB::ScanDrive() locked!\n"));
+__PRINT(_L("CFatMountCB::ScanDrive() locked!\n"));
 return KErrInUse;
 }
 if(iRamDrive)
 {//-- Do not check internal RAM drive
 a null offset is returned.
 @return The offset in seconds that timestamps on the filesystem have, relative to UTC.
 */
 TTimeIntervalSeconds CFatMountCB::TimeOffset() const
-	{
+{
 if((Drive().Att() & KDriveAttRemovable) && FatFileSystem().GetUseLocalTime() )
-	    {
+{
 return User::UTCOffset();
 }
-	else
+else
 {
 return TTimeIntervalSeconds(0);
 }
-	}
+}
 //-----------------------------------------------------------------------------------------

changeset 15	4122176ea935
parent 0	a41df078684a