diff -r e7d2d738d3c2 -r 2f92ad2dc5db userlibandfileserver/fileserver/sfat32/sl_vfat.cpp --- a/userlibandfileserver/fileserver/sfat32/sl_vfat.cpp Mon Mar 15 12:45:50 2010 +0200 +++ b/userlibandfileserver/fileserver/sfat32/sl_vfat.cpp Wed Mar 31 23:38:45 2010 +0300 @@ -439,14 +439,12 @@ /** Returns ETrue if aName is unique, EFalse if a matching name is found. */ -TBool CFatMountCB::IsUniqueNameL(const TShortName& aName,TInt aDirCluster) +TBool CFatMountCB::IsUniqueNameL(const TShortName& aName, TUint32 aDirCluster) { __PRINT(_L("CFatMountCB::IsUniqueNameL")); TEntryPos entryPos(aDirCluster,0); - if (FindShortNameL(aName,entryPos)) - return(EFalse); - return(ETrue); + return ! FindShortNameL(aName,entryPos); } //----------------------------------------------------------------------------- @@ -478,12 +476,11 @@ } } -//----------------------------------------------------------------------------- /** Generate a legal dos filename as an alias for aName. @return ETrue if aName is a legal dos name. */ -TBool CFatMountCB::GenerateShortNameL(TInt aDirCluster,const TDesC& aName,TShortName& aGeneratedName, TBool aForceRandomize) +TBool CFatMountCB::GenerateShortNameL(TUint32 aDirCluster,const TDesC& aName,TShortName& aGeneratedName, TBool aForceRandomize) { __PRINT1(_L("CFatMountCB::GenerateShortNameL() cl:%d"), aDirCluster);