Changeset 34507 in vbox for trunk/src/VBox/Runtime/common/vfs
- Timestamp:
- Nov 30, 2010 1:14:14 PM (14 years ago)
- svn:sync-xref-src-repo-rev:
- 68295
- Location:
- trunk/src/VBox/Runtime/common/vfs
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Runtime/common/vfs/vfsbase.cpp
r34441 r34507 2124 2124 2125 2125 2126 RTDECL( RTFOFF) RTVfsIoStrmPoll(RTVFSIOSTREAM hVfsIos, uint32_t fEvents, RTMSINTERVAL cMillies, bool fIntr,2127 2126 RTDECL(int) RTVfsIoStrmPoll(RTVFSIOSTREAM hVfsIos, uint32_t fEvents, RTMSINTERVAL cMillies, bool fIntr, 2127 uint32_t *pfRetEvents) 2128 2128 { 2129 2129 RTVFSIOSTREAMINTERNAL *pThis = hVfsIos; … … 2185 2185 while (cb > 0) 2186 2186 { 2187 size_t cbToRead = RT_MIN(cb, _64K);2187 size_t cbToRead = (size_t)RT_MIN(cb, _64K); 2188 2188 RTVfsLockAcquireWrite(pThis->Base.hLock); 2189 2189 rc = RTVfsIoStrmRead(hVfsIos, pvBuf, cbToRead, true /*fBlocking*/, NULL); … … 2224 2224 while (cb > 0) 2225 2225 { 2226 size_t cbToWrite = RT_MIN(cb, _64K);2226 size_t cbToWrite = (size_t)RT_MIN(cb, _64K); 2227 2227 RTVfsLockAcquireWrite(pThis->Base.hLock); 2228 2228 rc = RTVfsIoStrmWrite(hVfsIos, pvBuf, cbToWrite, true /*fBlocking*/, NULL); -
trunk/src/VBox/Runtime/common/vfs/vfsmemory.cpp
r34441 r34507 326 326 cbThisRead = cbLeftToRead; 327 327 else 328 cbThisRead = pNext->off - offUnsigned;328 cbThisRead = (size_t)(pNext->off - offUnsigned); 329 329 330 330 RT_BZERO(pbDst, cbThisRead); … … 402 402 uint64_t cbMaxExtent = pNext->off - offExtent; 403 403 if (cbMaxExtent < cbExtent) 404 cbExtent = cbMaxExtent;404 cbExtent = (uint32_t)cbMaxExtent; 405 405 } 406 406 … … 490 490 * Copy the source data into the current extent. 491 491 */ 492 uint32_t const offDst = offUnsigned - pExtent->off;492 uint32_t const offDst = (uint32_t)(offUnsigned - pExtent->off); 493 493 uint32_t cbThisWrite = pExtent->cb - offDst; 494 494 if (cbThisWrite > cbLeftToWrite) … … 683 683 { 684 684 PRTVFSMEMFILE pThis = (PRTVFSMEMFILE)pvThis; 685 return pThis->Base.ObjInfo.cbObject; 685 *pcbFile = pThis->Base.ObjInfo.cbObject; 686 return VINF_SUCCESS; 686 687 } 687 688
Note:
See TracChangeset
for help on using the changeset viewer.