Changeset 98289 in vbox for trunk/src

Timestamp:

Jan 24, 2023 4:02:15 PM (2 years ago)

Author:

vboxsync

Message:

Main/src-server: rc -> hrc/vrc (partial). bugref:10223

Location:

trunk/src/VBox/Main/src-server

Files:

• ApplianceImpl.cpp (modified) (3 diffs)
• ApplianceImplExport.cpp (modified) (3 diffs)
• ApplianceImplImport.cpp (modified) (7 diffs)
• MachineImplMoveVM.cpp (modified) (28 diffs)
• MediumIOImpl.cpp (modified) (6 diffs)
• MediumImpl.cpp (modified) (131 diffs)
• SnapshotImpl.cpp (modified) (3 diffs)
• VFSExplorerImpl.cpp (modified) (4 diffs)
• VirtualBoxImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-server/ApplianceImpl.cpp

@@ -713 +713 @@
         hrc = explorer->init(li.storageType, li.strPath, li.strHostname, li.strUsername, li.strPassword, mVirtualBox);
     }
-    catch (HRESULT aRC)
-    {
-        hrc = aRC;
+    catch (HRESULT hrcXcpt)
+    {
+        hrc = hrcXcpt;
     }
 
@@ -767 +767 @@
         *aCreated = i;
     }
-    catch (HRESULT aRC)
+    catch (HRESULT hrcXcpt)
     {
         for (; i>0; --i)
@@ -776 +776 @@
                 break;
         }
-        hrc = aRC;
+        hrc = hrcXcpt;
     }
 

trunk/src/VBox/Main/src-server/ApplianceImplExport.cpp

@@ -726 +726 @@
             hrc = i_writeCloudImpl(m->locInfo, progress);
         }
-        catch (HRESULT aRC)
-        {
-            hrc = aRC;
+        catch (HRESULT hrcXcpt)
+        {
+            hrc = hrcXcpt;
         }
 
@@ -816 +816 @@
 
         }
-        catch (HRESULT aRC)
-        {
-            hrc = aRC;
+        catch (HRESULT hrcXcpt)
+        {
+            hrc = hrcXcpt;
         }
 
@@ -2816 +2816 @@
         hrc = setError(VBOX_E_FILE_ERROR, x.what());
     }
-    catch (HRESULT aRC)
-    {
-        hrc = aRC;
+    catch (HRESULT hrcXcpt)
+    {
+        hrc = hrcXcpt;
     }
 

trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp

@@ -106 +106 @@
         i_parseURI(aFile, m->locInfo); /* may throw hrc. */
     }
-    catch (HRESULT aRC)
-    {
-        return aRC;
+    catch (HRESULT hrcXcpt)
+    {
+        return hrcXcpt;
     }
     catch (std::bad_alloc &)
@@ -795 +795 @@
         }
     }
-    catch (HRESULT aRC)
+    catch (HRESULT hrcXcpt)
     {
         /* On error we clear the list & return */
         m->virtualSystemDescriptions.clear();
-        hrc = aRC;
+        hrc = hrcXcpt;
     }
 
@@ -2572 +2572 @@
         hrc = setError(VBOX_E_FILE_ERROR, rXcpt.what());
     }
-    catch (HRESULT aRC)
-    {
-        hrc = aRC;
+    catch (HRESULT hrcXcpt)
+    {
+        hrc = hrcXcpt;
     }
     catch (...)
@@ -4865 +4865 @@
             stack.fSessionOpen = false;
         }
-        catch(HRESULT aRC)
+        catch (HRESULT hrcXcpt)
         {
             com::ErrorInfo info;
@@ -4873 +4873 @@
 
             if (info.isFullAvailable())
-                throw setError(aRC, Utf8Str(info.getText()).c_str());
+                throw setError(hrcXcpt, Utf8Str(info.getText()).c_str());
             else
-                throw setError(aRC, tr("Unknown error during OVF import"));
+                throw setError(hrcXcpt, tr("Unknown error during OVF import"));
         }
     }
@@ -5217 +5217 @@
             stack.fSessionOpen = false;
         }
-        catch(HRESULT aRC)
+        catch (HRESULT hrcXcpt)
         {
             com::ErrorInfo info;
@@ -5224 +5224 @@
 
             if (info.isFullAvailable())
-                throw setError(aRC, Utf8Str(info.getText()).c_str());
+                throw setError(hrcXcpt, Utf8Str(info.getText()).c_str());
             else
-                throw setError(aRC, tr("Unknown error during OVF import"));
+                throw setError(hrcXcpt, tr("Unknown error during OVF import"));
         }
     }

trunk/src/VBox/Main/src-server/MachineImplMoveVM.cpp

@@ -50 +50 @@
     HRESULT add(const Utf8Str &folder, const Utf8Str &file)
     {
-        HRESULT rc = S_OK;
         m_list.insert(std::make_pair(folder, file));
-        return rc;
+        return S_OK;
     }
 
     HRESULT add(const Utf8Str &fullPath)
     {
-        HRESULT rc = S_OK;
         Utf8Str folder = fullPath;
         folder.stripFilename();
@@ -63 +61 @@
         filename.stripPath();
         m_list.insert(std::make_pair(folder, filename));
-        return rc;
+        return S_OK;
     }
 
     HRESULT removeFileFromList(const Utf8Str &fullPath)
     {
-        HRESULT rc = S_OK;
         Utf8Str folder = fullPath;
         folder.stripFilename();
@@ -86 +83 @@
         }
 
-        return rc;
+        return S_OK;
     }
 
     HRESULT removeFileFromList(const Utf8Str &path, const Utf8Str &fileName)
     {
-        HRESULT rc = S_OK;
         rangeRes_t res = m_list.equal_range(path);
         for (it_t it=res.first; it!=res.second;)
@@ -104 +100 @@
                 ++it;
         }
-        return rc;
+        return S_OK;
     }
 
     HRESULT removeFolderFromList(const Utf8Str &path)
     {
-        HRESULT rc = S_OK;
         m_list.erase(path);
-        return rc;
+        return S_OK;
     }
 
@@ -590 +585 @@
 
     BOOL fCanceled = false;
-    HRESULT rc = pProgress->COMGETTER(Canceled)(&fCanceled);
-    if (FAILED(rc)) return VERR_GENERAL_FAILURE;
+    HRESULT hrc = pProgress->COMGETTER(Canceled)(&fCanceled);
+    if (FAILED(hrc)) return VERR_GENERAL_FAILURE;
     /* If canceled by the user tell it to the copy operation. */
     if (fCanceled) return VERR_CANCELLED;
     /* Set the new process. */
-    rc = pProgress->SetCurrentOperationProgress(uPercentage);
-    if (FAILED(rc)) return VERR_GENERAL_FAILURE;
+    hrc = pProgress->SetCurrentOperationProgress(uPercentage);
+    if (FAILED(hrc)) return VERR_GENERAL_FAILURE;
 
     return VINF_SUCCESS;
@@ -1141 +1136 @@
                                     const Utf8Str &strTargetFolder)
 {
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
     ComObjPtr<Machine> &machine = m_pMachine;
     Utf8Str strLocation;
@@ -1158 +1153 @@
             Bstr bstrSrcName;
 
-            rc = pMedium->COMGETTER(Name)(bstrSrcName.asOutParam());
-            if (FAILED(rc)) throw rc;
+            hrc = pMedium->COMGETTER(Name)(bstrSrcName.asOutParam());
+            if (FAILED(hrc)) throw hrc;
 
             if (strTargetFolder.isNotEmpty())
             {
                 strTargetImageName = strTargetFolder;
-                rc = pMedium->COMGETTER(Location)(bstrLocation.asOutParam());
-                if (FAILED(rc)) throw rc;
+                hrc = pMedium->COMGETTER(Location)(bstrLocation.asOutParam());
+                if (FAILED(hrc)) throw hrc;
                 strLocation = bstrLocation;
 
@@ -1174 +1169 @@
 
                 strTargetImageName.append(RTPATH_DELIMITER).append(strLocation);
-                rc = m_pProgress->SetNextOperation(BstrFmt(tr("Moving medium '%ls' ..."),
-                                                           bstrSrcName.raw()).raw(),
-                                                   mt.uWeight);
-                if (FAILED(rc)) throw rc;
+                hrc = m_pProgress->SetNextOperation(BstrFmt(tr("Moving medium '%ls' ..."), bstrSrcName.raw()).raw(), mt.uWeight);
+                if (FAILED(hrc)) throw hrc;
             }
             else
             {
                 strTargetImageName = mt.strBaseName;//Should contain full path to the image
-                rc = m_pProgress->SetNextOperation(BstrFmt(tr("Moving medium '%ls' back..."),
-                                                           bstrSrcName.raw()).raw(),
-                                                   mt.uWeight);
-                if (FAILED(rc)) throw rc;
+                hrc = m_pProgress->SetNextOperation(BstrFmt(tr("Moving medium '%ls' back..."), bstrSrcName.raw()).raw(), mt.uWeight);
+                if (FAILED(hrc)) throw hrc;
             }
 
@@ -1196 +1187 @@
 
             MediumType_T mediumType;//immutable, shared, passthrough
-            rc = pMedium->COMGETTER(Type)(&mediumType);
-            if (FAILED(rc)) throw rc;
+            hrc = pMedium->COMGETTER(Type)(&mediumType);
+            if (FAILED(hrc)) throw hrc;
 
             DeviceType_T deviceType;//floppy, hard, DVD
-            rc = pMedium->COMGETTER(DeviceType)(&deviceType);
-            if (FAILED(rc)) throw rc;
+            hrc = pMedium->COMGETTER(DeviceType)(&deviceType);
+            if (FAILED(hrc)) throw hrc;
 
             /* Drop lock early because IMedium::MoveTo needs to get the VirtualBox one. */
@@ -1207 +1198 @@
 
             ComPtr<IProgress> moveDiskProgress;
-            rc = pMedium->MoveTo(bstrLocation.raw(), moveDiskProgress.asOutParam());
-            if (SUCCEEDED(rc))
+            hrc = pMedium->MoveTo(bstrLocation.raw(), moveDiskProgress.asOutParam());
+            if (SUCCEEDED(hrc))
             {
                 /* In case of failure moveDiskProgress would be in the invalid state or not initialized at all
@@ -1214 +1205 @@
                  */
                 /* Wait until the other process has finished. */
-                rc = m_pProgress->WaitForOtherProgressCompletion(moveDiskProgress, 0 /* indefinite wait */);
+                hrc = m_pProgress->WaitForOtherProgressCompletion(moveDiskProgress, 0 /* indefinite wait */);
             }
 
@@ -1220 +1211 @@
             machineLock.acquire();
 
-            if (FAILED(rc)) throw rc;
+            if (FAILED(hrc)) throw hrc;
 
             Log2(("Moving %s has been finished\n", strTargetImageName.c_str()));
@@ -1229 +1220 @@
         machineLock.release();
     }
-    catch(HRESULT hrc)
+    catch (HRESULT hrcXcpt)
+    {
+        Log2(("Exception during moving the disk %s: %Rhrc\n", strLocation.c_str(), hrcXcpt));
+        hrc = hrcXcpt;
+        machineLock.release();
+    }
+    catch (...)
     {
         Log2(("Exception during moving the disk %s\n", strLocation.c_str()));
-        rc = hrc;
+        hrc = VirtualBoxBase::handleUnexpectedExceptions(m_pMachine, RT_SRC_POS);
         machineLock.release();
     }
-    catch (...)
-    {
-        Log2(("Exception during moving the disk %s\n", strLocation.c_str()));
-        rc = VirtualBoxBase::handleUnexpectedExceptions(m_pMachine, RT_SRC_POS);
-        machineLock.release();
-    }
-
-    return rc;
+
+    return hrc;
 }
 
