diff -r 36bfc973b146 -r 329ab0095843 userlibandfileserver/fileserver/sfile/sf_plugin_shim.cpp --- a/userlibandfileserver/fileserver/sfile/sf_plugin_shim.cpp Thu Jan 07 13:38:45 2010 +0200 +++ b/userlibandfileserver/fileserver/sfile/sf_plugin_shim.cpp Mon Jan 18 21:31:10 2010 +0200 @@ -119,6 +119,16 @@ #endif } +EXPORT_C TInt RFsPlugin::Volume(TVolumeInfo &aVol, TInt aDrive) const +/** +Gets volume information for a formatted device. + +@see RFs::Volume +*/ + { + return (RFs::Volume(aVol, aDrive)); + } + TInt RFsPlugin::SendReceive(TInt aFunction,const TIpcArgs& aArgs) const { return iSessionHelper.SendReceive(aFunction, aArgs); @@ -128,7 +138,7 @@ { if(Handle()) return RSessionBase::SendReceive(aFunction, aArgs); - + return ((RFsPlugin*) this)->SendReceive(aFunction, aArgs); } @@ -236,7 +246,7 @@ return err; } - + EXPORT_C TInt RFilePlugin::TransferToClient() /** Closes the file. @@ -306,7 +316,7 @@ EXPORT_C TInt RFilePlugin::Read(TInt64 aPos,TDes8& aDes,TInt aLen) const /** -Reads the specified number of bytes of binary data from the file at a specified +Reads the specified number of bytes of binary data from the file at a specified offset within the file. @see RFile::Read @@ -399,7 +409,7 @@ EXPORT_C TInt RFilePlugin::Flush() /** -Commits data to the storage device and flushes internal buffers without closing +Commits data to the storage device and flushes internal buffers without closing the file. @see RFile::Flush @@ -523,7 +533,7 @@ void RFile::CloseSubSession(TInt aFunction) { - if((Session().Handle() ^ CObjectIx::ENoClose) != KErrBadHandle) + if((Session().Handle() ^ CObjectIx::ENoClose) != KErrBadHandle) RSubSessionBase::CloseSubSession(aFunction); else ((RFilePlugin*) this)->CloseSubSession(aFunction); @@ -531,9 +541,9 @@ TInt RFile::SendReceive(TInt aFunction,const TIpcArgs& aArgs) const { - if((Session().Handle() ^ CObjectIx::ENoClose) != KErrBadHandle) + if((Session().Handle() ^ CObjectIx::ENoClose) != KErrBadHandle) return RSubSessionBase::SendReceive(aFunction, aArgs); - + return ((RFilePlugin*) this)->SendReceive(aFunction, aArgs); } @@ -584,7 +594,7 @@ TPckgC pckgUid(uidType); return(CreateSubSession(fs,EFsDirOpen,TIpcArgs(&aMatchName,anAttMask,&pckgUid))); } - + EXPORT_C void RDirPlugin::Close() /** Closes the the directory. @@ -653,7 +663,7 @@ TInt RDir::SendReceive(TInt aFunction,const TIpcArgs& aArgs) const { - if((Session().Handle() ^ CObjectIx::ENoClose) != KErrBadHandle) + if((Session().Handle() ^ CObjectIx::ENoClose) != KErrBadHandle) return RSubSessionBase::SendReceive(aFunction, aArgs); return ((RDirPlugin*) this)->SendReceive(aFunction, aArgs); @@ -730,7 +740,7 @@ newRequest->Dispatch(); - // NOTE : newRequest will be free'd by the File Server before completing the + // NOTE : newRequest will be free'd by the File Server before completing the // request so it's not safe to touch the request from now on... return(iPlugin->WaitForRequest());