Changeset 48847 in vbox

Timestamp:

Oct 3, 2013 7:50:55 PM (11 years ago)

Author:

vboxsync

Message:

Addressing 64-bit windows warnings.

File:

• trunk/src/VBox/Storage/testcase/vbox-img.cpp (modified) (5 diffs)

trunk/src/VBox/Storage/testcase/vbox-img.cpp

@@ -434 +434 @@
     {
         /* Repeat reading until buffer is full or EOF. */
-        size_t cbSumRead = 0, cbRead;
-        uint8_t *pTmp = (uint8_t *)&pFS->abBuffer[0];
+        size_t cbRead;
+        size_t cbSumRead = 0;
+        uint8_t *pbTmp = (uint8_t *)&pFS->abBuffer[0];
         size_t cbTmp = sizeof(pFS->abBuffer);
         do
         {
-            rc = RTFileRead(pFS->file, pTmp, cbTmp, &cbRead);
+            rc = RTFileRead(pFS->file, pbTmp, cbTmp, &cbRead);
             if (RT_FAILURE(rc))
                 return rc;
-            pTmp += cbRead;
+            pbTmp += cbRead;
             cbTmp -= cbRead;
             cbSumRead += cbRead;
@@ -448 +449 @@
 
         pFS->offBuffer = 0;
-        pFS->cbBuffer = cbSumRead;
+        pFS->cbBuffer = (uint32_t)cbSumRead;
         if (!cbSumRead && !pcbRead) /* Caller can't handle partial reads. */
             return VERR_EOF;
@@ -468 +469 @@
 
             /* Repeat reading until buffer is full or EOF. */
-            size_t cbSumRead = 0, cbRead;
-            uint8_t *pTmp = (uint8_t *)&pFS->abBuffer[0];
+            size_t cbRead;
+            size_t cbSumRead = 0;
+            uint8_t *pbTmp = (uint8_t *)&pFS->abBuffer[0];
             size_t cbTmp = sizeof(pFS->abBuffer);
             do
             {
-                rc = RTFileRead(pFS->file, pTmp, cbTmp, &cbRead);
+                rc = RTFileRead(pFS->file, pbTmp, cbTmp, &cbRead);
                 if (RT_FAILURE(rc))
                     return rc;
-                pTmp += cbRead;
+                pbTmp += cbRead;
                 cbTmp -= cbRead;
                 cbSumRead += cbRead;
@@ -482 +484 @@
 
             pFS->offBuffer += pFS->cbBuffer;
-            pFS->cbBuffer = cbSumRead;
-        }
-
-        uint32_t cbThisRead = RT_MIN(cbBuffer,
-                                     pFS->cbBuffer - uOffset % sizeof(pFS->abBuffer));
+            pFS->cbBuffer = (uint32_t)cbSumRead;
+        }
+
+        uint32_t cbThisRead = (uint32_t)RT_MIN(cbBuffer,
+                                               pFS->cbBuffer - uOffset % sizeof(pFS->abBuffer));
         memcpy(pvBuffer, &pFS->abBuffer[uOffset % sizeof(pFS->abBuffer)],
                cbThisRead);
@@ -658 +660 @@
         }
 
-        uint32_t cbThisWrite = RT_MIN(cbBuffer,
-                                      sizeof(pFS->abBuffer) - uOffset % sizeof(pFS->abBuffer));
+        uint32_t cbThisWrite = (uint32_t)RT_MIN(cbBuffer,
+                                                sizeof(pFS->abBuffer) - uOffset % sizeof(pFS->abBuffer));
         memcpy(&pFS->abBuffer[uOffset % sizeof(pFS->abBuffer)], pvBuffer,
                cbThisWrite);