@@ -1248 +1239 @@
 {
     ComObjPtr<Snapshot> pSnapshot;
-    HRESULT rc = m_pMachine->i_findSnapshotById(Guid() /* zero */, pSnapshot, true);
-    if (SUCCEEDED(rc) && !pSnapshot.isNull())
+    HRESULT hrc = m_pMachine->i_findSnapshotById(Guid() /* zero */, pSnapshot, true);
+    if (SUCCEEDED(hrc) && !pSnapshot.isNull())
         pSnapshot->i_updateSavedStatePaths(sourcePath.c_str(),
                                            targetPath.c_str());
@@ -1269 +1260 @@
 {
     ComObjPtr<Snapshot> pSnapshot;
-    HRESULT rc = m_pMachine->i_findSnapshotById(Guid() /* zero */, pSnapshot, true);
-    if (SUCCEEDED(rc) && !pSnapshot.isNull())
+    HRESULT hrc = m_pMachine->i_findSnapshotById(Guid() /* zero */, pSnapshot, true);
+    if (SUCCEEDED(hrc) && !pSnapshot.isNull())
         pSnapshot->i_updateNVRAMPaths(sourcePath.c_str(),
                                       targetPath.c_str());
@@ -1413 +1404 @@
 {
     ComPtr<IMedium> pBaseMedium;
-    HRESULT rc = pMedium->COMGETTER(Base)(pBaseMedium.asOutParam());
-    if (FAILED(rc)) return rc;
+    HRESULT hrc = pMedium->COMGETTER(Base)(pBaseMedium.asOutParam());
+    if (FAILED(hrc)) return hrc;
     Bstr bstrBaseName;
-    rc = pBaseMedium->COMGETTER(Name)(bstrBaseName.asOutParam());
-    if (FAILED(rc)) return rc;
+    hrc = pBaseMedium->COMGETTER(Name)(bstrBaseName.asOutParam());
+    if (FAILED(hrc)) return hrc;
     strBaseName = bstrBaseName;
-    return rc;
+    return hrc;
 }
 
@@ -1425 +1416 @@
 {
     Bstr name;
-    HRESULT rc = pSnapshot->COMGETTER(Name)(name.asOutParam());
-    if (FAILED(rc)) return rc;
+    HRESULT hrc = pSnapshot->COMGETTER(Name)(name.asOutParam());
+    if (FAILED(hrc)) return hrc;
 
     ComPtr<IMachine> l_pMachine;
-    rc = pSnapshot->COMGETTER(Machine)(l_pMachine.asOutParam());
-    if (FAILED(rc)) return rc;
+    hrc = pSnapshot->COMGETTER(Machine)(l_pMachine.asOutParam());
+    if (FAILED(hrc)) return hrc;
     machineList.push_back((Machine*)(IMachine*)l_pMachine);
 
     SafeIfaceArray<ISnapshot> sfaChilds;
-    rc = pSnapshot->COMGETTER(Children)(ComSafeArrayAsOutParam(sfaChilds));
-    if (FAILED(rc)) return rc;
+    hrc = pSnapshot->COMGETTER(Children)(ComSafeArrayAsOutParam(sfaChilds));
+    if (FAILED(hrc)) return hrc;
     for (size_t i = 0; i < sfaChilds.size(); ++i)
     {
-        rc = createMachineList(sfaChilds[i]);
-        if (FAILED(rc)) return rc;
-    }
-
-    return rc;
+        hrc = createMachineList(sfaChilds[i]);
+        if (FAILED(hrc)) return hrc;
+    }
+
+    return hrc;
 }
 
@@ -1450 +1441 @@
      * adding all directly and indirectly attached disk images to the worker
      * list. */
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
     for (size_t i = 0; i < machineList.size(); ++i)
     {
@@ -1458 +1449 @@
          * machines to a worker list. */
         SafeIfaceArray<IMediumAttachment> sfaAttachments;
-        rc = machine->COMGETTER(MediumAttachments)(ComSafeArrayAsOutParam(sfaAttachments));
-        if (FAILED(rc)) return rc;
+        hrc = machine->COMGETTER(MediumAttachments)(ComSafeArrayAsOutParam(sfaAttachments));
+        if (FAILED(hrc)) return hrc;
         for (size_t a = 0; a < sfaAttachments.size(); ++a)
         {
             const ComPtr<IMediumAttachment> &pAtt = sfaAttachments[a];
             DeviceType_T deviceType;//floppy, hard, DVD
-            rc = pAtt->COMGETTER(Type)(&deviceType);
-            if (FAILED(rc)) return rc;
+            hrc = pAtt->COMGETTER(Type)(&deviceType);
+            if (FAILED(hrc)) return hrc;
 
             /* Valid medium attached? */
             ComPtr<IMedium> pMedium;
-            rc = pAtt->COMGETTER(Medium)(pMedium.asOutParam());
-            if (FAILED(rc)) return rc;
+            hrc = pAtt->COMGETTER(Medium)(pMedium.asOutParam());
+            if (FAILED(hrc)) return hrc;
 
             if (pMedium.isNull())
@@ -1476 +1467 @@
 
             Bstr bstrLocation;
-            rc = pMedium->COMGETTER(Location)(bstrLocation.asOutParam());
-            if (FAILED(rc)) return rc;
+            hrc = pMedium->COMGETTER(Location)(bstrLocation.asOutParam());
+            if (FAILED(hrc)) return hrc;
 
             /* Cast to ComObjPtr<Medium> */
@@ -1483 +1474 @@
 
             /* Check for "read-only" medium in terms that VBox can't create this one */
-            rc = isMediumTypeSupportedForMoving(pMedium);
-            if (FAILED(rc))
-            {
-                if (rc == S_FALSE)
-                {
-                    Log2(("Skipping file %ls because of this medium type hasn't been supported for moving.\n",
-                          bstrLocation.raw()));
-                    continue;
-                }
-                else
-                    return rc;
+            hrc = isMediumTypeSupportedForMoving(pMedium);
+            if (FAILED(hrc))
+            {
+                if (hrc != S_FALSE)
+                    return hrc;
+                Log2(("Skipping file %ls because of this medium type hasn't been supported for moving.\n", bstrLocation.raw()));
+                continue;
             }
 
@@ -1505 +1492 @@
                 /* Refresh the state so that the file size get read. */
                 MediumState_T e;
-                rc = pMedium->RefreshState(&e);
-                if (FAILED(rc)) return rc;
+                hrc = pMedium->RefreshState(&e);
+                if (FAILED(hrc)) return hrc;
 
                 LONG64 lSize;
-                rc = pMedium->COMGETTER(Size)(&lSize);
-                if (FAILED(rc)) return rc;
+                hrc = pMedium->COMGETTER(Size)(&lSize);
+                if (FAILED(hrc)) return hrc;
 
                 MediumType_T mediumType;//immutable, shared, passthrough
-                rc = pMedium->COMGETTER(Type)(&mediumType);
-                if (FAILED(rc)) return rc;
-
-                rc = pMedium->COMGETTER(Location)(bstrLocation.asOutParam());
-                if (FAILED(rc)) return rc;
+                hrc = pMedium->COMGETTER(Type)(&mediumType);
+                if (FAILED(hrc)) return hrc;
+
+                hrc = pMedium->COMGETTER(Location)(bstrLocation.asOutParam());
+                if (FAILED(hrc)) return hrc;
 
                 MEDIUMTASKMOVE mt;// = {false, "basename", NULL, 0, 0};
@@ -1534 +1521 @@
 
                 /* Query next parent. */
-                rc = pMedium->COMGETTER(Parent)(pMedium.asOutParam());
-                if (FAILED(rc)) return rc;
+                hrc = pMedium->COMGETTER(Parent)(pMedium.asOutParam());
+                if (FAILED(hrc)) return hrc;
             }
 
@@ -1542 +1529 @@
 
         /* Add the save state files of this machine if there is one. */
-        rc = addSaveState(machine);
-        if (FAILED(rc)) return rc;
+        hrc = addSaveState(machine);
+        if (FAILED(hrc)) return hrc;
 
         /* Add the NVRAM files of this machine if there is one. */
-        rc = addNVRAM(machine);
-        if (FAILED(rc)) return rc;
+        hrc = addNVRAM(machine);
+        if (FAILED(hrc)) return hrc;
     }
 
@@ -1561 +1548 @@
     }
 
-    return rc;
+    return hrc;
 }
 
@@ -1567 +1554 @@
 {
     Bstr bstrSrcSaveStatePath;
-    HRESULT rc = machine->COMGETTER(StateFilePath)(bstrSrcSaveStatePath.asOutParam());
-    if (FAILED(rc)) return rc;
+    HRESULT hrc = machine->COMGETTER(StateFilePath)(bstrSrcSaveStatePath.asOutParam());
+    if (FAILED(hrc)) return hrc;
     if (!bstrSrcSaveStatePath.isEmpty())
     {
@@ -1595 +1582 @@
 {
     ComPtr<INvramStore> pNvramStore;
-    HRESULT rc = machine->COMGETTER(NonVolatileStore)(pNvramStore.asOutParam());
-    if (FAILED(rc)) return rc;
+    HRESULT hrc = machine->COMGETTER(NonVolatileStore)(pNvramStore.asOutParam());
+    if (FAILED(hrc)) return hrc;
     Bstr bstrSrcNVRAMPath;
-    rc = pNvramStore->COMGETTER(NonVolatileStorageFile)(bstrSrcNVRAMPath.asOutParam());
-    if (FAILED(rc)) return rc;
+    hrc = pNvramStore->COMGETTER(NonVolatileStorageFile)(bstrSrcNVRAMPath.asOutParam());
+    if (FAILED(hrc)) return hrc;
     Utf8Str strSrcNVRAMPath(bstrSrcNVRAMPath);
     if (!strSrcNVRAMPath.isEmpty() && RTFileExists(strSrcNVRAMPath.c_str()))
@@ -1652 +1639 @@
 {
     Bstr bstrLocation;
-    HRESULT rc = pMedium->COMGETTER(Location)(bstrLocation.asOutParam());
-    if (FAILED(rc))
-        return rc;
+    HRESULT hrc = pMedium->COMGETTER(Location)(bstrLocation.asOutParam());
+    if (FAILED(hrc))
+        return hrc;
 
     DeviceType_T deviceType;
-    rc = pMedium->COMGETTER(DeviceType)(&deviceType);
-    if (FAILED(rc))
-        return rc;
+    hrc = pMedium->COMGETTER(DeviceType)(&deviceType);
+    if (FAILED(hrc))
+        return hrc;
 
     ComPtr<IMediumFormat> mediumFormat;
-    rc = pMedium->COMGETTER(MediumFormat)(mediumFormat.asOutParam());
-    if (FAILED(rc))
-        return rc;
+    hrc = pMedium->COMGETTER(MediumFormat)(mediumFormat.asOutParam());
+    if (FAILED(hrc))
+        return hrc;
 
     /* Check whether VBox is able to create this medium format or not, i.e. medium can be "read-only" */
     Bstr bstrFormatName;
-    rc = mediumFormat->COMGETTER(Name)(bstrFormatName.asOutParam());
-    if (FAILED(rc))
-        return rc;
+    hrc = mediumFormat->COMGETTER(Name)(bstrFormatName.asOutParam());
+    if (FAILED(hrc))
+        return hrc;
 
     Utf8Str formatName = Utf8Str(bstrFormatName);

trunk/src/VBox/Main/src-server/MediumIOImpl.cpp

@@ -115 +115 @@
           mVirtualBoxCaller(NULL)
     {
-        AssertReturnVoidStmt(pMediumIO, mRC = E_FAIL);
-        AssertReturnVoidStmt(pDataStream, mRC = E_FAIL);
-        mRC = mMediumCaller.hrc();
-        if (FAILED(mRC))
+        AssertReturnVoidStmt(pMediumIO, mHrc = E_FAIL);
+        AssertReturnVoidStmt(pDataStream, mHrc = E_FAIL);
+        mHrc = mMediumCaller.hrc();
+        if (FAILED(mHrc))
             return;
 
@@ -125 +125 @@
         mVirtualBox = pVirtualBox;
         mVirtualBoxCaller.attach(pVirtualBox);
-        mRC = mVirtualBoxCaller.hrc();
-        if (FAILED(mRC))
+        mHrc = mVirtualBoxCaller.hrc();
+        if (FAILED(mHrc))
             return;
     }
@@ -136 +136 @@
         if (   isAsync()
             && !mProgress.isNull())
-            mProgress->i_notifyComplete(mRC);
-    }
-
-    HRESULT hrc() const { return mRC; }
+            mProgress->i_notifyComplete(mHrc);
+    }
+
+    HRESULT hrc() const { return mHrc; }
     bool isOk() const { return SUCCEEDED(hrc()); }
 
@@ -153 +153 @@
         try
         {
-            mRC = executeTask(); /* (destructor picks up mRC, see above) */
-            LogFlowFunc(("hrc=%Rhrc\n", mRC));
+            mHrc = executeTask(); /* (destructor picks up mHrc, see above) */
+            LogFlowFunc(("hrc=%Rhrc\n", mHrc));
         }
         catch (...)
@@ -168 +168 @@
 
 protected:
-    HRESULT         mRC;
+    HRESULT         mHrc;
 
     ComObjPtr<DataStream> m_pDataStream;
@@ -843 +843 @@
             throw rc;
     }
-    catch (HRESULT aRC) { rc = aRC; }
+    catch (HRESULT hrcXcpt) { rc = hrcXcpt; }
 
     if (SUCCEEDED(rc))

trunk/src/VBox/Main/src-server/MediumImpl.cpp

@@ -308 +308 @@
           mNotifyAboutChanges(fNotifyAboutChanges)
     {
-        AssertReturnVoidStmt(aMedium, mRC = E_FAIL);
-        mRC = mMediumCaller.hrc();
-        if (FAILED(mRC))
+        AssertReturnVoidStmt(aMedium, mHrc = E_FAIL);
+        mHrc = mMediumCaller.hrc();
+        if (FAILED(mHrc))
             return;
 
@@ -317 +317 @@
         mVirtualBox = pVirtualBox;
         mVirtualBoxCaller.attach(pVirtualBox);
-        mRC = mVirtualBoxCaller.hrc();
-        if (FAILED(mRC))
+        mHrc = mVirtualBoxCaller.hrc();
+        if (FAILED(mHrc))
             return;
 
@@ -334 +334 @@
             AssertRC(vrc);
             if (RT_FAILURE(vrc))
-                mRC = E_FAIL;
+                mHrc = E_FAIL;
         }
     }
