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

Timestamp:

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

Author:

vboxsync

Message:

VHDHDDCore.cpp: r=bird: check @todo in VHD_PLATFORM_CODE_WI2R update case. Fixed two size_t warnings.

File:

• trunk/src/VBox/Devices/Storage/VHDHDDCore.cpp (modified) (3 diffs)

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

@@ -249 +249 @@
     memcpy(pvBuf, tmp16, cTmp16Len * sizeof(*tmp16));
     if (pcbActualSize)
-        *pcbActualSize = cTmp16Len * sizeof(*tmp16);
+        *pcbActualSize = (uint32_t)(cTmp16Len * sizeof(*tmp16));
 
 out:
@@ -277 +277 @@
         case VHD_PLATFORM_CODE_WI2R:
             /* Update plain relative name. */
-            cb = strlen(pszFilename);
-            if (cb > cbMaxLen)
+            cb = (uint32_t)strlen(pszFilename);
+            if (cb > cbMaxLen) /** @todo r=bird: shoudln't this be cb >= cbMaxLen, or rather strlen() + 1? I don't dare update this without testing. */
             {
                 rc = VERR_FILENAME_TOO_LONG;
@@ -291 +291 @@
             if (RT_FAILURE(rc))
                 goto out;
-            pLocator->u32DataLength = RT_H2BE_U32(strlen((char *)pvBuf));
+            pLocator->u32DataLength = RT_H2BE_U32((uint32_t)strlen((const char *)pvBuf));
             break;
         case VHD_PLATFORM_CODE_W2RU: