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

equal deleted inserted replaced

-:2d65c2f76d7b
+:947f0dc9f7a8
 else
 fatEntry &= ~KFat32CleanShutDownMask; //-- reset ClnShutBit flag
 if(tmp != fatEntry)
 {//-- write FAT[1] entry to all available FATs
-for(TInt i=0; i<NumberOfFats(); ++i)
+for(TUint32 i=0; i<NumberOfFats(); ++i)
 {
 const TInt64 pos = StartOfFatInBytes()+KFatEntrySize+(FatSizeInBytes()*i);
 User::LeaveIfError(LocalDrive()->Write(pos, ptrFatEntry)); //write FAT32[1] entry
 }
 }
 else
 fatEntry &= ~KFat16CleanShutDownMask; //-- reset ClnShutBit flag
 if(tmp != fatEntry)
 {//-- write FAT[1] entry to all available FATs
-for(TInt i=0; i<NumberOfFats(); ++i)
+for(TUint32 i=0; i<NumberOfFats(); ++i)
 {
 const TInt64 pos = StartOfFatInBytes()+KFatEntrySize+(FatSizeInBytes()*i);
 User::LeaveIfError(LocalDrive()->Write(pos, ptrFatEntry)); //write FAT16[1] entry
 }
 }
 void CFatMountCB::MountL(TBool aForceMount)
 	{
 const TInt driveNo = Drive().DriveNumber();
-__PRINT2(_L("CFatMountCB::MountL() drv:%d, forceMount=%d\n"),driveNo,aForceMount);
+__PRINT3(_L("CFatMountCB::MountL() drv:%d, forceMount=%d, RuggedFAT:%d\n"), driveNo, aForceMount, IsRuggedFSys());
 ASSERT(State() == ENotMounted || State() == EDismounted);
 SetState(EMounting);
 SetReadOnly(EFalse);
 			iFirstFreeByte=RootDirEnd();
 		}
 	    {//-- check if volume geometry looks valid
-const TInt usableSectors=TotalSectors()-(iFirstFreeByte>>SectorSizeLog2());
+const TUint32 usableSectors = TotalSectors()-(iFirstFreeByte>>SectorSizeLog2());
 	    iUsableClusters=usableSectors>>(ClusterSizeLog2()-SectorSizeLog2());
 const TUint32 KMinClusters = 32; //-- absolute minimum number of clusters on the volume
 const TUint32 KMaxClusters=(TotalSectors()-FirstFatSector()-NumberOfFats()*(FatSizeInBytes()>>SectorSizeLog2())) >> (ClusterSizeLog2()-SectorSizeLog2());
-if(usableSectors <=0 || iUsableClusters < KMinClusters || iUsableClusters > KMaxClusters)
+if(iUsableClusters < KMinClusters || iUsableClusters > KMaxClusters)
 {
 __PRINT(_L("CFatMountCB::InitializeL() Wrong number of usable cluster/sectors on the volume!"));
 User::Leave(KErrCorrupt);
 }
 }
 	//========== initialise RawDisk interface
 	//-- CFatMountCB parameters might have changed, e.g. after formatting. Reconstruct directory cache with new parameters
 delete iRawDisk;
+iRawDisk = NULL;
 	iRawDisk=CRawDisk::NewL(*this, aLocDrvCaps);
 iRawDisk->InitializeL();
 //========== Try to read FSInfo and deduct number of free clusters and other information from there
 }
 //========== create and initialise FAT table
 delete iFatTable;
+iFatTable = NULL;
 iFatTable=CFatTable::NewL(*this, aLocDrvCaps);
 //-- mount the FAT table. Depending on mount parameters and configuration this method
 //-- can do various things, like counting free clusters synchronously if data from FSInfo isn't valid,
 //-- or setting up a FAT backround thread and return immediately etc.
 SetState(EInit_R);  //-- the state is "Initialized, but not writen"
 //-- make a callback, telling FileServer about free space discovered.
 const TInt64 freeSpace = ((TInt64)FAT().NumberOfFreeClusters()) << ClusterSizeLog2();
 SetDiskSpaceChange(freeSpace);
-//========== create and setup leaf direcotry cache if cache limit is set bigger than one
+//========== create and setup leaf direcotry cache
-	const TUint32 cacheLimit = iFatConfig.LeafDirCacheSize();
-	if (cacheLimit > 1)
 		{
-		// destroy the old leaf dir cache to avoid memory leak.
+	const TUint32 cacheLimit = Max(iFatConfig.LeafDirCacheSize(), 1lu);
 		delete iLeafDirCache;
+iLeafDirCache = NULL;
 		iLeafDirCache = CLeafDirCache::NewL(cacheLimit);
 		}
-	else
-		{
-		iLeafDirCache = NULL;
-		}
 __PRINT3(_L("#- CFatMountCB::InitializeL() done. drv:%d, Free clusters:%d, 1st Free cluster:%d"),DriveNumber(), FAT().NumberOfFreeClusters(), FAT().FreeClusterHint());
 	}
 {
 TBool bFinalised;
 nRes = IsFinalised(bFinalised);
 if(nRes == KErrNone)
 {
+ASSERT(aParam);
 *((TBool*)aParam) = bFinalised;
 }
 return nRes;
 }
 aLength=(TInt)(fileSize-aPos);
 TInt cluster=StartCluster(dosEntry);
 	TInt64 pos = aPos;
-TInt endCluster;
+TUint32 endCluster;
 TInt clusterSize=1<<ClusterSizeLog2();      //  Size of file clusters
 	TInt readTotal = 0;
 	// Total number of clusters in file
 TInt maxClusters=(TInt)((fileSize+clusterSize-1)>>ClusterSizeLog2());

changeset 90	947f0dc9f7a8
parent 33	0173bcd7697c
child 117	5b5d147c7838
child 131	e880629062dd