diff -r c1f20ce4abcf -r 3e88ff8f41d5 userlibandfileserver/fileserver/inc/f32fsys.h --- a/userlibandfileserver/fileserver/inc/f32fsys.h Tue Aug 31 16:34:26 2010 +0300 +++ b/userlibandfileserver/fileserver/inc/f32fsys.h Wed Sep 01 12:34:56 2010 +0100 @@ -556,10 +556,6 @@ friend class LocalDrives; // for access to iChanged flag friend class CExtNotifyMediaChange; // for access to iChanged flag - -#if defined(_USE_CONTROLIO) || defined(_DEBUG) || defined(_DEBUG_RELEASE) - friend class TFsControlIo; // for access to LocateDrives() -#endif }; class CFileCB; @@ -1618,6 +1614,7 @@ TBool DeleteOnClose() const; + void SetNotifyAsyncReadersPending(TBool aNotifyAsyncReadersPending); TBool NotifyAsyncReadersPending() const; TInt CancelAsyncReadRequest(CFileShare* aShareP, TRequestStatus* aStatusP); @@ -1642,17 +1639,6 @@ TInt RemoveLock64(CFileShare* aFileShare,TInt64 aPos,TInt64 aLength); TInt CheckLock64(CFileShare* aFileShare,TInt64 aPos,TInt64 aLength); - /** Sequential mode */ - - IMPORT_C TBool IsSequentialMode() const; - void SetSequentialMode(TBool aSequential); - - /** - The FileShare List contains the file shares of an open file. - */ - TDblQue& FileShareList() const; - void AddShare(CFileShare& aFileShare); - /** Renames the file with the full file name provided. @@ -1969,12 +1955,12 @@ public: /** - The full name of the file, including its extension. + The full name of the file, including drive and extensions. */ HBufC* iFileName; /** - The full name of the file, including its extension - Folded. + The full name of the file, including drive and extensions - Folded. */ HBufC* iFileNameF; @@ -1983,9 +1969,11 @@ TDrive* iCreatedDrive; TDrive* iDrive; CMountCB* iMount; - TFileLocksArray* iFileLocks; // An array of file position locks + TFileLocksArray* iFileLocks; ///< an array of file position locks TDblQueLink iMountLink; - CFileBody* iBody; + +private: + CFileBody* iBody; friend class TDrive; friend class CMountCB; @@ -2038,7 +2026,7 @@ void InitL(); inline CFileCB& File(); - // For serialising async requests + // For serialising aync requests TBool RequestStart(CFsMessageRequest* aRequest); void RequestEnd(CFsMessageRequest* aRequest); TBool RequestInProgress() const; @@ -2063,13 +2051,8 @@ // A pointer to the current request. Used for serializing client // async read/write requests which might otherwise be processed out - // of order due to fair scheduling. - CFsMessageRequest* iCurrentRequest; - - // The FileShare List link object. - TDblQueLink iShareLink; - -friend class CFileBody; // For access to iShareLink + // of order due to fair scheduling + CFsMessageRequest* iCurrentRequest; };