Changeset 18505 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Mar 29, 2009 2:39:11 AM (16 years ago)

Author:

vboxsync

Message:

VmdkHDDCore.cpp: a bunch of size_t/unsigned mixups.

File:

• trunk/src/VBox/Devices/Storage/VmdkHDDCore.cpp (modified) (6 diffs)

trunk/src/VBox/Devices/Storage/VmdkHDDCore.cpp

@@ -891 +891 @@
 
         Marker.uSector = RT_H2LE_U64(uLBA);
-        Marker.cbSize = RT_H2LE_U32(cbToWrite);
+        Marker.cbSize = RT_H2LE_U32((uint32_t)cbToWrite);
         if (uMarker == VMDK_MARKER_IGNORE)
         {
@@ -5704 +5704 @@
     unsigned cTasksToSubmit = 0;
     PPDMDATASEG paSegCurrent = paSeg;
-    unsigned cbLeftInCurrentSegment = paSegCurrent->cbSeg;
-    unsigned uOffsetInCurrentSegment = 0;
+    size_t cbLeftInCurrentSegment = paSegCurrent->cbSeg;
+    size_t uOffsetInCurrentSegment = 0;
 
     AssertPtr(pImage);
@@ -5720 +5720 @@
     while (cbRead && cSeg)
     {
-        unsigned cbToRead;
+        size_t cbToRead;
         uint64_t uSectorExtentRel;
 
@@ -5747 +5747 @@
                 void *pTask;
                 rc = pImage->pInterfaceAsyncIOCallbacks->pfnPrepareRead(pImage->pInterfaceAsyncIO->pvUser, pExtent->pFile->pStorage,
-                                                                       VMDK_SECTOR2BYTE(uSectorExtentRel),
-                                                                       (uint8_t *)paSegCurrent->pvSeg + uOffsetInCurrentSegment,
-                                                                       cbToRead, &pTask);
+                                                                        VMDK_SECTOR2BYTE(uSectorExtentRel),
+                                                                        (uint8_t *)paSegCurrent->pvSeg + uOffsetInCurrentSegment,
+                                                                        cbToRead, &pTask);
                 if (RT_FAILURE(rc))
                 {
@@ -5840 +5840 @@
     unsigned cTasksToSubmit = 0;
     PPDMDATASEG paSegCurrent = paSeg;
-    unsigned cbLeftInCurrentSegment = paSegCurrent->cbSeg;
-    unsigned uOffsetInCurrentSegment = 0;
+    size_t cbLeftInCurrentSegment = paSegCurrent->cbSeg;
+    size_t uOffsetInCurrentSegment = 0;
 
     AssertPtr(pImage);
@@ -5856 +5856 @@
     while (cbWrite && cSeg)
     {
-        unsigned cbToWrite;
+        size_t cbToWrite;
         uint64_t uSectorExtentRel;