Changeset 52063 in vbox

Timestamp:

Jul 16, 2014 8:19:00 PM (10 years ago)

Author:

vboxsync

Message:

build fix

File:

• trunk/src/VBox/Devices/Storage/DrvVD.cpp (modified) (1 diff)

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

@@ -1862 +1862 @@
 {
     LogFlowFunc(("\n"));
-    int rc = VINF_SUCCESS;
-    void *pvNew = NULL;
+    int rc;
     PVBOXDISK pThis = PDMIMEDIA_2_VBOXDISK(pInterface);
 
     /* Configured encryption requires locked down memory. */
     if (pThis->pCfgCrypto)
-        rc = RTMemSaferAllocZEx(&pvNew, cb, RTMEMSAFER_F_REQUIRE_NOT_PAGABLE);
+        rc = RTMemSaferAllocZEx(ppvNew, cb, RTMEMSAFER_F_REQUIRE_NOT_PAGABLE);
     else
     {
         cb = RT_ALIGN_Z(cb, _4K);
-        pvNew = RTMemPageAlloc(cb);
+        void *pvNew = RTMemPageAlloc(cb);
         if (RT_LIKELY(pvNew))
+        {
             *ppvNew = pvNew;
+            rc = VINF_SUCCESS;
+        }
         else
             rc = VERR_NO_MEMORY;