Changeset 34147 in vbox

Timestamp:

Nov 17, 2010 8:46:42 PM (14 years ago)

Author:

vboxsync

Message:

Storage: a few warnings and a typo

Location:

trunk/src/VBox/Storage

Files:

• DMG.cpp (modified) (2 diffs)
• Parallels.cpp (modified) (1 diff)
• VHD.cpp (modified) (2 diffs)

trunk/src/VBox/Storage/DMG.cpp

@@ -2103 +2103 @@
 
     /* Image must be opened and the new flags must be valid. */
-    if (!pThis || (uOpenFlags & ~(VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO || VD_OPEN_FLAGS_SHAREABLE | VD_OPEN_FLAGS_SEQUENTIAL)))
+    if (!pThis || (uOpenFlags & ~(VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO | VD_OPEN_FLAGS_SHAREABLE | VD_OPEN_FLAGS_SEQUENTIAL)))
     {
         rc = VERR_INVALID_PARAMETER;
@@ -2158 +2158 @@
         rc = VERR_VD_NOT_OPENED;
 
-out:
     LogFlowFunc(("returns %Rrc\n", rc));
     return rc;

trunk/src/VBox/Storage/Parallels.cpp

@@ -1014 +1014 @@
         rc = VERR_VD_NOT_OPENED;
 
-out:
     LogFlowFunc(("returns %Rrc\n", rc));
     return rc;

trunk/src/VBox/Storage/VHD.cpp

@@ -2151 +2151 @@
         rc = VERR_VD_NOT_OPENED;
 
-out:
     LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
@@ -2886 +2885 @@
             /* Calculate how many sectors nee to be relocated. */
             uint64_t cbOverlapping = offStartDataNew - offStartDataOld;
-            unsigned cBlocksReloc = cbOverlapping / cbBlock;
+            unsigned cBlocksReloc = (unsigned)(cbOverlapping / cbBlock);
             if (cbOverlapping % cbBlock)
                 cBlocksReloc++;