@@ -344 +344 @@
         if (   isAsync()
             && !mProgress.isNull())
-            mProgress->i_notifyComplete(mRC);
-    }
-
-    HRESULT hrc() const { return mRC; }
+            mProgress->i_notifyComplete(mHrc);
+    }
+
+    HRESULT hrc() const { return mHrc; }
     bool isOk() const { return SUCCEEDED(hrc()); }
     bool NotifyAboutChanges() const { return mNotifyAboutChanges; }
@@ -361 +361 @@
         LogFlowFuncEnter();
 
-        mRC = executeTask();
-
-        LogFlowFunc(("rc=%Rhrc\n", mRC));
+        mHrc = executeTask();
+
+        LogFlowFunc(("hrc=%Rhrc\n", mHrc));
         LogFlowFuncLeave();
-        return mRC;
+        return mHrc;
     }
 
@@ -377 +377 @@
         try
         {
-            mRC = executeTask(); /* (destructor picks up mRC, see above) */
-            LogFlowFunc(("rc=%Rhrc\n", mRC));
+            mHrc = executeTask(); /* (destructor picks up mHrc, see above) */
+            LogFlowFunc(("hrc=%Rhrc\n", mHrc));
         }
         catch (...)
@@ -394 +394 @@
 
 protected:
-    HRESULT mRC;
+    HRESULT mHrc;
 
 private:
@@ -455 +455 @@
           mfKeepMediumLockList(fKeepMediumLockList)
     {
-        AssertReturnVoidStmt(aTarget != NULL, mRC = E_FAIL);
-        mRC = mTargetCaller.hrc();
-        if (FAILED(mRC))
+        AssertReturnVoidStmt(aTarget != NULL, mHrc = E_FAIL);
+        mHrc = mTargetCaller.hrc();
+        if (FAILED(mHrc))
             return;
         m_strTaskName = "createDiff";
@@ -513 +513 @@
           mfKeepTargetMediumLockList(fKeepTargetMediumLockList)
     {
-        AssertReturnVoidStmt(aTarget != NULL, mRC = E_FAIL);
-        mRC = mTargetCaller.hrc();
-        if (FAILED(mRC))
+        AssertReturnVoidStmt(aTarget != NULL, mHrc = E_FAIL);
+        mHrc = mTargetCaller.hrc();
+        if (FAILED(mHrc))
             return;
         /* aParent may be NULL */
-        mRC = mParentCaller.hrc();
-        if (FAILED(mRC))
+        mHrc = mParentCaller.hrc();
+        if (FAILED(mHrc))
             return;
-        AssertReturnVoidStmt(aSourceMediumLockList != NULL, mRC = E_FAIL);
-        AssertReturnVoidStmt(aTargetMediumLockList != NULL, mRC = E_FAIL);
+        AssertReturnVoidStmt(aSourceMediumLockList != NULL, mHrc = E_FAIL);
+        AssertReturnVoidStmt(aTargetMediumLockList != NULL, mHrc = E_FAIL);
         m_strTaskName = "createClone";
     }
@@ -569 +569 @@
           mfKeepMediumLockList(fKeepMediumLockList)
     {
-        AssertReturnVoidStmt(aMediumLockList != NULL, mRC = E_FAIL);
+        AssertReturnVoidStmt(aMediumLockList != NULL, mHrc = E_FAIL);
         m_strTaskName = "createMove";
     }
@@ -603 +603 @@
           mfKeepMediumLockList(fKeepMediumLockList)
     {
-        AssertReturnVoidStmt(aMediumLockList != NULL, mRC = E_FAIL);
+        AssertReturnVoidStmt(aMediumLockList != NULL, mHrc = E_FAIL);
         m_strTaskName = "createCompact";
     }
@@ -638 +638 @@
           mfKeepMediumLockList(fKeepMediumLockList)
     {
-        AssertReturnVoidStmt(aMediumLockList != NULL, mRC = E_FAIL);
+        AssertReturnVoidStmt(aMediumLockList != NULL, mHrc = E_FAIL);
         m_strTaskName = "createResize";
     }
@@ -746 +746 @@
           mfKeepMediumLockList(fKeepMediumLockList)
     {
-        AssertReturnVoidStmt(aMediumLockList != NULL, mRC = E_FAIL);
+        AssertReturnVoidStmt(aMediumLockList != NULL, mHrc = E_FAIL);
         m_strTaskName = "createMerge";
     }
@@ -800 +800 @@
           mfKeepTargetMediumLockList(fKeepTargetMediumLockList)
     {
-        AssertReturnVoidStmt(aTargetMediumLockList != NULL, mRC = E_FAIL);
+        AssertReturnVoidStmt(aTargetMediumLockList != NULL, mHrc = E_FAIL);
         /* aParent may be NULL */
-        mRC = mParentCaller.hrc();
-        if (FAILED(mRC))
+        mHrc = mParentCaller.hrc();
+        if (FAILED(mHrc))
             return;
 
@@ -809 +809 @@
 
         int vrc = VDIfCreateFromVfsStream(aVfsIosSrc, RTFILE_O_READ, &mpVfsIoIf);
-        AssertRCReturnVoidStmt(vrc, mRC = E_FAIL);
+        AssertRCReturnVoidStmt(vrc, mHrc = E_FAIL);
 
         vrc = VDInterfaceAdd(&mpVfsIoIf->Core, "Medium::ImportTaskVfsIos",
                              VDINTERFACETYPE_IO, mpVfsIoIf,
                              sizeof(VDINTERFACEIO), &mVDImageIfaces);
-        AssertRCReturnVoidStmt(vrc, mRC = E_FAIL);
+        AssertRCReturnVoidStmt(vrc, mHrc = E_FAIL);
         m_strTaskName = "createImport";
     }
@@ -864 +864 @@
           mpMediumLockList(aMediumLockList)
     {
-        AssertReturnVoidStmt(aMediumLockList != NULL, mRC = E_FAIL);
+        AssertReturnVoidStmt(aMediumLockList != NULL, mHrc = E_FAIL);
         /* aParent may be NULL */
-        mRC = mParentCaller.hrc();
-        if (FAILED(mRC))
+        mHrc = mParentCaller.hrc();
+        if (FAILED(mHrc))
             return;
 
@@ -1036 +1036 @@
     AssertReturn(autoInitSpan.isOk(), E_FAIL);
 
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
 
     unconst(m->pVirtualBox) = aVirtualBox;
@@ -1053 +1053 @@
     /* No storage unit is created yet, no need to call Medium::i_queryInfo */
 
-    rc = i_setFormat(aFormat);
-    if (FAILED(rc)) return rc;
-
-    rc = i_setLocation(aLocation);
-    if (FAILED(rc)) return rc;
+    hrc = i_setFormat(aFormat);
+    if (FAILED(hrc)) return hrc;
+
+    hrc = i_setLocation(aLocation);
+    if (FAILED(hrc)) return hrc;
 
     if (!(m->formatObj->i_getCapabilities() & (  MediumFormatCapabilities_CreateFixed
@@ -1096 +1096 @@
         }
 
-        rc = m->pVirtualBox->i_registerMedium(this, &pMedium, treeLock);
-        Assert(this == pMedium || FAILED(rc));
+        hrc = m->pVirtualBox->i_registerMedium(this, &pMedium, treeLock);
+        Assert(this == pMedium || FAILED(hrc));
     }
 
     /* Confirm a successful initialization when it's the case */
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
         autoInitSpan.setSucceeded();
 
-    return rc;
+    return hrc;
 }
 
@@ -1141 +1141 @@
     AssertReturn(!aLocation.isEmpty(), E_INVALIDARG);
 
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
 
     {
@@ -1167 +1167 @@
             m->type = MediumType_Writethrough;
 
-        rc = i_setLocation(aLocation);
-        if (FAILED(rc)) return rc;
+        hrc = i_setLocation(aLocation);
+        if (FAILED(hrc)) return hrc;
 
         /* get all the information about the medium from the storage unit */
@@ -1192 +1192 @@
     /* need to call i_queryInfo immediately to correctly place the medium in
      * the respective media tree and update other information such as uuid */
-    rc = i_queryInfo(fForceNewUuid /* fSetImageId */, false /* fSetParentId */,
-                     autoCaller);
-    if (SUCCEEDED(rc))
+    hrc = i_queryInfo(fForceNewUuid /* fSetImageId */, false /* fSetParentId */, autoCaller);
+    if (SUCCEEDED(hrc))
     {
         AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -1203 +1202 @@
         {
             Assert(!m->strLastAccessError.isEmpty());
-            rc = setError(E_FAIL, "%s", m->strLastAccessError.c_str());
+            hrc = setError(E_FAIL, "%s", m->strLastAccessError.c_str());
             alock.release();
             autoCaller.release();
@@ -1226 +1225 @@
     }
 
-    return rc;
+    return hrc;
 }
 
@@ -1253 +1252 @@
                         const settings::Medium &data)
 {
-    HRESULT rc;
+    HRESULT hrc;
 
     if (uuidMachineRegistry.isValid() && !uuidMachineRegistry.isZero())
@@ -1286 +1285 @@
     {
         AssertReturn(!data.strFormat.isEmpty(), E_FAIL);
-        rc = i_setFormat(data.strFormat);
-        if (FAILED(rc)) return rc;
+        hrc = i_setFormat(data.strFormat);
+        if (FAILED(hrc)) return hrc;
     }
     else
@@ -1293 +1292 @@
         /// @todo handle host drive settings here as well?
         if (!data.strFormat.isEmpty())
-            rc = i_setFormat(data.strFormat);
+            hrc = i_setFormat(data.strFormat);
         else
-            rc = i_setFormat("RAW");
-        if (FAILED(rc)) return rc;
+            hrc = i_setFormat("RAW");
+        if (FAILED(hrc)) return hrc;
     }
 
@@ -1356 +1355 @@
         strFull = data.strLocation;
 
-    rc = i_setLocation(strFull);
-    if (FAILED(rc)) return rc;
+    hrc = i_setLocation(strFull);
+    if (FAILED(hrc)) return hrc;
 
     if (aDeviceType == DeviceType_HardDisk)
@@ -1417 +1416 @@
     AssertReturn(aVirtualBox, E_INVALIDARG);
 
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
 
     MediaList llMediaTocleanup;
@@ -1435 +1434 @@
         bool fReleasedMediaTreeLock = false;
         ComObjPtr<Medium> pMedium;
-        rc = pMedium.createObject();
-        if (FAILED(rc))
+        hrc = pMedium.createObject();
+        if (FAILED(hrc))
             break;
         ComObjPtr<Medium> pActualMedium(pMedium);
@@ -1442 +1441 @@
         {
             AutoInitSpan autoInitSpan(pMedium);
-            AssertBreakStmt(autoInitSpan.isOk(), rc = E_FAIL);
+            AssertBreakStmt(autoInitSpan.isOk(), hrc = E_FAIL);
 
             unconst(pMedium->m->pVirtualBox) = aVirtualBox;
-            rc = pMedium->initOne(pParent, aDeviceType, uuidMachineRegistry, strMachineFolder, *current);
-            if (FAILED(rc))
+            hrc = pMedium->initOne(pParent, aDeviceType, uuidMachineRegistry, strMachineFolder, *current);
+            if (FAILED(hrc))
                 break;
-            rc = aVirtualBox->i_registerMedium(pActualMedium, &pActualMedium, mediaTreeLock, true /*fCalledFromMediumInit*/);
-            if (FAILED(rc))
+            hrc = aVirtualBox->i_registerMedium(pActualMedium, &pActualMedium, mediaTreeLock, true /*fCalledFromMediumInit*/);
+            if (FAILED(hrc))
                 break;
 
@@ -1486 +1485 @@
     }
 
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
     {
         /* Check for consistency. */
@@ -1524 +1523 @@
     }
 
-    return rc;
+    return hrc;
 }
 
@@ -1578 +1577 @@
     m->state = MediumState_Created;
     m->hostDrive = true;
-    HRESULT rc = i_setFormat("RAW");
-    if (FAILED(rc)) return rc;
-    rc = i_setLocation(aLocation);
-    if (FAILED(rc)) return rc;
+    HRESULT hrc = i_setFormat("RAW");
+    if (FAILED(hrc)) return hrc;
+    hrc = i_setLocation(aLocation);
+    if (FAILED(hrc)) return hrc;
     m->strDescription = aDescription;
 
@@ -1756 +1755 @@
     /// require to add the mRegistered flag to data
 
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
 
     MediumLockList *pMediumLockList(new MediumLockList());
@@ -1771 +1770 @@
 
         /* Build the lock list. */
-        rc = i_createMediumLockList(true /* fFailIfInaccessible */,
-                                    this /* pToLockWrite */,
-                                    true /* fMediumLockWriteAll */,
-                                    NULL,
-                                    *pMediumLockList);
-        if (FAILED(rc))
-        {
+        hrc = i_createMediumLockList(true /* fFailIfInaccessible */,
+                                     this /* pToLockWrite */,
+                                     true /* fMediumLockWriteAll */,
+                                     NULL,
+                                     *pMediumLockList);
+        if (FAILED(hrc))
             pszError = tr("Failed to create medium lock list for '%s'");
-        }
         else
         {
-            rc = pMediumLockList->Lock();
-            if (FAILED(rc))
+            hrc = pMediumLockList->Lock();
+            if (FAILED(hrc))
                 pszError = tr("Failed to lock media '%s'");
         }
@@ -1796 +1793 @@
         AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-        if (FAILED(rc))
-            throw setError(rc, pszError, i_getLocationFull().c_str());
+        if (FAILED(hrc))
+            throw setError(hrc, pszError, i_getLocationFull().c_str());
 
         /* Set a new description */
@@ -1810 +1807 @@
         m->pVirtualBox->i_onMediumConfigChanged(this);
     }
