Changeset 7158 in vbox for trunk/src/VBox

Timestamp:

Feb 26, 2008 6:07:58 PM (17 years ago)

Author:

vboxsync

Message:

Various size_t related 64bit cleanness fixes in the VDI code.

File:

• trunk/src/VBox/Devices/Storage/VDICore.cpp (modified) (5 diffs)

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

@@ -1152 +1152 @@
              * block if the data consists of just zeroes. */
             Assert(cbToWrite % 4 == 0);
-            if (ASMBitFirstSet((volatile void *)pvBuf, cbToWrite * 8) == -1)
+            if (ASMBitFirstSet((volatile void *)pvBuf, (uint32_t)cbToWrite * 8) == -1)
             {
                 pImage->paBlocks[uBlock] = VDI_IMAGE_BLOCK_ZERO;
@@ -1293 +1293 @@
     for (;;)
     {
-        unsigned to_write;
+        size_t to_write;
         if (offWrite + cbToWrite <= cbBlock)
             to_write = cbToWrite;
@@ -1695 +1695 @@
         {
             char *pszTmp = getImageComment(&pImage->Header);
-            unsigned cb = strlen(pszTmp);
+            size_t cb = strlen(pszTmp);
             if (cbComment > cb)
                 memcpy(pszComment, pszTmp, cb + 1);
@@ -3079 +3079 @@
     if (pImage)
     {
-        unsigned cb = strlen(pImage->szFilename);
+        size_t cb = strlen(pImage->szFilename);
         if (cb < cbFilename)
         {
@@ -3123 +3123 @@
     {
         char *pszTmp = getImageComment(&pImage->Header);
-        unsigned cb = strlen(pszTmp);
+        size_t cb = strlen(pszTmp);
         if (cb < cbComment)
         {