Changeset 23213 in vbox

Timestamp:

Sep 22, 2009 12:13:15 PM (15 years ago)

Author:

vboxsync

Message:

OffStart -> offStart; 'off' is an one of the prefixes we use, similar to 'cb', see coding guidelines. (There are more 'Off' and 'somethingOffset' names here, fix them if you like.)

File:

• trunk/src/VBox/VMM/PDMAsyncCompletionFileNormal.cpp (modified) (6 diffs)

trunk/src/VBox/VMM/PDMAsyncCompletionFileNormal.cpp

@@ -372 +372 @@
                  * need to be on a 512 boundary. */
                 size_t cbToTransfer = RT_ALIGN_Z(pCurr->DataSeg.cbSeg, 512);
-                RTFOFF OffStart = pCurr->Off & ~(RTFOFF)(512-1);
+                RTFOFF offStart = pCurr->Off & ~(RTFOFF)(512-1);
                 PDMACTASKFILETRANSFER enmTransferType = pCurr->enmTransferType;
 
                 AssertMsg(   pCurr->enmTransferType == PDMACTASKFILETRANSFER_WRITE
-                          || (uint64_t)(OffStart + cbToTransfer) <= pEndpoint->cbFile,
-                          ("Read exceeds file size OffStart=%RTfoff cbToTransfer=%d cbFile=%llu\n",
-                          OffStart, cbToTransfer, pEndpoint->cbFile));
+                          || (uint64_t)(offStart + cbToTransfer) <= pEndpoint->cbFile,
+                          ("Read exceeds file size offStart=%RTfoff cbToTransfer=%d cbFile=%llu\n",
+                          offStart, cbToTransfer, pEndpoint->cbFile));
 
                 pCurr->fPrefetch = false;
 
                 if (   RT_UNLIKELY(cbToTransfer != pCurr->DataSeg.cbSeg)
-                    || RT_UNLIKELY(OffStart != pCurr->Off)
+                    || RT_UNLIKELY(offStart != pCurr->Off)
                     || ((pEpClassFile->uBitmaskAlignment & (RTR3UINTPTR)pvBuf) != (RTR3UINTPTR)pvBuf))
                 {
@@ -389 +389 @@
                     pCurr->fBounceBuffer = true;
 
-                    AssertMsg(pCurr->Off >= OffStart, ("Overflow in calculation Off=%llu OffStart=%llu\n",
-                              pCurr->Off, OffStart));
-                    pCurr->uBounceBufOffset = pCurr->Off - OffStart;
+                    AssertMsg(pCurr->Off >= offStart, ("Overflow in calculation Off=%llu offStart=%llu\n",
+                              pCurr->Off, offStart));
+                    pCurr->uBounceBufOffset = pCurr->Off - offStart;
 
                     /** @todo: I think we need something like a RTMemAllocAligned method here.
@@ -405 +405 @@
                     {
                         if (   RT_UNLIKELY(cbToTransfer != pCurr->DataSeg.cbSeg)
-                            || RT_UNLIKELY(OffStart != pCurr->Off))
+                            || RT_UNLIKELY(offStart != pCurr->Off))
                         {
                             /* We have to fill the buffer first before we can update the data. */
@@ -431 +431 @@
 
                     rc = RTFileAioReqPrepareWrite(hReq, pEndpoint->File,
-                                                  OffStart, pvBuf, cbToTransfer, pCurr);
+                                                  offStart, pvBuf, cbToTransfer, pCurr);
                 }
                 else
                     rc = RTFileAioReqPrepareRead(hReq, pEndpoint->File,
-                                                 OffStart, pvBuf, cbToTransfer, pCurr);
+                                                 offStart, pvBuf, cbToTransfer, pCurr);
                 AssertRC(rc);
 
@@ -735 +735 @@
                         pTask->fPrefetch = false;
                         size_t cbToTransfer = RT_ALIGN_Z(pTask->DataSeg.cbSeg, 512);
-                        RTFOFF OffStart = pTask->Off & ~(RTFOFF)(512-1);
+                        RTFOFF offStart = pTask->Off & ~(RTFOFF)(512-1);
 
                         /* Grow the file if needed. */
@@ -745 +745 @@
 
                         rc = RTFileAioReqPrepareWrite(apReqs[i], pEndpoint->File,
-                                                      OffStart, pTask->pvBounceBuffer, cbToTransfer, pTask);
+                                                      offStart, pTask->pvBounceBuffer, cbToTransfer, pTask);
                         AssertRC(rc);
                         rc = RTFileAioCtxSubmit(pAioMgr->hAioCtx, &apReqs[i], 1);