-    catch (HRESULT aRC) { rc = aRC; }
+    catch (HRESULT hrcXcpt) { hrc = hrcXcpt; }
 
     delete pMediumLockList;
 
-    return rc;
+    return hrc;
 }
 
@@ -2270 +2267 @@
     alock.release();
 
-    HRESULT rc = i_queryInfo(!!aSetImageId /* fSetImageId */,
-                             !!aSetParentId /* fSetParentId */,
-                             autoCaller);
+    HRESULT hrc = i_queryInfo(!!aSetImageId /* fSetImageId */,
+                              !!aSetParentId /* fSetParentId */,
+                              autoCaller);
 
     AutoReadLock arlock(this COMMA_LOCKVAL_SRC_POS);
@@ -2279 +2276 @@
     arlock.release();
 
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
     {
         if (uCurrImage != uPrevImage)
@@ -2292 +2289 @@
     }
 
-    return rc;
+    return hrc;
 }
 
@@ -2299 +2296 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
 
     switch (m->state)
@@ -2310 +2307 @@
             alock.release();
 
-            rc = i_queryInfo(false /* fSetImageId */, false /* fSetParentId */,
-                             autoCaller);
+            hrc = i_queryInfo(false /* fSetImageId */, false /* fSetParentId */, autoCaller);
 
             alock.acquire();
@@ -2322 +2318 @@
     *aState = m->state;
 
-    return rc;
+    return hrc;
 }
 
@@ -2383 +2379 @@
     }
 
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
 
     switch (m->state)
@@ -2393 +2389 @@
             ++m->readers;
 
-            ComAssertMsgBreak(m->readers != 0, (tr("Counter overflow")), rc = E_FAIL);
+            ComAssertMsgBreak(m->readers != 0, (tr("Counter overflow")), hrc = E_FAIL);
 
             /* Remember pre-lock state */
@@ -2403 +2399 @@
 
             ComObjPtr<MediumLockToken> pToken;
-            rc = pToken.createObject();
-            if (SUCCEEDED(rc))
-                rc = pToken->init(this, false /* fWrite */);
-            if (FAILED(rc))
+            hrc = pToken.createObject();
+            if (SUCCEEDED(hrc))
+                hrc = pToken->init(this, false /* fWrite */);
+            if (FAILED(hrc))
             {
                 --m->readers;
                 if (m->readers == 0)
                     m->state = m->preLockState;
-                return rc;
+                return hrc;
             }
 
@@ -2420 +2416 @@
         {
             LogFlowThisFunc(("Failing - state=%d\n", m->state));
-            rc = i_setStateError();
+            hrc = i_setStateError();
             break;
         }
     }
 
-    return rc;
+    return hrc;
 }
 
@@ -2439 +2435 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
 
     switch (m->state)
@@ -2445 +2441 @@
         case MediumState_LockedRead:
         {
-            ComAssertMsgBreak(m->readers != 0, (tr("Counter underflow")), rc = E_FAIL);
+            ComAssertMsgBreak(m->readers != 0, (tr("Counter underflow")), hrc = E_FAIL);
             --m->readers;
 
@@ -2465 +2461 @@
         {
             LogFlowThisFunc(("Failing - state=%d\n", m->state));
-            rc = setError(VBOX_E_INVALID_OBJECT_STATE,
-                          tr("Medium '%s' is not locked for reading"),
-                          m->strLocationFull.c_str());
+            hrc = setError(VBOX_E_INVALID_OBJECT_STATE, tr("Medium '%s' is not locked for reading"), m->strLocationFull.c_str());
             break;
         }
@@ -2476 +2470 @@
         *aState = m->state;
 
-    return rc;
+    return hrc;
 }
 HRESULT Medium::lockWrite(ComPtr<IToken> &aToken)
@@ -2500 +2494 @@
     }
 
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
 
     switch (m->state)
@@ -2513 +2507 @@
 
             ComObjPtr<MediumLockToken> pToken;
-            rc = pToken.createObject();
-            if (SUCCEEDED(rc))
-                rc = pToken->init(this, true /* fWrite */);
-            if (FAILED(rc))
+            hrc = pToken.createObject();
+            if (SUCCEEDED(hrc))
+                hrc = pToken->init(this, true /* fWrite */);
+            if (FAILED(hrc))
             {
                 m->state = m->preLockState;
-                return rc;
+                return hrc;
             }
 
@@ -2528 +2522 @@
         {
             LogFlowThisFunc(("Failing - state=%d locationFull=%s\n", m->state, i_getLocationFull().c_str()));
-            rc = i_setStateError();
+            hrc = i_setStateError();
             break;
         }
     }
 
-    return rc;
+    return hrc;
 }
 
@@ -2547 +2541 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
 
     switch (m->state)
@@ -2565 +2559 @@
         {
             LogFlowThisFunc(("Failing - state=%d locationFull=%s\n", m->state, i_getLocationFull().c_str()));
-            rc = setError(VBOX_E_INVALID_OBJECT_STATE,
-                          tr("Medium '%s' is not locked for writing"),
-                          m->strLocationFull.c_str());
+            hrc = setError(VBOX_E_INVALID_OBJECT_STATE, tr("Medium '%s' is not locked for writing"), m->strLocationFull.c_str());
             break;
         }
@@ -2576 +2568 @@
         *aState = m->state;
 
-    return rc;
+    return hrc;
 }
 
@@ -2772 +2764 @@
         return setError(E_INVALIDARG, tr("The medium size argument (%lld) is negative"), aLogicalSize);
 
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
     ComObjPtr<Progress> pProgress;
     Medium::Task *pTask = NULL;
@@ -2811 +2803 @@
 
         pProgress.createObject();
-        rc = pProgress->init(m->pVirtualBox,
-                             static_cast<IMedium*>(this),
-                             (mediumVariantFlags & MediumVariant_Fixed)
-                               ? BstrFmt(tr("Creating fixed medium storage unit '%s'"), m->strLocationFull.c_str()).raw()
-                               : BstrFmt(tr("Creating dynamic medium storage unit '%s'"), m->strLocationFull.c_str()).raw(),
-                             TRUE /* aCancelable */);
-        if (FAILED(rc))
-            throw rc;
+        hrc = pProgress->init(m->pVirtualBox,
+                              static_cast<IMedium*>(this),
+                              mediumVariantFlags & MediumVariant_Fixed
+                              ? BstrFmt(tr("Creating fixed medium storage unit '%s'"), m->strLocationFull.c_str()).raw()
+                              : BstrFmt(tr("Creating dynamic medium storage unit '%s'"), m->strLocationFull.c_str()).raw(),
+                              TRUE /* aCancelable */);
+        if (FAILED(hrc))
+            throw hrc;
 
         /* setup task object to carry out the operation asynchronously */
         pTask = new Medium::CreateBaseTask(this, pProgress, (uint64_t)aLogicalSize,
                                            (MediumVariant_T)mediumVariantFlags);
