Changeset 47665 in vbox

Timestamp:

Aug 12, 2013 10:11:42 AM (11 years ago)

Author:

vboxsync

Message:

Seems vdIfIoFileReadSync/vdIfIoFileWriteSync want real actual offsets.

File:

• trunk/src/VBox/Storage/VDIfVfs.cpp (modified) (2 diffs)

trunk/src/VBox/Storage/VDIfVfs.cpp

@@ -86 +86 @@
      * This may end up being a little more complicated, esp. wrt VERR_EOF.
      */
+    if (off == -1)
+        off = pThis->offCurPos;
     int rc = vdIfIoFileReadSync(pThis->pVDIfsIo, pThis->pvStorage, off, pSgBuf[0].pvSegCur, pSgBuf->paSegs[0].cbSeg, pcbRead);
     if (RT_SUCCESS(rc))
-        pThis->offCurPos = (off == -1 ? pThis->offCurPos : off)
-                         + (pcbRead ? *pcbRead : pSgBuf->paSegs[0].cbSeg);
+        pThis->offCurPos = off + (pcbRead ? *pcbRead : pSgBuf->paSegs[0].cbSeg);
     return rc;
 }
@@ -105 +106 @@
      * This may end up being a little more complicated, esp. wrt VERR_EOF.
      */
+    if (off == -1)
+        off = pThis->offCurPos;
     int rc = vdIfIoFileWriteSync(pThis->pVDIfsIo, pThis->pvStorage, off, pSgBuf[0].pvSegCur, pSgBuf->paSegs[0].cbSeg, pcbWritten);
     if (RT_SUCCESS(rc))
-        pThis->offCurPos = (off == -1 ? pThis->offCurPos : off)
-                         + (pcbWritten ? *pcbWritten : pSgBuf->paSegs[0].cbSeg);
+        pThis->offCurPos = off + (pcbWritten ? *pcbWritten : pSgBuf->paSegs[0].cbSeg);
     return rc;
 }