-        rc = pTask->hrc();
-        AssertComRC(rc);
-        if (FAILED(rc))
-            throw rc;
+        hrc = pTask->hrc();
+        AssertComRC(hrc);
+        if (FAILED(hrc))
+            throw hrc;
 
         m->state = MediumState_Creating;
     }
-    catch (HRESULT aRC) { rc = aRC; }
-
-    if (SUCCEEDED(rc))
-    {
-        rc = pTask->createThread();
+    catch (HRESULT hrcXcpt)
+    {
+        hrc = hrcXcpt;
+    }
+
+    if (SUCCEEDED(hrc))
+    {
+        hrc = pTask->createThread();
         pTask = NULL;
 
-        if (SUCCEEDED(rc))
+        if (SUCCEEDED(hrc))
             pProgress.queryInterfaceTo(aProgress.asOutParam());
     }
@@ -2843 +2838 @@
         delete pTask;
 
-    return rc;
+    return hrc;
 }
 
@@ -2902 +2897 @@
     autoCaller.release();
     treeLock.release();
-    HRESULT rc = diff->i_createMediumLockList(true /* fFailIfInaccessible */,
-                                              diff /* pToLockWrite */,
-                                              false /* fMediumLockWriteAll */,
-                                              this,
-                                              *pMediumLockList);
+    HRESULT hrc = diff->i_createMediumLockList(true /* fFailIfInaccessible */,
+                                               diff /* pToLockWrite */,
+                                               false /* fMediumLockWriteAll */,
+                                               this,
+                                               *pMediumLockList);
     treeLock.acquire();
     autoCaller.add();
     if (FAILED(autoCaller.hrc()))
-        rc = autoCaller.hrc();
+        hrc = autoCaller.hrc();
     alock.acquire();
-    if (FAILED(rc))
+    if (FAILED(hrc))
     {
         delete pMediumLockList;
-        return rc;
+        return hrc;
     }
 
@@ -2921 +2916 @@
     autoCaller.release();
     treeLock.release();
-    rc = pMediumLockList->Lock();
+    hrc = pMediumLockList->Lock();
     treeLock.acquire();
     autoCaller.add();
     if (FAILED(autoCaller.hrc()))
-        rc = autoCaller.hrc();
+        hrc = autoCaller.hrc();
     alock.acquire();
-    if (FAILED(rc))
+    if (FAILED(hrc))
     {
         delete pMediumLockList;
 
-        return setError(rc, tr("Could not lock medium when creating diff '%s'"),
+        return setError(hrc, tr("Could not lock medium when creating diff '%s'"),
                         diff->i_getLocationFull().c_str());
     }
@@ -2970 +2965 @@
     }
 
-    rc = i_createDiffStorage(diff, (MediumVariant_T)mediumVariantFlags, pMediumLockList,
-                             &pProgress, false /* aWait */, true /* aNotify */);
-    if (FAILED(rc))
+    hrc = i_createDiffStorage(diff, (MediumVariant_T)mediumVariantFlags, pMediumLockList,
+                              &pProgress, false /* aWait */, true /* aNotify */);
+    if (FAILED(hrc))
         delete pMediumLockList;
     else
         pProgress.queryInterfaceTo(aProgress.asOutParam());
 
-    return rc;
+    return hrc;
 }
 
@@ -2994 +2989 @@
     MediumLockList *pMediumLockList = NULL;
 
-    HRESULT rc = S_OK;
-
-    rc = i_prepareMergeTo(pTarget, NULL, NULL, true, fMergeForward,
-                          pParentForTarget, pChildrenToReparent, pMediumLockList);
-    if (FAILED(rc)) return rc;
+    HRESULT hrc = i_prepareMergeTo(pTarget, NULL, NULL, true, fMergeForward,
+                                   pParentForTarget, pChildrenToReparent, pMediumLockList);
+    if (FAILED(hrc)) return hrc;
 
     ComObjPtr<Progress> pProgress;
 
-    rc = i_mergeTo(pTarget, fMergeForward, pParentForTarget, pChildrenToReparent,
-                   pMediumLockList, &pProgress, false /* aWait */, true /* aNotify */);
-    if (FAILED(rc))
+    hrc = i_mergeTo(pTarget, fMergeForward, pParentForTarget, pChildrenToReparent,
+                    pMediumLockList, &pProgress, false /* aWait */, true /* aNotify */);
+    if (FAILED(hrc))
         i_cancelMergeTo(pChildrenToReparent, pMediumLockList);
     else
         pProgress.queryInterfaceTo(aProgress.asOutParam());
 
-    return rc;
+    return hrc;
 }
 
@@ -3040 +3033 @@
     }
 
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
     ComObjPtr<Progress> pProgress;
     Medium::Task *pTask = NULL;
@@ -3066 +3059 @@
         MediumLockList *pSourceMediumLockList(new MediumLockList());
         alock.release();
-        rc = i_createMediumLockList(true /* fFailIfInaccessible */,
-                                    NULL /* pToLockWrite */,
-                                    false /* fMediumLockWriteAll */,
-                                    NULL,
-                                    *pSourceMediumLockList);
+        hrc = i_createMediumLockList(true /* fFailIfInaccessible */,
+                                     NULL /* pToLockWrite */,
+                                     false /* fMediumLockWriteAll */,
+                                     NULL,
+                                     *pSourceMediumLockList);
         alock.acquire();
-        if (FAILED(rc))
+        if (FAILED(hrc))
         {
             delete pSourceMediumLockList;
-            throw rc;
+            throw hrc;
         }
 
@@ -3081 +3074 @@
         MediumLockList *pTargetMediumLockList(new MediumLockList());
         alock.release();
-        rc = pTarget->i_createMediumLockList(true /* fFailIfInaccessible */,
-                                             pTarget /* pToLockWrite */,
-                                             false /* fMediumLockWriteAll */,
-                                             pParent,
-                                             *pTargetMediumLockList);
+        hrc = pTarget->i_createMediumLockList(true /* fFailIfInaccessible */,
+                                              pTarget /* pToLockWrite */,
+                                              false /* fMediumLockWriteAll */,
+                                              pParent,
+                                              *pTargetMediumLockList);
         alock.acquire();
-        if (FAILED(rc))
+        if (FAILED(hrc))
         {
             delete pSourceMediumLockList;
             delete pTargetMediumLockList;
-            throw rc;
+            throw hrc;
         }
 
         alock.release();
-        rc = pSourceMediumLockList->Lock();
+        hrc = pSourceMediumLockList->Lock();
         alock.acquire();
-        if (FAILED(rc))
+        if (FAILED(hrc))
         {
             delete pSourceMediumLockList;
             delete pTargetMediumLockList;
-            throw setError(rc,
+            throw setError(hrc,
                            tr("Failed to lock source media '%s'"),
                            i_getLocationFull().c_str());
         }
         alock.release();
-        rc = pTargetMediumLockList->Lock();
+        hrc = pTargetMediumLockList->Lock();
         alock.acquire();
-        if (FAILED(rc))
+        if (FAILED(hrc))
         {
             delete pSourceMediumLockList;
             delete pTargetMediumLockList;
-            throw setError(rc,
+            throw setError(hrc,
                            tr("Failed to lock target media '%s'"),
                            pTarget->i_getLocationFull().c_str());
@@ -3118 +3111 @@
 
         pProgress.createObject();
-        rc = pProgress->init(m->pVirtualBox,
-                             static_cast <IMedium *>(this),
-                             BstrFmt(tr("Creating clone medium '%s'"), pTarget->m->strLocationFull.c_str()).raw(),
-                             TRUE /* aCancelable */);
-        if (FAILED(rc))
+        hrc = pProgress->init(m->pVirtualBox,
+                              static_cast <IMedium *>(this),
+                              BstrFmt(tr("Creating clone medium '%s'"), pTarget->m->strLocationFull.c_str()).raw(),
+                              TRUE /* aCancelable */);
+        if (FAILED(hrc))
         {
             delete pSourceMediumLockList;
             delete pTargetMediumLockList;
-            throw rc;
+            throw hrc;
         }
 
@@ -3150 +3143 @@
                                       pParent, UINT32_MAX, UINT32_MAX,
                                       pSourceMediumLockList, pTargetMediumLockList);
-        rc = pTask->hrc();
-        AssertComRC(rc);
-        if (FAILED(rc))
-            throw rc;
+        hrc = pTask->hrc();
+        AssertComRC(hrc);
+        if (FAILED(hrc))
+            throw hrc;
 
         if (pTarget->m->state == MediumState_NotCreated)
             pTarget->m->state = MediumState_Creating;
     }
-    catch (HRESULT aRC) { rc = aRC; }
-
-    if (SUCCEEDED(rc))
-    {
-        rc = pTask->createThread();
+    catch (HRESULT hrcXcpt)
+    {
+        hrc = hrcXcpt;
+    }
+
+    if (SUCCEEDED(hrc))
+    {
+        hrc = pTask->createThread();
         pTask = NULL;
-        if (SUCCEEDED(rc))
+        if (SUCCEEDED(hrc))
             pProgress.queryInterfaceTo(aProgress.asOutParam());
     }
@@ -3170 +3166 @@
         delete pTask;
 
-    return rc;
+    return hrc;
 }
 
@@ -3206 +3202 @@
 
     /* Set up variables. Fetch needed data in lockable blocks */
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
     Medium::Task *pTask = NULL;
 
@@ -3226 +3222 @@
     ComObjPtr<Progress> pProgress;
     pProgress.createObject();
-    rc = pProgress->init(m->pVirtualBox,
-                static_cast<IMedium*>(this),
-                BstrFmt(tr("Resizing medium and cloning into it")).raw(),
-                TRUE, /* aCancelable */
-                2, /* Number of opearations */
-                BstrFmt(tr("Resizing medium before clone")).raw()
-                );
-
-    if (FAILED(rc))
-        return rc;
+    hrc = pProgress->init(m->pVirtualBox,
+                          static_cast<IMedium*>(this),
+                          BstrFmt(tr("Resizing medium and cloning into it")).raw(),
+                          TRUE, /* aCancelable */
+                          2, /* Number of opearations */
+                          BstrFmt(tr("Resizing medium before clone")).raw()
+                          );
+    if (FAILED(hrc))
+        return hrc;
 
     /* If target does not exist, handle resize. */
@@ -3243 +3238 @@
             if (!i_isMediumFormatFile())
             {
-                rc = setError(VBOX_E_NOT_SUPPORTED,
-                              tr("Sizes of '%s' and '%s' are different and \
-                                 medium format does not support resing"),
-                              strSourceName.c_str(), strTargetName.c_str());
-                return rc;
+                hrc = setError(VBOX_E_NOT_SUPPORTED,
+                               tr("Sizes of '%s' and '%s' are different and medium format does not support resing"),
+                               strSourceName.c_str(), strTargetName.c_str());
+                return hrc;
             }
 
@@ -3256 +3250 @@
 
             ComPtr<IToken> pToken;
-            rc = pTarget->LockWrite(pToken.asOutParam());
-
-            if (FAILED(rc)) return rc;
+            hrc = pTarget->LockWrite(pToken.asOutParam());
+
+            if (FAILED(hrc)) return hrc;
 
             /**
@@ -3268 +3262 @@
             pMediumLockListForResize->Append(pTarget, pTarget->m->state == MediumState_LockedWrite);
 
-            rc = pMediumLockListForResize->Lock(true /* fSkipOverLockedMedia */);
-
-            if (FAILED(rc))
+            hrc = pMediumLockListForResize->Lock(true /* fSkipOverLockedMedia */);
+            if (FAILED(hrc))
             {
                 AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-                rc = setError(rc,
-                                tr("Failed to lock the medium '%s' to resize before merge"),
-                                strTargetName.c_str());
+                hrc = setError(hrc,
+                               tr("Failed to lock the medium '%s' to resize before merge"),
+                               strTargetName.c_str());
                 delete pMediumLockListForResize;
-                return rc;
-            }
-
-
-            rc = pTarget->i_resize((uint64_t)aLogicalSize, pMediumLockListForResize, &pProgress, true, false);
-
-            if (FAILED(rc))
+                return hrc;
+            }
+
+
+            hrc = pTarget->i_resize((uint64_t)aLogicalSize, pMediumLockListForResize, &pProgress, true, false);
+            if (FAILED(hrc))
             {
                 /* No need to setError becasue i_resize and i_taskResizeHandler handle this automatically. */
                 AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
                 delete pMediumLockListForResize;
-                return rc;
+                return hrc;
             }
 
@@ -3301 +3293 @@
 
     /* Report progress to supplied progress argument */
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
     {
         pProgress.queryInterfaceTo(aProgress.asOutParam());
@@ -3328 +3320 @@
         MediumLockList *pSourceMediumLockList(new MediumLockList());
         alock.release();
-        rc = i_createMediumLockList(true /* fFailIfInaccessible */,
-                                    NULL /* pToLockWrite */,
-                                    false /* fMediumLockWriteAll */,
-                                    NULL,
-                                    *pSourceMediumLockList);
+        hrc = i_createMediumLockList(true /* fFailIfInaccessible */,
+                                     NULL /* pToLockWrite */,
+                                     false /* fMediumLockWriteAll */,
+                                     NULL,
+                                     *pSourceMediumLockList);
         alock.acquire();
-        if (FAILED(rc))
+        if (FAILED(hrc))
         {
             delete pSourceMediumLockList;
-            throw rc;
+            throw hrc;
         }
 
@@ -3343 +3335 @@
         MediumLockList *pTargetMediumLockList(new MediumLockList());
         alock.release();
-        rc = pTarget->i_createMediumLockList(true /* fFailIfInaccessible */,
-                                             pTarget /* pToLockWrite */,
-                                             false /* fMediumLockWriteAll */,
-                                             pParent,
-                                             *pTargetMediumLockList);
+        hrc = pTarget->i_createMediumLockList(true /* fFailIfInaccessible */,
+                                              pTarget /* pToLockWrite */,
+                                              false /* fMediumLockWriteAll */,
+                                              pParent,
+                                              *pTargetMediumLockList);
         alock.acquire();
-        if (FAILED(rc))
+        if (FAILED(hrc))
         {
             delete pSourceMediumLockList;
             delete pTargetMediumLockList;
-            throw rc;
+            throw hrc;
         }
 
         alock.release();
-        rc = pSourceMediumLockList->Lock();
+        hrc = pSourceMediumLockList->Lock();
         alock.acquire();
-        if (FAILED(rc))
+        if (FAILED(hrc))
         {
             delete pSourceMediumLockList;
             delete pTargetMediumLockList;
-            throw setError(rc,
+            throw setError(hrc,
                            tr("Failed to lock source media '%s'"),
                            i_getLocationFull().c_str());
         }
         alock.release();
-        rc = pTargetMediumLockList->Lock();
+        hrc = pTargetMediumLockList->Lock();
         alock.acquire();
-        if (FAILED(rc))
+        if (FAILED(hrc))
         {
             delete pSourceMediumLockList;
             delete pTargetMediumLockList;
-            throw setError(rc,
+            throw setError(hrc,
                            tr("Failed to lock target media '%s'"),
                            pTarget->i_getLocationFull().c_str());
@@ -3414 +3406 @@
         }
 
-        rc = pTask->hrc();
-        AssertComRC(rc);
-        if (FAILED(rc))
-            throw rc;
+        hrc = pTask->hrc();
+        AssertComRC(hrc);
+        if (FAILED(hrc))
+            throw hrc;
 
         if (pTarget->m->state == MediumState_NotCreated)
             pTarget->m->state = MediumState_Creating;
     }
-    catch (HRESULT aRC) { rc = aRC; }
-
-    if (SUCCEEDED(rc))
-    {
-        rc = pTask->createThread();
+    catch (HRESULT hrcXcpt) { hrc = hrcXcpt; }
+
+    if (SUCCEEDED(hrc))
+    {
+        hrc = pTask->createThread();
         pTask = NULL;
-        if (SUCCEEDED(rc))
+        if (SUCCEEDED(hrc))
             pProgress.queryInterfaceTo(aProgress.asOutParam());
     }
@@ -3434 +3426 @@
         delete pTask;
 
-    return rc;
+    return hrc;
 }
 
@@ -3441 +3433 @@
     ComObjPtr<Medium> pParent;
     ComObjPtr<Progress> pProgress;
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
     Medium::Task *pTask = NULL;
 
@@ -3474 +3466 @@
             if (aLocation.isEmpty())
             {
-                rc = setErrorVrc(VERR_PATH_ZERO_LENGTH,
-                                 tr("Medium '%s' can't be moved. Destination path is empty."),
-                                 i_getLocationFull().c_str());
-                throw rc;
+                hrc = setErrorVrc(VERR_PATH_ZERO_LENGTH,
+                                  tr("Medium '%s' can't be moved. Destination path is empty."),
+                                  i_getLocationFull().c_str());
+                throw hrc;
             }
 
@@ -3541 +3533 @@
                                 break;
                             default:
-                                rc = setErrorVrc(VERR_NOT_A_FILE, /** @todo r=bird: Mixing status codes again. */
-                                                 tr("Medium '%s' has RAW type. \"Move\" operation isn't supported for this type."),
-                                                 i_getLocationFull().c_str());
-                                throw rc;
+                                hrc = setErrorVrc(VERR_NOT_A_FILE, /** @todo r=bird: Mixing status codes again. */
+                                                  tr("Medium '%s' has RAW type. \"Move\" operation isn't supported for this type."),
+                                                  i_getLocationFull().c_str());
+                                throw hrc;
                         }
                     }
@@ -3562 +3554 @@
             /* Simple check for existence */
             if (RTFileExists(destPath.c_str()))
-            {
-                rc = setError(VBOX_E_FILE_ERROR,
-                              tr("The given path '%s' is an existing file. Delete or rename this file."),
-                              destPath.c_str());
-                throw rc;
-            }
+                throw setError(VBOX_E_FILE_ERROR,
+                               tr("The given path '%s' is an existing file. Delete or rename this file."),
+                               destPath.c_str());
 
             if (!i_isMediumFormatFile())
-            {
-                rc = setErrorVrc(VERR_NOT_A_FILE,
-                                 tr("Medium '%s' isn't a file object. \"Move\" operation isn't supported."),
-                                 i_getLocationFull().c_str());
-                throw rc;
-            }
+                throw setErrorVrc(VERR_NOT_A_FILE,
+                                  tr("Medium '%s' isn't a file object. \"Move\" operation isn't supported."),
+                                  i_getLocationFull().c_str());
             /* Path must be absolute */
             if (!RTPathStartsWithRoot(destPath.c_str()))
-            {
-                rc = setError(VBOX_E_FILE_ERROR,
-                              tr("The given path '%s' is not fully qualified"),
-                              destPath.c_str());
-                throw rc;
-            }
+                throw setError(VBOX_E_FILE_ERROR,
+                               tr("The given path '%s' is not fully qualified"),
+                               destPath.c_str());
             /* Check path for a new file object */
-            rc = VirtualBox::i_ensureFilePathExists(destPath, true);
-            if (FAILED(rc))
-                throw rc;
+            hrc = VirtualBox::i_ensureFilePathExists(destPath, true);
+            if (FAILED(hrc))
+                throw hrc;
 
             /* Set needed variables for "moving" procedure. It'll be used later in separate thread task */
-            rc = i_preparationForMoving(destPath);
-            if (FAILED(rc))
-            {
-                rc = setErrorVrc(VERR_NO_CHANGE,
-                                 tr("Medium '%s' is already in the correct location"),
-                                 i_getLocationFull().c_str());
-                throw rc;
-            }
+            hrc = i_preparationForMoving(destPath);
+            if (FAILED(hrc))
+                throw setErrorVrc(VERR_NO_CHANGE,
+                                  tr("Medium '%s' is already in the correct location"),
+                                  i_getLocationFull().c_str());
         }
 
         /* Check VMs which have this medium attached to*/
         std::vector<com::Guid> aMachineIds;
-        rc = getMachineIds(aMachineIds);
+        hrc = getMachineIds(aMachineIds);
         std::vector<com::Guid>::const_iterator currMachineID = aMachineIds.begin();
         std::vector<com::Guid>::const_iterator lastMachineID = aMachineIds.end();
@@ -3614 +3594 @@
             autoCaller.release();
             treeLock.release();
-            rc = m->pVirtualBox->i_findMachine(id, false, true, &aMachine);
+            hrc = m->pVirtualBox->i_findMachine(id, false, true, &aMachine);
             treeLock.acquire();
             autoCaller.add();
@@ -3620 +3600 @@
             alock.acquire();
 
-            if (SUCCEEDED(rc))
+            if (SUCCEEDED(hrc))
             {
                 ComObjPtr<SessionMachine> sm;
@@ -3635 +3615 @@
 
                 if (ses)
-                {
-                    rc = setError(VBOX_E_INVALID_VM_STATE,
-                                  tr("At least the VM '%s' to whom this medium '%s' attached has currently an opened session. Stop all VMs before relocating this medium"),
-                                  id.toString().c_str(),
-                                  i_getLocationFull().c_str());
-                    throw rc;
-                }
+                    throw setError(VBOX_E_INVALID_VM_STATE,
+                                   tr("At least the VM '%s' to whom this medium '%s' attached has currently an opened session. Stop all VMs before relocating this medium"),
+                                   id.toString().c_str(), i_getLocationFull().c_str());
             }
             ++currMachineID;
@@ -3651 +3627 @@
         autoCaller.release();
         treeLock.release();
-        rc = i_createMediumLockList(true /* fFailIfInaccessible */,
-                                    this /* pToLockWrite */,
-                                    true /* fMediumLockWriteAll */,
-                                    NULL,
-                                    *pMediumLockList);
+        hrc = i_createMediumLockList(true /* fFailIfInaccessible */,
+                                     this /* pToLockWrite */,
+                                     true /* fMediumLockWriteAll */,
+                                     NULL,
+                                     *pMediumLockList);
         treeLock.acquire();
         autoCaller.add();
         AssertComRCThrowRC(autoCaller.hrc());
         alock.acquire();
-        if (FAILED(rc))
+        if (FAILED(hrc))
         {
             delete pMediumLockList;
-            throw setError(rc,
-                           tr("Failed to create medium lock list for '%s'"),
-                           i_getLocationFull().c_str());
+            throw setError(hrc, tr("Failed to create medium lock list for '%s'"), i_getLocationFull().c_str());
         }
         alock.release();
         autoCaller.release();
         treeLock.release();
-        rc = pMediumLockList->Lock();
+        hrc = pMediumLockList->Lock();
         treeLock.acquire();
         autoCaller.add();
         AssertComRCThrowRC(autoCaller.hrc());
         alock.acquire();
-        if (FAILED(rc))
+        if (FAILED(hrc))
         {
             delete pMediumLockList;
-            throw setError(rc,
-                           tr("Failed to lock media '%s'"),
-                           i_getLocationFull().c_str());
+            throw setError(hrc, tr("Failed to lock media '%s'"), i_getLocationFull().c_str());
         }
 
         pProgress.createObject();
-        rc = pProgress->init(m->pVirtualBox,
-                             static_cast <IMedium *>(this),
-                             BstrFmt(tr("Moving medium '%s'"), m->strLocationFull.c_str()).raw(),
-                             TRUE /* aCancelable */);
+        hrc = pProgress->init(m->pVirtualBox,
+                              static_cast <IMedium *>(this),
+                              BstrFmt(tr("Moving medium '%s'"), m->strLocationFull.c_str()).raw(),
+                              TRUE /* aCancelable */);
 
         /* Do the disk moving. */
-        if (SUCCEEDED(rc))
+        if (SUCCEEDED(hrc))
         {
             ULONG mediumVariantFlags = i_getVariant();
@@ -3698 +3670 @@
                                          (MediumVariant_T)mediumVariantFlags,
                                          pMediumLockList);
-            rc = pTask->hrc();
-            AssertComRC(rc);
-            if (FAILED(rc))
-                throw rc;
-        }
-
-    }
-    catch (HRESULT aRC) { rc = aRC; }
-
-    if (SUCCEEDED(rc))
-    {
-        rc = pTask->createThread();
+            hrc = pTask->hrc();
+            AssertComRC(hrc);
+            if (FAILED(hrc))
+                throw hrc;
+        }
+
+    }
+    catch (HRESULT hrcXcpt) { hrc = hrcXcpt; }
+
+    if (SUCCEEDED(hrc))
+    {
+        hrc = pTask->createThread();
         pTask = NULL;
-        if (SUCCEEDED(rc))
+        if (SUCCEEDED(hrc))
             pProgress.queryInterfaceTo(aProgress.asOutParam());
     }
@@ -3720 +3692 @@
     }
 
-    return rc;
+    return hrc;
 }
 
 HRESULT Medium::setLocation(const com::Utf8Str &aLocation)
 {
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
 
     try
@@ -3745 +3717 @@
             /* Path must be absolute */
             if (!RTPathStartsWithRoot(destPath.c_str()))
-            {
-                rc = setError(VBOX_E_FILE_ERROR,
-                              tr("The given path '%s' is not fully qualified"),
-                              destPath.c_str());
-                throw rc;
-            }
+                throw setError(VBOX_E_FILE_ERROR, tr("The given path '%s' is not fully qualified"), destPath.c_str());
 
             /* Simple check for existence */
             if (!RTFileExists(destPath.c_str()))
-            {
-                rc = setError(VBOX_E_FILE_ERROR,
-                              tr("The given path '%s' is not an existing file. New location is invalid."),
-                              destPath.c_str());
-                throw rc;
-            }
+                throw setError(VBOX_E_FILE_ERROR,
+                               tr("The given path '%s' is not an existing file. New location is invalid."),
+                               destPath.c_str());
         }
 
         /* Check VMs which have this medium attached to*/
         std::vector<com::Guid> aMachineIds;
-        rc = getMachineIds(aMachineIds);
+        hrc = getMachineIds(aMachineIds);
 
         // switch locks only if there are machines with this medium attached
@@ -3780 +3744 @@
                 Guid id(*currMachineID);
                 ComObjPtr<Machine> aMachine;
-                rc = m->pVirtualBox->i_findMachine(id, false, true, &aMachine);
-                if (SUCCEEDED(rc))
+                hrc = m->pVirtualBox->i_findMachine(id, false, true, &aMachine);
+                if (SUCCEEDED(hrc))
                 {
                     ComObjPtr<SessionMachine> sm;
@@ -3794 +3758 @@
                         alock.acquire();
 
-                        rc = setError(VBOX_E_INVALID_VM_STATE,
-                                      tr("At least the VM '%s' to whom this medium '%s' attached has currently an opened session. Stop all VMs before set location for this medium"),
-                                      id.toString().c_str(),
-                                      i_getLocationFull().c_str());
-                        throw rc;
+                        throw setError(VBOX_E_INVALID_VM_STATE,
+                                       tr("At least the VM '%s' to whom this medium '%s' attached has currently an opened session. Stop all VMs before set location for this medium"),
+                                       id.toString().c_str(),
+                                       i_getLocationFull().c_str());
                     }
                 }
@@ -3824 +3787 @@
         m->pVirtualBox->i_onMediumConfigChanged(this);
     }
-    catch (HRESULT aRC) { rc = aRC; }
-
-    return rc;
+    catch (HRESULT hrcXcpt) { hrc = hrcXcpt; }
+
+    return hrc;
 }
 
 HRESULT Medium::compact(ComPtr<IProgress> &aProgress)
 {
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
     ComObjPtr<Progress> pProgress;
     Medium::Task *pTask = NULL;
@@ -3842 +3805 @@
         MediumLockList *pMediumLockList(new MediumLockList());
         alock.release();
-        rc = i_createMediumLockList(true /* fFailIfInaccessible */ ,
-                                    this /* pToLockWrite */,
-                                    false /* fMediumLockWriteAll */,
-                                    NULL,
-                                    *pMediumLockList);
+        hrc = i_createMediumLockList(true /* fFailIfInaccessible */ ,
+                                     this /* pToLockWrite */,
+                                     false /* fMediumLockWriteAll */,
+                                     NULL,
+                                     *pMediumLockList);
         alock.acquire();
-        if (FAILED(rc))
+        if (FAILED(hrc))
         {
             delete pMediumLockList;
-            throw rc;
+            throw hrc;
         }
 
         alock.release();
-        rc = pMediumLockList->Lock();
+        hrc = pMediumLockList->Lock();
         alock.acquire();
-        if (FAILED(rc))
+        if (FAILED(hrc))
         {
             delete pMediumLockList;
-            throw setError(rc,
+            throw setError(hrc,
                            tr("Failed to lock media when compacting '%s'"),
                            i_getLocationFull().c_str());
@@ -3866 +3829 @@
 
         pProgress.createObject();
-        rc = pProgress->init(m->pVirtualBox,
-                             static_cast <IMedium *>(this),
-                             BstrFmt(tr("Compacting medium '%s'"), m->strLocationFull.c_str()).raw(),
-                             TRUE /* aCancelable */);
-        if (FAILED(rc))
+        hrc = pProgress->init(m->pVirtualBox,
+                              static_cast <IMedium *>(this),
+                              BstrFmt(tr("Compacting medium '%s'"), m->strLocationFull.c_str()).raw(),
+                              TRUE /* aCancelable */);
+        if (FAILED(hrc))
         {
             delete pMediumLockList;
-            throw rc;
+            throw hrc;
         }
 
         /* setup task object to carry out the operation asynchronously */
         pTask = new Medium::CompactTask(this, pProgress, pMediumLockList);
-        rc = pTask->hrc();
-        AssertComRC(rc);
-        if (FAILED(rc))
-            throw rc;
-    }
-    catch (HRESULT aRC) { rc = aRC; }
-
-    if (SUCCEEDED(rc))
-    {
-        rc = pTask->createThread();
+        hrc = pTask->hrc();
+        AssertComRC(hrc);
+        if (FAILED(hrc))
+            throw hrc;
+    }
+    catch (HRESULT hrcXcpt) { hrc = hrcXcpt; }
+
+    if (SUCCEEDED(hrc))
+    {
+        hrc = pTask->createThread();
         pTask = NULL;
-        if (SUCCEEDED(rc))
+        if (SUCCEEDED(hrc))
             pProgress.queryInterfaceTo(aProgress.asOutParam());
     }
@@ -3895 +3858 @@
         delete pTask;
 
-    return rc;
+    return hrc;
 }
 
@@ -3902 +3865 @@
 {
     CheckComArgExpr(aLogicalSize, aLogicalSize > 0);
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
     ComObjPtr<Progress> pProgress;
 
@@ -3912 +3875 @@
         const char *pszError = NULL;
 
-        rc = i_createMediumLockList(true /* fFailIfInaccessible */ ,
-                                    this /* pToLockWrite */,
-                                    false /* fMediumLockWriteAll */,
-                                    NULL,
-                                    *pMediumLockList);
-        if (FAILED(rc))
-        {
+        hrc = i_createMediumLockList(true /* fFailIfInaccessible */ ,
+                                     this /* pToLockWrite */,
+                                     false /* fMediumLockWriteAll */,
+                                     NULL,
+                                     *pMediumLockList);
+        if (FAILED(hrc))
             pszError = tr("Failed to create medium lock list when resizing '%s'");
-        }
         else
         {
-            rc = pMediumLockList->Lock();
-            if (FAILED(rc))
+            hrc = pMediumLockList->Lock();
+            if (FAILED(hrc))
                 pszError = tr("Failed to lock media when resizing '%s'");
         }
@@ -3931 +3892 @@
         AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-        if (FAILED(rc))
-        {
-            throw setError(rc, pszError, i_getLocationFull().c_str());
+        if (FAILED(hrc))
+        {
+            throw setError(hrc, pszError, i_getLocationFull().c_str());
         }
 
         pProgress.createObject();
-        rc = pProgress->init(m->pVirtualBox,
-                             static_cast <IMedium *>(this),
-                             BstrFmt(tr("Resizing medium '%s'"), m->strLocationFull.c_str()).raw(),
-                             TRUE /* aCancelable */);
-        if (FAILED(rc))
-        {
-            throw rc;
-        }
-    }
-    catch (HRESULT aRC) { rc = aRC; }
-
-    if (SUCCEEDED(rc))
-        rc = i_resize((uint64_t)aLogicalSize, pMediumLockList, &pProgress, false /* aWait */, true /* aNotify */);
-
-    if (SUCCEEDED(rc))
+        hrc = pProgress->init(m->pVirtualBox,
+                              static_cast <IMedium *>(this),
+                              BstrFmt(tr("Resizing medium '%s'"), m->strLocationFull.c_str()).raw(),
+                              TRUE /* aCancelable */);
+        if (FAILED(hrc))
+        {
+            throw hrc;
+        }
+    }
+    catch (HRESULT hrcXcpt) { hrc = hrcXcpt; }
+
+    if (SUCCEEDED(hrc))
+        hrc = i_resize((uint64_t)aLogicalSize, pMediumLockList, &pProgress, false /* aWait */, true /* aNotify */);
+
+    if (SUCCEEDED(hrc))
         pProgress.queryInterfaceTo(aProgress.asOutParam());
     else
         delete pMediumLockList;
 
-    return rc;
+    return hrc;
 }
 
@@ -4033 +3994 @@
             throw rc;
     }
-    catch (HRESULT aRC) { rc = aRC; }
+    catch (HRESULT hrcXcpt) { rc = hrcXcpt; }
 
     if (SUCCEEDED(rc))
@@ -4170 +4131 @@
             throw rc;
     }
-    catch (HRESULT aRC) { rc = aRC; }
+    catch (HRESULT hrcXcpt) { rc = hrcXcpt; }
 
     if (SUCCEEDED(rc))
@@ -4259 +4220 @@
 # endif
     }
-    catch (HRESULT aRC) { rc = aRC; }
+    catch (HRESULT hrcXcpt) { rc = hrcXcpt; }
 
     return rc;
@@ -4330 +4291 @@
 # endif
     }
-    catch (HRESULT aRC) { rc = aRC; }
+    catch (HRESULT hrcXcpt) { rc = hrcXcpt; }
 
     return rc;
@@ -5584 +5545 @@
         aTarget->m->state = MediumState_Creating;
     }
-    catch (HRESULT aRC) { rc = aRC; }
+    catch (HRESULT hrcXcpt) { rc = hrcXcpt; }
 
     if (SUCCEEDED(rc))
@@ -5952 +5913 @@
             throw rc;
     }
-    catch (HRESULT aRC) { rc = aRC; }
+    catch (HRESULT hrcXcpt) { rc = hrcXcpt; }
 
     if (SUCCEEDED(rc))
@@ -6171 +6132 @@
         }
     }
-    catch (HRESULT aRC) { rc = aRC; }
+    catch (HRESULT hrcXcpt) { rc = hrcXcpt; }
 
     return rc;
@@ -6498 +6459 @@
         }
     }
-    catch (HRESULT aRC) { rc = aRC; }
+    catch (HRESULT hrcXcpt) { rc = hrcXcpt; }
 
     if (FAILED(rc))
@@ -6663 +6624 @@
             throw rc;
     }
-    catch (HRESULT aRC) { rc = aRC; }
+    catch (HRESULT hrcXcpt) { rc = hrcXcpt; }
 
     if (SUCCEEDED(rc))
@@ -6827 +6788 @@
             throw rc;
     }
-    catch (HRESULT aRC) { rc = aRC; }
+    catch (HRESULT hrcXcpt) { rc = hrcXcpt; }
 
     if (SUCCEEDED(rc))
@@ -6923 +6884 @@
             }
         }
-        catch (HRESULT aRC) { rc = aRC; }
+        catch (HRESULT hrcXcpt) { rc = hrcXcpt; }
         catch (int aVRC)
         {
@@ -6934 +6895 @@
         VDDestroy(hdd);
     }
-    catch (HRESULT aRC) { rc = aRC; }
+    catch (HRESULT hrcXcpt) { rc = hrcXcpt; }
 
     return rc;
@@ -7210 +7171 @@
             m->state = MediumState_Creating;
     }
-    catch (HRESULT aRC) { rc = aRC; }
+    catch (HRESULT hrcXcpt) { rc = hrcXcpt; }
 
     if (SUCCEEDED(rc))
@@ -7358 +7319 @@
             aTarget->m->state = MediumState_Creating;
     }
-    catch (HRESULT aRC) { rc = aRC; }
+    catch (HRESULT hrcXcpt) { rc = hrcXcpt; }
 
     if (SUCCEEDED(rc))
@@ -7894 +7855 @@
             success = true;
         }
-        catch (HRESULT aRC)
-        {
-            rc = aRC;
+        catch (HRESULT hrcXcpt)
+        {
+            rc = hrcXcpt;
         }
 
@@ -7908 +7869 @@
         }
     }
-    catch (HRESULT aRC)
-    {
-        rc = aRC;
+    catch (HRESULT hrcXcpt)
+    {
+        rc = hrcXcpt;
     }
 
@@ -7989 +7950 @@
                     ComAssertRCThrow(vrc, E_FAIL);
                 }
-                catch (HRESULT aRC)
+                catch (HRESULT hrcXcpt)
                 {
-                    rc = aRC;
+                    rc = hrcXcpt;
                 }
 
                 VDDestroy(hdd);
             }
-            catch (HRESULT aRC)
-            {
-                rc = aRC;
+            catch (HRESULT hrcXcpt)
+            {
+                rc = hrcXcpt;
             }
 
@@ -9032 +8993 @@
                 variant = (MediumVariant_T)uImageFlags;
         }
-        catch (HRESULT aRC) { rc = aRC; }
+        catch (HRESULT hrcXcpt) { rc = hrcXcpt; }
 
         VDDestroy(hdd);
     }
-    catch (HRESULT aRC) { rc = aRC; }
+    catch (HRESULT hrcXcpt) { rc = hrcXcpt; }
 
     if (SUCCEEDED(rc))
@@ -9230 +9191 @@
                 variant = (MediumVariant_T)uImageFlags;
         }
-        catch (HRESULT aRC) { rcTmp = aRC; }
+        catch (HRESULT hrcXcpt) { rcTmp = hrcXcpt; }
 
         VDDestroy(hdd);
     }
-    catch (HRESULT aRC) { rcTmp = aRC; }
+    catch (HRESULT hrcXcpt) { rcTmp = hrcXcpt; }
 
     MultiResult mrc(rcTmp);
@@ -9554 +9515 @@
             }
         }
-        catch (HRESULT aRC) { rcTmp = aRC; }
+        catch (HRESULT hrcXcpt) { rcTmp = hrcXcpt; }
         catch (int aVRC)
         {
@@ -9566 +9527 @@
         VDDestroy(hdd);
     }
-    catch (HRESULT aRC) { rcTmp = aRC; }
+    catch (HRESULT hrcXcpt) { rcTmp = hrcXcpt; }
 
     ErrorInfoKeeper eik;
@@ -9955 +9916 @@
                     variant = (MediumVariant_T)uImageFlags;
             }
-            catch (HRESULT aRC) { rcTmp = aRC; }
+            catch (HRESULT hrcXcpt) { rcTmp = hrcXcpt; }
 
             VDDestroy(targetHdd);
         }
-        catch (HRESULT aRC) { rcTmp = aRC; }
+        catch (HRESULT hrcXcpt) { rcTmp = hrcXcpt; }
 
         VDDestroy(hdd);
     }
-    catch (HRESULT aRC) { rcTmp = aRC; }
+    catch (HRESULT hrcXcpt) { rcTmp = hrcXcpt; }
 
     ErrorInfoKeeper eik;
@@ -10223 +10184 @@
 
             }
-            catch (HRESULT aRC) { rcOut = aRC; }
-
-        }
-        catch (HRESULT aRC) { rcOut = aRC; }
+            catch (HRESULT hrcXcpt) { rcOut = hrcXcpt; }
+
+        }
+        catch (HRESULT hrcXcpt) { rcOut = hrcXcpt; }
 
         VDDestroy(hdd);
     }
-    catch (HRESULT aRC) { rcOut = aRC; }
+    catch (HRESULT hrcXcpt) { rcOut = hrcXcpt; }
 
     ErrorInfoKeeper eik;
@@ -10306 +10267 @@
 
         }
-        catch (HRESULT aRC) { rc = aRC; }
+        catch (HRESULT hrcXcpt) { rc = hrcXcpt; }
 
         VDDestroy(hdd);
     }
-    catch (HRESULT aRC) { rc = aRC; }
+    catch (HRESULT hrcXcpt) { rc = hrcXcpt; }
 
     AutoWriteLock thisLock(this COMMA_LOCKVAL_SRC_POS);
@@ -10462 +10423 @@
                 variant = (MediumVariant_T)uImageFlags;
         }
-        catch (HRESULT aRC) { rc = aRC; }
+        catch (HRESULT hrcXcpt) { rc = hrcXcpt; }
 
         VDDestroy(hdd);
     }
-    catch (HRESULT aRC) { rc = aRC; }
+    catch (HRESULT hrcXcpt) { rc = hrcXcpt; }
 
     AutoWriteLock thisLock(this COMMA_LOCKVAL_SRC_POS);
@@ -10568 +10529 @@
             }
         }
-        catch (HRESULT aRC) { rc = aRC; }
+        catch (HRESULT hrcXcpt) { rc = hrcXcpt; }
 
         VDDestroy(hdd);
     }
-    catch (HRESULT aRC) { rc = aRC; }
+    catch (HRESULT hrcXcpt) { rc = hrcXcpt; }
 
     if (task.NotifyAboutChanges() && SUCCEEDED(rc))
@@ -10681 +10642 @@
             logicalSize = VDGetSize(hdd, VD_LAST_IMAGE);
         }
-        catch (HRESULT aRC) { rc = aRC; }
+        catch (HRESULT hrcXcpt) { rc = hrcXcpt; }
 
         VDDestroy(hdd);
     }
-    catch (HRESULT aRC) { rc = aRC; }
+    catch (HRESULT hrcXcpt) { rc = hrcXcpt; }
 
     if (SUCCEEDED(rc))
@@ -10871 +10832 @@
                     variant = (MediumVariant_T)uImageFlags;
             }
-            catch (HRESULT aRC) { rcTmp = aRC; }
+            catch (HRESULT hrcXcpt) { rcTmp = hrcXcpt; }
 
             VDDestroy(targetHdd);
         }
-        catch (HRESULT aRC) { rcTmp = aRC; }
+        catch (HRESULT hrcXcpt) { rcTmp = hrcXcpt; }
 
         VDDestroy(hdd);
     }
-    catch (HRESULT aRC) { rcTmp = aRC; }
+    catch (HRESULT hrcXcpt) { rcTmp = hrcXcpt; }
 
     ErrorInfoKeeper eik;
@@ -11212 +11173 @@
             m->pVirtualBox->i_saveModifiedRegistries();
         }
-        catch (HRESULT aRC) { rc = aRC; }
+        catch (HRESULT hrcXcpt) { rc = hrcXcpt; }
 
         if (pvBuf)
@@ -11223 +11184 @@
 # endif
     }
-    catch (HRESULT aRC) { rc = aRC; }
+    catch (HRESULT hrcXcpt) { rc = hrcXcpt; }
 
     /* Everything is explicitly unlocked when the task exits,

trunk/src/VBox/Main/src-server/SnapshotImpl.cpp

@@ -2588 +2588 @@
         }
     }
-    catch (HRESULT aRC)
-    {
-        rc = aRC;
+    catch (HRESULT hrcXcpt)
+    {
+        rc = hrcXcpt;
     }
 
@@ -3575 +3575 @@
         }
     }
-    catch (HRESULT aRC) {
-        mrc = aRC;
+    catch (HRESULT hrcXcpt)
+    {
+        mrc = hrcXcpt;
     }
 
@@ -4141 +4142 @@
             throw rc;
     }
-    catch (HRESULT aRC) { rc = aRC; }
+    catch (HRESULT hrcXcpt) { rc = hrcXcpt; }
 
     // The callback mentioned above takes care of update the medium state

trunk/src/VBox/Main/src-server/VFSExplorerImpl.cpp

@@ -314 +314 @@
                 aTask->m_ptrProgress->SetCurrentOperationProgress(66);
         }
-        catch (HRESULT aRC)
-        {
-            rc = aRC;
+        catch (HRESULT hrcXcpt)
+        {
+            rc = hrcXcpt;
         }
 
@@ -374 +374 @@
         }
     }
-    catch (HRESULT aRC)
-    {
-        rc = aRC;
+    catch (HRESULT hrcXcpt)
+    {
+        rc = hrcXcpt;
     }
 
@@ -416 +416 @@
         rc = pTask->createThreadWithType(RTTHREADTYPE_MAIN_HEAVY_WORKER);
     }
-    catch (HRESULT aRC)
-    {
-        rc = aRC;
+    catch (HRESULT hrcXcpt)
+    {
+        rc = hrcXcpt;
     }
 
@@ -534 +534 @@
         rc = pTask->createThreadWithType(RTTHREADTYPE_MAIN_HEAVY_WORKER);
     }
-    catch (HRESULT aRC)
-    {
-        rc = aRC;
+    catch (HRESULT hrcXcpt)
+    {
+        rc = hrcXcpt;
     }
 

trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp

@@ -868 +868 @@
             ComAssertThrow(m->pAsyncEventQ, E_FAIL);
         }
-        catch (HRESULT aRC)
-        {
-            hrc = aRC;
+        catch (HRESULT hrcXcpt)
+        {
+            hrc = hrcXcpt;
         }
     }