Changeset 98292 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Jan 25, 2023 1:14:53 AM (23 months ago)

Author:

vboxsync

Message:

Main/src-server: rc -> hrc/vrc. Enabled scm rc checks. bugref:10223

Location:

trunk/src/VBox/Main/src-server

Files:

• ApplianceImplImport.cpp (modified) (2 diffs)
• HostImpl.cpp (modified) (8 diffs)
• MachineImpl.cpp (modified) (4 diffs)
• MediumIOImpl.cpp (modified) (14 diffs)
• MediumImpl.cpp (modified) (9 diffs)
• MediumLock.cpp (modified) (15 diffs)
• NATEngineImpl.cpp (modified) (2 diffs)
• NATNetworkImpl.cpp (modified) (21 diffs)
• NetworkAdapterImpl.cpp (modified) (11 diffs)
• NetworkServiceRunner.cpp (modified) (5 diffs)
• Performance.cpp (modified) (8 diffs)
• PerformanceImpl.cpp (modified) (18 diffs)
• ProgressProxyImpl.cpp (modified) (1 diff)
• RecordingSettingsImpl.cpp (modified) (1 diff)
• SerialPortImpl.cpp (modified) (3 diffs)
• SnapshotImpl.cpp (modified) (92 diffs)
• StorageControllerImpl.cpp (modified) (8 diffs)
• SystemPropertiesImpl.cpp (modified) (22 diffs)
• TokenImpl.cpp (modified) (1 diff)
• USBControllerImpl.cpp (modified) (1 diff)
• USBDeviceFilterImpl.cpp (modified) (4 diffs)
• USBDeviceFiltersImpl.cpp (modified) (7 diffs)
• USBIdDatabaseGenerator.cpp (modified) (8 diffs)
• USBProxyBackend.cpp (modified) (11 diffs)
• USBProxyService.cpp (modified) (3 diffs)
• UnattendedInstaller.cpp (modified) (3 diffs)
• UpdateAgentImpl.cpp (modified) (13 diffs)
• VFSExplorerImpl.cpp (modified) (16 diffs)
• VRDEServerImpl.cpp (modified) (9 diffs)
• generic/USBProxyBackendUsbIp.cpp (modified) (2 diffs)
• linux/HostHardwareLinux.cpp (modified) (4 diffs)
• linux/USBGetDevices.cpp (modified) (3 diffs)
• os2/USBProxyBackendOs2.cpp (modified) (7 diffs)
• solaris/DynLoadLibSolaris.cpp (modified) (2 diffs)
• solaris/NetIf-solaris.cpp (modified) (4 diffs)
• solaris/PerformanceSolaris.cpp (modified) (16 diffs)
• solaris/USBProxyBackendSolaris.cpp (modified) (8 diffs)
• win/HostDnsServiceWin.cpp (modified) (6 diffs)
• win/HostPowerWin.cpp (modified) (5 diffs)
• win/NetIf-win.cpp (modified) (45 diffs)
• win/PerformanceWin.cpp (modified) (10 diffs)
• win/USBProxyBackendWindows.cpp (modified) (5 diffs)
• win/svcmain.cpp (modified) (6 diffs)

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

@@ -3685 +3685 @@
             Bstr bstrGuid = guid.toUtf16();
             ComPtr<IMachine> failedMachine;
-            HRESULT rc2 = mVirtualBox->FindMachine(bstrGuid.raw(), failedMachine.asOutParam());
-            if (SUCCEEDED(rc2))
+            HRESULT hrc2 = mVirtualBox->FindMachine(bstrGuid.raw(), failedMachine.asOutParam());
+            if (SUCCEEDED(hrc2))
             {
                 SafeIfaceArray<IMedium> aMedia;
-                rc2 = failedMachine->Unregister(CleanupMode_DetachAllReturnHardDisksOnly, ComSafeArrayAsOutParam(aMedia));
+                hrc2 = failedMachine->Unregister(CleanupMode_DetachAllReturnHardDisksOnly, ComSafeArrayAsOutParam(aMedia));
                 ComPtr<IProgress> pProgress2;
-                rc2 = failedMachine->DeleteConfig(ComSafeArrayAsInParam(aMedia), pProgress2.asOutParam());
+                hrc2 = failedMachine->DeleteConfig(ComSafeArrayAsInParam(aMedia), pProgress2.asOutParam());
                 pProgress2->WaitForCompletion(-1);
             }
@@ -4365 +4365 @@
 
     StorageBus_T enmStorageBus = StorageBus_Null;
-    HRESULT vrc = pSysProps->GetStorageBusForStorageControllerType(aStorageControllerType, &enmStorageBus);
-    if (FAILED(vrc))
-        return vrc;
-
-    vrc = pSysProps->GetMaxPortCountForStorageBus(enmStorageBus, aMaxPortCount);
-    if (FAILED(vrc))
-        return vrc;
+    HRESULT hrc = pSysProps->GetStorageBusForStorageControllerType(aStorageControllerType, &enmStorageBus);
+    if (FAILED(hrc))
+        return hrc;
+
+    hrc = pSysProps->GetMaxPortCountForStorageBus(enmStorageBus, aMaxPortCount);
+    if (FAILED(hrc))
+        return hrc;
 
     if (uControllerPort >= *aMaxPortCount)

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

@@ -590 +590 @@
 
     MediaList *pList;
-    HRESULT vrc = i_getDrives(DeviceType_DVD, true /* fRefresh */, pList, treeLock);
-    if (FAILED(vrc))
-        return vrc;
+    HRESULT hrc = i_getDrives(DeviceType_DVD, true /* fRefresh */, pList, treeLock);
+    if (FAILED(hrc))
+        return hrc;
 
     aDVDDrives.resize(pList->size());
@@ -613 +613 @@
 
     MediaList *pList;
-    HRESULT vrc = i_getDrives(DeviceType_Floppy, true /* fRefresh */, pList, treeLock);
-    if (FAILED(vrc))
-        return vrc;
+    HRESULT hrc = i_getDrives(DeviceType_Floppy, true /* fRefresh */, pList, treeLock);
+    if (FAILED(hrc))
+        return hrc;
 
     aFloppyDrives.resize(pList->size());
@@ -830 +830 @@
 #if defined(RT_OS_WINDOWS) || defined(VBOX_WITH_NETFLT) /*|| defined(RT_OS_OS2)*/
 # ifdef VBOX_WITH_HOSTNETIF_API
-    HRESULT vrc = i_updateNetIfList();
-    if (FAILED(vrc))
-    {
-        Log(("Failed to update host network interface list with vrc=%Rhrc\n", vrc));
-        return vrc;
+    HRESULT hrc = i_updateNetIfList();
+    if (FAILED(hrc))
+    {
+        Log(("Failed to update host network interface list with hrc=%Rhrc\n", hrc));
+        return hrc;
     }
 #if defined(RT_OS_WINDOWS)
-    vrc = i_updatePersistentConfigForHostOnlyAdapters();
-    if (FAILED(vrc))
-    {
-        LogRel(("Failed to update persistent config for host-only adapters with vrc=%Rhrc\n", vrc));
-        return vrc;
+    hrc = i_updatePersistentConfigForHostOnlyAdapters();
+    if (FAILED(hrc))
+    {
+        LogRel(("Failed to update persistent config for host-only adapters with hrc=%Rhrc\n", hrc));
+        return hrc;
     }
 #endif /* defined(RT_OS_WINDOWS) */
@@ -1032 +1032 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    MultiResult vrc = i_checkUSBProxyService();
-    if (FAILED(vrc) || SUCCEEDED_WARNING(vrc))
-        return vrc;
+    MultiResult mrc = i_checkUSBProxyService();
+    if (FAILED(mrc) || SUCCEEDED_WARNING(mrc))
+        return mrc;
 
     return m->pUSBProxyService->getDeviceCollection(aUSBDevices);
@@ -1081 +1081 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    MultiResult vrc = i_checkUSBProxyService();
-    if (FAILED(vrc))
-        return vrc;
+    MultiResult mrc = i_checkUSBProxyService();
+    if (FAILED(mrc))
+        return mrc;
 
     aUSBDeviceFilters.resize(m->llUSBDeviceFilters.size());
@@ -1090 +1090 @@
         (*it).queryInterfaceTo(aUSBDeviceFilters[i].asOutParam());
 
-    return vrc;
+    return mrc;
 #else
     /* Note: The GUI depends on this method returning E_NOTIMPL with no
@@ -2909 +2909 @@
 
                             const char *pszDevPath = pszDisk ? pszDisk : pszPartition0 ? pszPartition0 : pszSlice0;
-                            int hrc = RTStrCopy(pDrive->szRawDiskPath, sizeof(pDrive->szRawDiskPath), pszDevPath);
-                            AssertRC(hrc);
+                            int vrc = RTStrCopy(pDrive->szRawDiskPath, sizeof(pDrive->szRawDiskPath), pszDevPath);
+                            AssertRC(vrc);
 
                             if (*ppDrives)
@@ -3766 +3766 @@
     /* For now we are concerned with the root file system only. */
     pm::DiskList disksUsage, disksLoad;
-    int hrc = hal->getDiskListByFs("/", disksUsage, disksLoad);
-    if (RT_FAILURE(hrc))
+    int vrc = hal->getDiskListByFs("/", disksUsage, disksLoad);
+    if (RT_FAILURE(vrc))
         return;
     pm::DiskList::iterator it;

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

@@ -3496 +3496 @@
             {
                 Bstr bstrSessionName;
-                HRESULT rc2 = aSession->COMGETTER(Name)(bstrSessionName.asOutParam());
-                if (SUCCEEDED(rc2))
+                HRESULT hrc2 = aSession->COMGETTER(Name)(bstrSessionName.asOutParam());
+                if (SUCCEEDED(hrc2))
                     strSessionName = bstrSessionName;
             }
@@ -11437 +11437 @@
         ErrorInfoKeeper eik;
 
-        HRESULT rc1 = lockedMediaMap->Clear();
-        AssertComRC(rc1);
+        HRESULT hrc2 = lockedMediaMap->Clear();
+        AssertComRC(hrc2);
     }
 
@@ -11608 +11608 @@
             ErrorInfoKeeper eik;
 
-            HRESULT rc1 = lockedMediaMap->Clear();
-            AssertComRC(rc1);
+            HRESULT hrc2 = lockedMediaMap->Clear();
+            AssertComRC(hrc2);
         }
 
@@ -11677 +11677 @@
         ErrorInfoKeeper eik;
 
-        HRESULT rc1 = lockedMediaMap->Clear();
-        AssertComRC(rc1);
+        HRESULT hrc2 = lockedMediaMap->Clear();
+        AssertComRC(hrc2);
     }
 

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

@@ -231 +231 @@
     AssertReturn((fOpen & RTFILE_O_ACCESS_MASK) == RTFILE_O_WRITE, VERR_INVALID_PARAMETER);
 
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
     PSTREAMFILE pStreamFile = (PSTREAMFILE)RTMemAllocZ(sizeof(*pStreamFile));
     if (RT_LIKELY(pStreamFile))
@@ -241 +241 @@
     }
     else
-        rc = VERR_NO_MEMORY;
-
-    return rc;
+        vrc = VERR_NO_MEMORY;
+
+    return vrc;
 }
 
@@ -250 +250 @@
     RT_NOREF(pvUser);
     PSTREAMFILE pStreamFile = (PSTREAMFILE)pStorage;
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
 
     /* Fill up to the configured file size. */
@@ -263 +263 @@
                 cbThisWrite = (size_t)(pStreamFile->cbFile - pStreamFile->uOffsetLast);
 
-            rc = pStreamFile->pDataStream->i_write(&g_abRTZero64K[0], cbThisWrite, &cbWritten);
-            if (RT_SUCCESS(rc))
+            vrc = pStreamFile->pDataStream->i_write(&g_abRTZero64K[0], cbThisWrite, &cbWritten);
+            if (RT_SUCCESS(vrc))
                 pStreamFile->uOffsetLast += cbWritten;
 
-        } while (   RT_SUCCESS(rc)
+        } while (   RT_SUCCESS(vrc)
                  && pStreamFile->uOffsetLast < pStreamFile->cbFile);
     }
 
-    int rc2 = pStreamFile->pDataStream->i_close();
-    if (RT_SUCCESS(rc))
-        rc = rc2;
+    int vrc2 = pStreamFile->pDataStream->i_close();
+    if (RT_SUCCESS(vrc))
+        vrc = vrc2;
 
     RTMemFree(pStreamFile);
-    return rc;
+    return vrc;
 }
 
@@ -328 +328 @@
 
     /* Reducing the size is not supported. */
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
     if (pStreamFile->cbFile < cbSize)
         pStreamFile->cbFile = cbSize;
     else
-        rc = VERR_NOT_SUPPORTED;
-
-    return rc;
+        vrc = VERR_NOT_SUPPORTED;
+
+    return vrc;
 }
 
@@ -354 +354 @@
     RT_NOREF(pvUser);
     PSTREAMFILE pStreamFile = (PSTREAMFILE)pStorage;
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
 
     /* Fill up to the new offset if there is non consecutive access. */
@@ -367 +367 @@
                 cbThisWrite = (size_t)(uOffset - pStreamFile->uOffsetLast);
 
-            rc = pStreamFile->pDataStream->i_write(&g_abRTZero64K[0], cbThisWrite, &cbWritten);
-            if (RT_SUCCESS(rc))
+            vrc = pStreamFile->pDataStream->i_write(&g_abRTZero64K[0], cbThisWrite, &cbWritten);
+            if (RT_SUCCESS(vrc))
                 pStreamFile->uOffsetLast += cbWritten;
 
-        } while (   RT_SUCCESS(rc)
+        } while (   RT_SUCCESS(vrc)
                  && pStreamFile->uOffsetLast < uOffset);
     }
 
-    if (RT_SUCCESS(rc))
+    if (RT_SUCCESS(vrc))
     {
         if (pcbWritten)
-            rc = pStreamFile->pDataStream->i_write(pvBuffer, cbBuffer, pcbWritten);
+            vrc = pStreamFile->pDataStream->i_write(pvBuffer, cbBuffer, pcbWritten);
         else
         {
@@ -385 +385 @@
             size_t cbWritten = 0;
             while (   cbLeft > 0
-                   && RT_SUCCESS(rc))
+                   && RT_SUCCESS(vrc))
             {
-                rc = pStreamFile->pDataStream->i_write(pbBuf, cbLeft, &cbWritten);
-                if (RT_SUCCESS(rc))
+                vrc = pStreamFile->pDataStream->i_write(pbBuf, cbLeft, &cbWritten);
+                if (RT_SUCCESS(vrc))
                 {
                     pbBuf  += cbWritten;
@@ -396 +396 @@
         }
 
-        if (RT_SUCCESS(rc))
+        if (RT_SUCCESS(vrc))
         {
             size_t cbWritten = pcbWritten ? *pcbWritten : cbBuffer;
@@ -408 +408 @@
     }
 
-    return rc;
+    return vrc;
 }
 
@@ -807 +807 @@
                                   ComPtr<IProgress> &aProgress)
 {
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
     ComObjPtr<Progress> pProgress;
     ComObjPtr<DataStream> pDataStream;
@@ -815 +815 @@
     {
         pDataStream.createObject();
-        rc = pDataStream->init(aBufferSize);
-        if (FAILED(rc))
-            throw rc;
+        hrc = pDataStream->init(aBufferSize);
+        if (FAILED(hrc))
+            throw hrc;
 
         pProgress.createObject();
-        rc = pProgress->init(m->ptrVirtualBox,
-                             static_cast<IMediumIO*>(this),
-                             BstrFmt(tr("Converting medium '%s' to data stream"), m->ptrMedium->i_getLocationFull().c_str()),
-                             TRUE /* aCancelable */);
-        if (FAILED(rc))
-            throw rc;
+        hrc = pProgress->init(m->ptrVirtualBox,
+                              static_cast<IMediumIO*>(this),
+                              BstrFmt(tr("Converting medium '%s' to data stream"), m->ptrMedium->i_getLocationFull().c_str()),
+                              TRUE /* aCancelable */);
+        if (FAILED(hrc))
+            throw hrc;
 
         ULONG mediumVariantFlags = 0;
@@ -838 +838 @@
         pTask = new MediumIO::StreamTask(this, pDataStream, pProgress,
                                          aFormat.c_str(), (MediumVariant_T)mediumVariantFlags);
-        rc = pTask->hrc();
-        AssertComRC(rc);
-        if (FAILED(rc))
-            throw rc;
-    }
-    catch (HRESULT hrcXcpt) { rc = hrcXcpt; }
-
-    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))
         {
             pDataStream.queryInterfaceTo(aStream.asOutParam());
@@ -858 +858 @@
         delete pTask;
 
-    return rc;
+    return hrc;
 }
 

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

@@ -5233 +5233 @@
         /* Encrypt the plain secret. If that does not work (i.e. no or wrong settings key
          * specified), just use the encrypted secret (if there is any). */
-        int hrc = m->pVirtualBox->i_encryptSetting(itPln->second, &strCiphertext);
-        if (RT_SUCCESS(hrc))
+        int vrc = m->pVirtualBox->i_encryptSetting(itPln->second, &strCiphertext);
+        if (RT_SUCCESS(vrc))
             fHaveInitiatorSecretEncrypted = true;
     }
@@ -9048 +9048 @@
      * to lock order violations, it probably causes lock order issues related
      * to the AutoCaller usage. */
-    HRESULT rcTmp = S_OK;
+    HRESULT hrcTmp = S_OK;
 
     const ComObjPtr<Medium> &pTarget = task.mTarget;
@@ -9174 +9174 @@
                 variant = (MediumVariant_T)uImageFlags;
         }
-        catch (HRESULT hrcXcpt) { rcTmp = hrcXcpt; }
+        catch (HRESULT hrcXcpt) { hrcTmp = hrcXcpt; }
 
         VDDestroy(hdd);
     }
-    catch (HRESULT hrcXcpt) { rcTmp = hrcXcpt; }
-
-    MultiResult mrc(rcTmp);
+    catch (HRESULT hrcXcpt) { hrcTmp = hrcXcpt; }
+
+    MultiResult mrc(hrcTmp);
 
     if (SUCCEEDED(mrc))
@@ -9278 +9278 @@
      * to lock order violations, it probably causes lock order issues related
      * to the AutoCaller usage. */
-    HRESULT rcTmp = S_OK;
+    HRESULT hrcTmp = S_OK;
 
     const ComObjPtr<Medium> &pTarget = task.mTarget;
@@ -9495 +9495 @@
             }
         }
-        catch (HRESULT hrcXcpt) { rcTmp = hrcXcpt; }
+        catch (HRESULT hrcXcpt) { hrcTmp = hrcXcpt; }
         catch (int aVRC)
         {
-            rcTmp = setErrorBoth(VBOX_E_FILE_ERROR, aVRC,
-                                 tr("Could not merge the medium '%s' to '%s'%s"),
-                                 m->strLocationFull.c_str(),
-                                 pTarget->m->strLocationFull.c_str(),
-                                 i_vdError(aVRC).c_str());
+            hrcTmp = setErrorBoth(VBOX_E_FILE_ERROR, aVRC,
+                                  tr("Could not merge the medium '%s' to '%s'%s"),
+                                  m->strLocationFull.c_str(),
+                                  pTarget->m->strLocationFull.c_str(),
+                                  i_vdError(aVRC).c_str());
         }
 
         VDDestroy(hdd);
     }
-    catch (HRESULT hrcXcpt) { rcTmp = hrcXcpt; }
+    catch (HRESULT hrcXcpt) { hrcTmp = hrcXcpt; }
 
     ErrorInfoKeeper eik;
-    MultiResult mrc(rcTmp);
+    MultiResult mrc(hrcTmp);
     HRESULT hrc2;
 
@@ -9699 +9699 @@
      * to lock order violations, it probably causes lock order issues related
      * to the AutoCaller usage. */
-    HRESULT rcTmp = S_OK;
+    HRESULT hrcTmp = S_OK;
 
     const ComObjPtr<Medium> &pTarget = task.mTarget;
@@ -9895 +9895 @@
                     variant = (MediumVariant_T)uImageFlags;
             }
-            catch (HRESULT hrcXcpt) { rcTmp = hrcXcpt; }
+            catch (HRESULT hrcXcpt) { hrcTmp = hrcXcpt; }
 
             VDDestroy(targetHdd);
         }
-        catch (HRESULT hrcXcpt) { rcTmp = hrcXcpt; }
+        catch (HRESULT hrcXcpt) { hrcTmp = hrcXcpt; }
 
         VDDestroy(hdd);
     }
-    catch (HRESULT hrcXcpt) { rcTmp = hrcXcpt; }
+    catch (HRESULT hrcXcpt) { hrcTmp = hrcXcpt; }
 
     ErrorInfoKeeper eik;
-    MultiResult mrc(rcTmp);
+    MultiResult mrc(hrcTmp);
 
     /* Only do the parent changes for newly created media. */
@@ -10657 +10657 @@
      * to lock order violations, it probably causes lock order issues related
      * to the AutoCaller usage. */
-    HRESULT rcTmp = S_OK;
+    HRESULT hrcTmp = S_OK;
 
     const ComObjPtr<Medium> &pParent = task.mParent;
@@ -10810 +10810 @@
                     variant = (MediumVariant_T)uImageFlags;
             }
-            catch (HRESULT hrcXcpt) { rcTmp = hrcXcpt; }
+            catch (HRESULT hrcXcpt) { hrcTmp = hrcXcpt; }
 
             VDDestroy(targetHdd);
         }
-        catch (HRESULT hrcXcpt) { rcTmp = hrcXcpt; }
+        catch (HRESULT hrcXcpt) { hrcTmp = hrcXcpt; }
 
         VDDestroy(hdd);
     }
-    catch (HRESULT hrcXcpt) { rcTmp = hrcXcpt; }
+    catch (HRESULT hrcXcpt) { hrcTmp = hrcXcpt; }
 
     ErrorInfoKeeper eik;
-    MultiResult mrc(rcTmp);
+    MultiResult mrc(hrcTmp);
 
     /* Only do the parent changes for newly created media. */

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

@@ -65 +65 @@
         Unlock();
         mLockWrite = aLockWrite;
-        HRESULT rc = Lock();
-        if (FAILED(rc))
+        HRESULT hrc = Lock();
+        if (FAILED(hrc))
         {
             mLockWrite = fPrevLockWrite;
             Lock();
-            return rc;
+            return hrc;
         }
         return S_OK;
@@ -106 +106 @@
     }
 
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
     MediumState_T state;
     {
@@ -125 +125 @@
                                            || state == MediumState_LockedWrite))
                     return S_OK;
-                else
-                    rc = mMedium->LockWrite(mToken.asOutParam());
+                hrc = mMedium->LockWrite(mToken.asOutParam());
             }
             else
@@ -132 +131 @@
                 if (aIgnoreLockedMedia && state == MediumState_LockedWrite)
                     return S_OK;
-                else
-                    rc = mMedium->LockRead(mToken.asOutParam());
+                hrc = mMedium->LockRead(mToken.asOutParam());
             }
     }
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
     {
         mIsLocked = true;
         return S_OK;
     }
-    else
-    {
-        mMediumCaller.attach(NULL);
-        return VBOX_E_INVALID_OBJECT_STATE;
-    }
+    mMediumCaller.attach(NULL);
+    return VBOX_E_INVALID_OBJECT_STATE;
 }
 
 HRESULT MediumLock::Unlock()
 {
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
     if (mIsLocked && !mLockSkipped && mToken)
     {
@@ -159 +154 @@
     mLockSkipped = false;
     mIsLocked = false;
-    return rc;
+    return hrc;
 }
 
@@ -211 +206 @@
 HRESULT MediumLockList::RemoveByIterator(Base::iterator &aIt)
 {
-    HRESULT rc = aIt->Unlock();
+    HRESULT hrc = aIt->Unlock();
     aIt = mMediumLocks.erase(aIt);
-    return rc;
+    return hrc;
 }
 
 HRESULT MediumLockList::Clear()
 {
-    HRESULT rc = Unlock();
+    HRESULT hrc = Unlock();
     mMediumLocks.clear();
-    return rc;
+    return hrc;
 }
 
@@ -237 +232 @@
     if (mIsLocked)
         return S_OK;
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
     for (MediumLockList::Base::iterator it = mMediumLocks.begin();
          it != mMediumLocks.end();
          ++it)
     {
-        rc = it->Lock(fSkipOverLockedMedia);
-        if (FAILED(rc))
+        hrc = it->Lock(fSkipOverLockedMedia);
+        if (FAILED(hrc))
         {
             for (MediumLockList::Base::iterator it2 = mMediumLocks.begin();
@@ -249 +244 @@
                  ++it2)
             {
-                HRESULT rc2 = it2->Unlock();
-                AssertComRC(rc2);
+                HRESULT hrc2 = it2->Unlock();
+                AssertComRC(hrc2);
             }
             break;
         }
     }
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
         mIsLocked = true;
-    return rc;
+    return hrc;
 }
 
@@ -264 +259 @@
     if (!mIsLocked)
         return S_OK;
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
     for (MediumLockList::Base::iterator it = mMediumLocks.begin();
          it != mMediumLocks.end();
          ++it)
     {
-        HRESULT rc2 = it->Unlock();
-        if (SUCCEEDED(rc) && FAILED(rc2))
-            rc = rc2;
-    }
-    mIsLocked = false;
-    return rc;
+        HRESULT hrc2 = it->Unlock();
+        if (SUCCEEDED(hrc) && FAILED(hrc2))
+            hrc = hrc2;
+    }
+    mIsLocked = false;
+    return hrc;
 }
 
@@ -331 +326 @@
 HRESULT MediumLockListMap::Clear()
 {
-    HRESULT rc = Unlock();
+    HRESULT hrc = Unlock();
     for (MediumLockListMap::Base::iterator it = mMediumLocks.begin();
          it != mMediumLocks.end();
@@ -340 +335 @@
     }
     mMediumLocks.clear();
-    return rc;
+    return hrc;
 }
 
@@ -360 +355 @@
     if (mIsLocked)
         return S_OK;
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
     for (MediumLockListMap::Base::const_iterator it = mMediumLocks.begin();
          it != mMediumLocks.end();
          ++it)
     {
-        rc = it->second->Lock();
-        if (FAILED(rc))
+        hrc = it->second->Lock();
+        if (FAILED(hrc))
         {
             for (MediumLockListMap::Base::const_iterator it2 = mMediumLocks.begin();
@@ -372 +367 @@
                  ++it2)
             {
-                HRESULT rc2 = it2->second->Unlock();
-                AssertComRC(rc2);
+                HRESULT hrc2 = it2->second->Unlock();
+                AssertComRC(hrc2);
             }
             break;
         }
     }
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
         mIsLocked = true;
-    return rc;
+    return hrc;
 }
 
@@ -387 +382 @@
     if (!mIsLocked)
         return S_OK;
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
     for (MediumLockListMap::Base::const_iterator it = mMediumLocks.begin();
          it != mMediumLocks.end();
@@ -393 +388 @@
     {
         MediumLockList *pMediumLockList = it->second;
-        HRESULT rc2 = pMediumLockList->Unlock();
-        if (SUCCEEDED(rc) && FAILED(rc2))
-            rc = rc2;
-    }
-    mIsLocked = false;
-    return rc;
-}
+        HRESULT hrc2 = pMediumLockList->Unlock();
+        if (SUCCEEDED(hrc) && FAILED(hrc2))
+            hrc = hrc2;
+    }
+    mIsLocked = false;
+    return hrc;
+}

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

@@ -380 +380 @@
 
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
     data = *mData->m.data();
-    return rc;
+    return hrc;
 }
 
@@ -416 +416 @@
 
         /* parses as an IPv4 address */
-        int rc = RTNetStrToIPv4Addr(aHostIP.c_str(), &addr);
-        if (RT_FAILURE(rc))
+        int vrc = RTNetStrToIPv4Addr(aHostIP.c_str(), &addr);
+        if (RT_FAILURE(vrc))
             return setError(E_INVALIDARG, "Invalid IPv4 address \"%s\"", aHostIP.c_str());
 

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

@@ -247 +247 @@
 
     AutoWriteLock vboxLock(m->pVirtualBox COMMA_LOCKVAL_SRC_POS);
-    HRESULT rc = m->pVirtualBox->i_saveSettings();
-    ComAssertComRCRetRC(rc);
+    HRESULT hrc = m->pVirtualBox->i_saveSettings();
+    ComAssertComRCRetRC(hrc);
 
     return S_OK;
@@ -271 +271 @@
 
     AutoWriteLock vboxLock(m->pVirtualBox COMMA_LOCKVAL_SRC_POS);
-    HRESULT rc = m->pVirtualBox->i_saveSettings();
-    ComAssertComRCRetRC(rc);
+    HRESULT hrc = m->pVirtualBox->i_saveSettings();
+    ComAssertComRCRetRC(hrc);
     return S_OK;
 }
@@ -291 +291 @@
 HRESULT NATNetwork::setNetwork(const com::Utf8Str &aIPv4NetworkCidr)
 {
-    RTNETADDRIPV4 Net, Mask;
+    RTNETADDRIPV4 Net;
     int iPrefix;
-    int rc;
-
-    rc = RTNetStrToIPv4Cidr(aIPv4NetworkCidr.c_str(), &Net, &iPrefix);
-    if (RT_FAILURE(rc))
-        return setError(E_FAIL, tr("%s is not a valid IPv4 CIDR notation"),
-                        aIPv4NetworkCidr.c_str());
+    int vrc = RTNetStrToIPv4Cidr(aIPv4NetworkCidr.c_str(), &Net, &iPrefix);
+    if (RT_FAILURE(vrc))
+        return setErrorBoth(E_FAIL, vrc, tr("%s is not a valid IPv4 CIDR notation"), aIPv4NetworkCidr.c_str());
 
     /*
@@ -312 +309 @@
         return setError(E_FAIL, tr("%s specifies zero prefix"), aIPv4NetworkCidr.c_str());
 
-    rc = RTNetPrefixToMaskIPv4(iPrefix, &Mask);
-    AssertRCReturn(rc, setError(E_FAIL,
-        "%s: internal error: failed to convert prefix %d to netmask: %Rrc",
-        aIPv4NetworkCidr.c_str(), iPrefix, rc));
+    RTNETADDRIPV4 Mask;
+    vrc = RTNetPrefixToMaskIPv4(iPrefix, &Mask);
+    AssertRCReturn(vrc, setErrorBoth(E_FAIL, vrc, tr("%s: internal error: failed to convert prefix %d to netmask: %Rrc"),
+                                     aIPv4NetworkCidr.c_str(), iPrefix, vrc));
 
     if ((Net.u & ~Mask.u) != 0)
-        return setError(E_FAIL,
-            tr("%s: the specified address is longer than the specified prefix"),
-            aIPv4NetworkCidr.c_str());
+        return setError(E_FAIL, tr("%s: the specified address is longer than the specified prefix"),
+                        aIPv4NetworkCidr.c_str());
 
     /** @todo r=uwe Check the address is unicast, not a loopback, etc. */
@@ -360 +356 @@
                                                  const RTNETADDRIPV4 &MaskNew)
 {
-    RTNETADDRIPV4 NetOld, MaskOld;
-    int iPrefixOld;
-    int rc;
-
     if (s.mapPortForwardRules4.empty())
         return;                 /* nothing to do */
 
-    rc = RTNetStrToIPv4Cidr(s.strIPv4NetworkCidr.c_str(), &NetOld, &iPrefixOld);
-    if (RT_FAILURE(rc))
+    RTNETADDRIPV4 NetOld;
+    int iPrefixOld;
+    int vrc = RTNetStrToIPv4Cidr(s.strIPv4NetworkCidr.c_str(), &NetOld, &iPrefixOld);
+    if (RT_FAILURE(vrc))
         return;
 
-    rc = RTNetPrefixToMaskIPv4(iPrefixOld, &MaskOld);
-    if (RT_FAILURE(rc))
+    RTNETADDRIPV4 MaskOld;
+    vrc = RTNetPrefixToMaskIPv4(iPrefixOld, &MaskOld);
+    if (RT_FAILURE(vrc))
         return;
 
@@ -383 +378 @@
         /* parse the old destination address */
         RTNETADDRIPV4 AddrOld;
-        rc = RTNetStrToIPv4Addr(rule.strGuestIP.c_str(), &AddrOld);
-        if (RT_FAILURE(rc))
+        vrc = RTNetStrToIPv4Addr(rule.strGuestIP.c_str(), &AddrOld);
+        if (RT_FAILURE(vrc))
             continue;
 
@@ -433 +428 @@
 
     AutoWriteLock vboxLock(m->pVirtualBox COMMA_LOCKVAL_SRC_POS);
-    HRESULT rc = m->pVirtualBox->i_saveSettings();
-    ComAssertComRCRetRC(rc);
+    HRESULT hrc = m->pVirtualBox->i_saveSettings();
+    ComAssertComRCRetRC(hrc);
 
     return S_OK;
@@ -451 +446 @@
 {
     HRESULT hrc;
-    int rc;
+    int vrc;
 
     /* Since we store it in text form, use canonical representation */
@@ -461 +456 @@
         RTNETADDRIPV6 Net6;
         int iPrefixLength;
-        rc = RTNetStrToIPv6Cidr(aIPv6Prefix.c_str(), &Net6, &iPrefixLength);
-        if (RT_FAILURE(rc))
-            return setError(E_INVALIDARG,
-                            tr("%s is not a valid IPv6 prefix"),
-                            aIPv6Prefix.c_str());
+        vrc = RTNetStrToIPv6Cidr(aIPv6Prefix.c_str(), &Net6, &iPrefixLength);
+        if (RT_FAILURE(vrc))
+            return setError(E_INVALIDARG, tr("%s is not a valid IPv6 prefix"), aIPv6Prefix.c_str());
 
         /* Accept both addr:: and addr::/64 */
@@ -471 +464 @@
             iPrefixLength = 64;     /*   take it to mean /64 which we require anyway */
         else if (iPrefixLength != 64)
-            return setError(E_INVALIDARG,
-                            tr("Invalid IPv6 prefix length %d, must be 64"),
-                            iPrefixLength);
+            return setError(E_INVALIDARG, tr("Invalid IPv6 prefix length %d, must be 64"), iPrefixLength);
 
         /* Verify the address is unicast. */
-        if (   ((Net6.au8[0] & 0xe0) != 0x20)  /* global 2000::/3 */
-            && ((Net6.au8[0] & 0xfe) != 0xfc)) /* local  fc00::/7 */
-            return setError(E_INVALIDARG,
-                            tr("IPv6 prefix %RTnaipv6 is not unicast"),
-                            &Net6);
+        if (   (Net6.au8[0] & 0xe0) != 0x20  /* global 2000::/3 */
+            && (Net6.au8[0] & 0xfe) != 0xfc) /* local  fc00::/7 */
+            return setError(E_INVALIDARG, tr("IPv6 prefix %RTnaipv6 is not unicast"), &Net6);
 
         /* Verify the interfaces ID part is zero */
         if (Net6.au64[1] != 0)
-            return setError(E_INVALIDARG,
-                            tr("Non-zero bits in the interface ID part"
-                               " of the IPv6 prefix %RTnaipv6/64"),
-                            &Net6);
-
-        rc = strNormalizedIPv6Prefix.printfNoThrow("%RTnaipv6/64", &Net6);
-        if (RT_FAILURE(rc))
+            return setError(E_INVALIDARG, tr("Non-zero bits in the interface ID part of the IPv6 prefix %RTnaipv6/64"), &Net6);
+
+        vrc = strNormalizedIPv6Prefix.printfNoThrow("%RTnaipv6/64", &Net6);
+        if (RT_FAILURE(vrc))
         {
-            if (rc == VERR_NO_MEMORY)
+            if (vrc == VERR_NO_MEMORY)
                 return setError(E_OUTOFMEMORY);
-            else
-                return setError(E_FAIL, tr("Internal error"));
+            return setError(E_FAIL, tr("Internal error"));
         }
     }
@@ -557 +542 @@
 
     AutoWriteLock vboxLock(m->pVirtualBox COMMA_LOCKVAL_SRC_POS);
-    HRESULT rc = m->pVirtualBox->i_saveSettings();
-    ComAssertComRCRetRC(rc);
+    HRESULT hrc = m->pVirtualBox->i_saveSettings();
+    ComAssertComRCRetRC(hrc);
 
     return S_OK;
@@ -586 +571 @@
 
     AutoWriteLock vboxLock(m->pVirtualBox COMMA_LOCKVAL_SRC_POS);
-    HRESULT rc = m->pVirtualBox->i_saveSettings();
-    ComAssertComRCRetRC(rc);
+    HRESULT hrc = m->pVirtualBox->i_saveSettings();
+    ComAssertComRCRetRC(hrc);
 
     return S_OK;
@@ -611 +596 @@
 HRESULT NATNetwork::addLocalMapping(const com::Utf8Str &aHostId, LONG aOffset)
 {
-    RTNETADDRIPV4 addr, net, mask;
-
-    int rc = RTNetStrToIPv4Addr(Utf8Str(aHostId).c_str(), &addr);
-    if (RT_FAILURE(rc))
+    RTNETADDRIPV4 addr;
+    int vrc = RTNetStrToIPv4Addr(Utf8Str(aHostId).c_str(), &addr);
+    if (RT_FAILURE(vrc))
         return E_INVALIDARG;
 
@@ -622 +606 @@
 
     /* check against networkid vs network mask */
-    rc = RTCidrStrToIPv4(Utf8Str(m->s.strIPv4NetworkCidr).c_str(), &net, &mask);
-    if (RT_FAILURE(rc))
+    RTNETADDRIPV4 net, mask;
+    vrc = RTCidrStrToIPv4(Utf8Str(m->s.strIPv4NetworkCidr).c_str(), &net, &mask);
+    if (RT_FAILURE(vrc))
         return E_INVALIDARG;
 
@@ -773 +758 @@
     {
         AutoWriteLock vboxLock(m->pVirtualBox COMMA_LOCKVAL_SRC_POS);
-        HRESULT rc = m->pVirtualBox->i_saveSettings();
-        ComAssertComRCRetRC(rc);
+        HRESULT hrc = m->pVirtualBox->i_saveSettings();
+        ComAssertComRCRetRC(hrc);
     }
 
@@ -818 +803 @@
     {
         AutoWriteLock vboxLock(m->pVirtualBox COMMA_LOCKVAL_SRC_POS);
-        HRESULT rc = m->pVirtualBox->i_saveSettings();
-        ComAssertComRCRetRC(rc);
+        HRESULT hrc = m->pVirtualBox->i_saveSettings();
+        ComAssertComRCRetRC(hrc);
     }
 
@@ -857 +842 @@
 {
     RTNETADDRIPV4 networkid, netmask;
-
-    int rc = RTCidrStrToIPv4(m->s.strIPv4NetworkCidr.c_str(), &networkid, &netmask);
-    if (RT_FAILURE(rc))
-    {
-        LogRel(("NATNetwork: Failed to parse cidr %s with %Rrc\n", m->s.strIPv4NetworkCidr.c_str(), rc));
+    int vrc = RTCidrStrToIPv4(m->s.strIPv4NetworkCidr.c_str(), &networkid, &netmask);
+    if (RT_FAILURE(vrc))
+    {
+        LogRel(("NATNetwork: Failed to parse cidr %s with %Rrc\n", m->s.strIPv4NetworkCidr.c_str(), vrc));
         return;
     }
@@ -898 +882 @@
         for (size_t i = 0; i < cAddresses; ++i)
         {
+            com::Utf8Str strNameServerAddress(nameServers[i]);
             RTNETADDRIPV4 addr;
-
-            com::Utf8Str strNameServerAddress(nameServers[i]);
-            rc = RTNetStrToIPv4Addr(strNameServerAddress.c_str(), &addr);
-            if (RT_FAILURE(rc))
+            vrc = RTNetStrToIPv4Addr(strNameServerAddress.c_str(), &addr);
+            if (RT_FAILURE(vrc))
             {
-                LogRel(("NATNetwork: Failed to parse IP address %s with %Rrc\n", strNameServerAddress.c_str(), rc));
+                LogRel(("NATNetwork: Failed to parse IP address %s with %Rrc\n", strNameServerAddress.c_str(), vrc));
                 continue;
             }
@@ -1092 +1075 @@
 {
     RTNETADDRIPV4 network, netmask;
-
-    int rc = RTCidrStrToIPv4(m->s.strIPv4NetworkCidr.c_str(),
-                             &network,
-                             &netmask);
-    AssertRCReturn(rc, rc);
+    int vrc = RTCidrStrToIPv4(m->s.strIPv4NetworkCidr.c_str(), &network, &netmask);
+    AssertRCReturn(vrc, vrc);
 
     uint32_t off;
@@ -1146 +1126 @@
 {
     RTNETADDRIPV4 network, netmask;
-    int rc = RTCidrStrToIPv4(m->s.strIPv4NetworkCidr.c_str(),
-                             &network,
-                             &netmask);
-    AssertRCReturn(rc, rc);
+    int vrc = RTCidrStrToIPv4(m->s.strIPv4NetworkCidr.c_str(), &network, &netmask);
+    AssertRCReturn(vrc, vrc);
 
     i_findFirstAvailableOffset(ADDR_GATEWAY, &m->offGateway);
@@ -1203 +1181 @@
 int NATNetwork::i_recalculateIPv6Prefix()
 {
-    int rc;
-
     RTNETADDRIPV4 net, mask;
-    rc = RTCidrStrToIPv4(Utf8Str(m->s.strIPv4NetworkCidr).c_str(), &net, &mask);
-    if (RT_FAILURE(rc))
-        return rc;
+    int vrc = RTCidrStrToIPv4(Utf8Str(m->s.strIPv4NetworkCidr).c_str(), &net, &mask);
+    if (RT_FAILURE(vrc))
+        return vrc;
 
     net.u = RT_H2N_U32(net.u);  /* XXX: fix RTCidrStrToIPv4! */

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

@@ -351 +351 @@
 HRESULT NetworkAdapter::i_updateMacAddress(Utf8Str aMACAddress)
 {
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
 
     /*
@@ -369 +369 @@
                 char *macAddressStr = aMACAddress.mutableRaw();
                 int i = 0;
-                while ((i < 13) && macAddressStr && *macAddressStr && (rc == S_OK))
+                while ((i < 13) && macAddressStr && *macAddressStr && hrc == S_OK)
                 {
                     char c = *macAddressStr;
@@ -381 +381 @@
                     if (   (c < '0' || c > '9')
                         && (c < 'A' || c > 'F'))
-                        rc = setError(E_INVALIDARG, tr("Invalid MAC address format"));
+                        hrc = setError(E_INVALIDARG, tr("Invalid MAC address format"));
                     /* the second digit must have even value for unicast addresses */
                     if (   (i == 1)
                         && (!!(c & 1) == (c >= '0' && c <= '9')))
-                        rc = setError(E_INVALIDARG, tr("Invalid MAC address format"));
+                        hrc = setError(E_INVALIDARG, tr("Invalid MAC address format"));
 
                     macAddressStr++;
@@ -392 +392 @@
                 /* we must have parsed exactly 12 characters */
                 if (i != 12)
-                    rc = setError(E_INVALIDARG, tr("Invalid MAC address format"));
+                    hrc = setError(E_INVALIDARG, tr("Invalid MAC address format"));
             }
 
-            if (SUCCEEDED(rc))
+            if (SUCCEEDED(hrc))
                 mData->strMACAddress = aMACAddress;
         }
     }
 
-    return rc;
+    return hrc;
 }
 
@@ -412 +412 @@
     mData.backup();
 
-    HRESULT rc = i_updateMacAddress(aMACAddress);
-    if (SUCCEEDED(rc))
+    HRESULT hrc = i_updateMacAddress(aMACAddress);
+    if (SUCCEEDED(hrc))
     {
         // leave the lock before informing callbacks
@@ -427 +427 @@
     }
 
-    return rc;
+    return hrc;
 }
 
@@ -507 +507 @@
     com::SafeIfaceArray<IHostNetworkInterface> hostNetworkInterfaces;
     ComPtr<IHost> host;
-    HRESULT rc = mParent->i_getVirtualBox()->COMGETTER(Host)(host.asOutParam());
-    if (SUCCEEDED(rc))
+    HRESULT hrc = mParent->i_getVirtualBox()->COMGETTER(Host)(host.asOutParam());
+    if (SUCCEEDED(hrc))
     {
         host->FindHostNetworkInterfacesOfType(HostNetworkInterfaceType_Bridged,
@@ -1212 +1212 @@
      * default to B. */
 
-    HRESULT rc = S_OK;
-
     /* MAC address (can be null) */
-    rc = i_updateMacAddress(data.strMACAddress);
-    if (FAILED(rc)) return rc;
+    HRESULT hrc = i_updateMacAddress(data.strMACAddress);
+    if (FAILED(hrc)) return hrc;
 
     mData.assignCopy(&data);
@@ -1223 +1221 @@
     {
         ComObjPtr<BandwidthGroup> group;
-        rc = bwctl->i_getBandwidthGroupByName(data.strBandwidthGroup, group, true);
-        if (FAILED(rc)) return rc;
+        hrc = bwctl->i_getBandwidthGroupByName(data.strBandwidthGroup, group, true);
+        if (FAILED(hrc)) return hrc;
         group->i_reference();
     }
@@ -1234 +1232 @@
     alock.release();
 
-    rc = COMSETTER(AttachmentType)(data.mode);
-    if (FAILED(rc)) return rc;
+    hrc = COMSETTER(AttachmentType)(data.mode);
+    if (FAILED(hrc)) return hrc;
 
     return S_OK;
@@ -1417 +1415 @@
 
     ComObjPtr<GuestOSType> pGuestOSType;
-    HRESULT rc = mParent->i_getVirtualBox()->i_findGuestOSType(mParent->i_getOSTypeId(),
-                                                               pGuestOSType);
-    if (FAILED(rc))
+    HRESULT hrc = mParent->i_getVirtualBox()->i_findGuestOSType(mParent->i_getOSTypeId(), pGuestOSType);
+    if (FAILED(hrc))
         return false;
 

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

@@ -170 +170 @@
 int NetworkServiceRunner::addArgPair(const char *pszOption, const char *pszValue)
 {
-    int rc = addArgument(pszOption);
-    if (RT_SUCCESS(rc))
-        rc = addArgument(pszValue);
-    return rc;
+    int vrc = addArgument(pszOption);
+    if (RT_SUCCESS(vrc))
+        vrc = addArgument(pszValue);
+    return vrc;
 }
 
@@ -221 +221 @@
      * Start the process:
      */
-    int rc = RTProcCreate(szExePath, m->papszArgs, RTENV_DEFAULT, 0, &m->Process);
-    if (RT_SUCCESS(rc))
+    vrc = RTProcCreate(szExePath, m->papszArgs, RTENV_DEFAULT, 0, &m->Process);
+    if (RT_SUCCESS(vrc))
         LogRel(("NetworkServiceRunning: started '%s', pid %RTproc\n", m->pszProcName, m->Process));
     else
@@ -229 +229 @@
     m->fKillProcessOnStop = aKillProcessOnStop;
 
-    return rc;
+    return vrc;
 }
 
@@ -267 +267 @@
         RTProcTerminate(m->Process);
 
-        int rc = RTProcWait(m->Process, RTPROCWAIT_FLAGS_BLOCK, NULL);
-        NOREF(rc);
+        int vrc = RTProcWait(m->Process, RTPROCWAIT_FLAGS_BLOCK, NULL);
+        NOREF(vrc);
     }
 
@@ -287 +287 @@
     {
         RTPROCSTATUS ExitStatus;
-        int rc = RTProcWait(Process, RTPROCWAIT_FLAGS_NOBLOCK, &ExitStatus);
-        if (rc == VERR_PROCESS_RUNNING)
+        int vrc = RTProcWait(Process, RTPROCWAIT_FLAGS_NOBLOCK, &ExitStatus);
+        if (vrc == VERR_PROCESS_RUNNING)
             return true;
         LogRel(("NetworkServiceRunning: %s (pid %RTproc) stopped: iStatus=%u enmReason=%d\n",

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

@@ -425 +425 @@
 {
     Assert(mGuests.size() == 0);
-    int rcThread = 0;
     HRESULT hrc = enqueueRequest(new CGRQAbort());
     if (SUCCEEDED(hrc))
@@ -431 +430 @@
         /* We wait only if we were able to put the abort request to a queue */
         Log7Func(("{%p}: Waiting for CGM request processing thread to stop...\n", this));
-        int vrc = RTThreadWait(mThread, 1000 /* 1 sec */, &rcThread);
-        Log7Func(("{%p}: RTThreadWait returned %Rrc (thread exit code: %Rrc)\n", this, vrc, rcThread));
+        int vrcThread = VINF_SUCCESS;
+        int vrc = RTThreadWait(mThread, 1000 /* 1 sec */, &vrcThread);
+        Log7Func(("{%p}: RTThreadWait returned %Rrc (thread exit code: %Rrc)\n", this, vrc, vrcThread));
         RT_NOREF(vrc);
     }
@@ -559 +559 @@
     CollectorGuestManager *mgr = static_cast<CollectorGuestManager*>(pvUser);
 
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
 
     Log7Func(("{%p}: Starting request processing loop...\n", mgr));
@@ -568 +568 @@
 #endif /* DEBUG */
         mgr->mGuestBeingCalled = pReq->getGuest();
-        rc = pReq->execute();
+        hrc = pReq->execute();
         mgr->mGuestBeingCalled = NULL;
         delete pReq;
-        if (rc == E_ABORT)
+        if (hrc == E_ABORT)
             break;
-        if (FAILED(rc))
-            Log7Func(("{%p}: request::execute returned %u\n", mgr, rc));
-    }
-    Log7Func(("{%p}: Exiting request processing loop... rc=%u\n", mgr, rc));
+        if (FAILED(hrc))
+            Log7Func(("{%p}: request::execute returned %Rhrc\n", mgr, hrc));
+    }
+    Log7Func(("{%p}: Exiting request processing loop... hrc=%Rhrc\n", mgr, hrc));
 
     return VINF_SUCCESS;
@@ -960 +960 @@
 HRESULT HostRamVmm::disable()
 {
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
     BaseMetric::disable();
     CollectorGuest *provider = mCollectorGuestManager->getVMMStatsProvider();
     if (provider)
-        rc = provider->disable(VMSTATS_VMM_RAM);
-    return rc;
+        hrc = provider->disable(VMSTATS_VMM_RAM);
+    return hrc;
 }
 
@@ -1140 +1140 @@
 HRESULT MachineNetRate::enable()
 {
-    HRESULT rc = mCGuest->enable(VMSTATS_NET_RATE);
+    HRESULT hrc = mCGuest->enable(VMSTATS_NET_RATE);
     BaseMetric::enable();
-    return rc;
+    return hrc;
 }
 
@@ -1184 +1184 @@
 HRESULT GuestCpuLoad::enable()
 {
-    HRESULT rc = mCGuest->enable(VMSTATS_GUEST_CPULOAD);
+    HRESULT hrc = mCGuest->enable(VMSTATS_GUEST_CPULOAD);
     BaseMetric::enable();
-    return rc;
+    return hrc;
 }
 
@@ -1224 +1224 @@
 HRESULT GuestRamUsage::enable()
 {
-    HRESULT rc = mCGuest->enable(VMSTATS_GUEST_RAMUSAGE);
+    HRESULT hrc = mCGuest->enable(VMSTATS_GUEST_RAMUSAGE);
     BaseMetric::enable();
-    return rc;
+    return hrc;
 }
 

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

@@ -190 +190 @@
     LogFlowThisFuncEnter();
 
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
 
     m.hal = pm::createHAL();
@@ -203 +203 @@
     AssertMsgRC(vrc, ("Failed to create resource usage sampling timer(%Rra)\n", vrc));
     if (RT_FAILURE(vrc))
-        rc = E_FAIL;
-
-    if (SUCCEEDED(rc))
+        hrc = E_FAIL;
+
+    if (SUCCEEDED(hrc))
         autoInitSpan.setSucceeded();
 
     LogFlowThisFuncLeave();
 
-    return rc;
+    return hrc;
 }
 
@@ -288 +288 @@
 {
     ComObjPtr<PerformanceMetric> metric;
-    HRESULT rc = metric.createObject();
-    if (SUCCEEDED(rc))
-        rc = metric->init(src);
-    AssertComRCReturnRC(rc);
+    HRESULT hrc = metric.createObject();
+    if (SUCCEEDED(hrc))
+        hrc = metric->init(src);
+    AssertComRCReturnRC(hrc);
     dst = metric;
-    return rc;
+    return hrc;
 }
 
@@ -299 +299 @@
 {
     ComObjPtr<PerformanceMetric> metric;
-    HRESULT rc = metric.createObject();
-    if (SUCCEEDED(rc))
-        rc = metric->init(src);
-    AssertComRCReturnRC(rc);
+    HRESULT hrc = metric.createObject();
+    if (SUCCEEDED(hrc))
+        hrc = metric->init(src);
+    AssertComRCReturnRC(hrc);
     dst = metric;
-    return rc;
+    return hrc;
 }
 
@@ -319 +319 @@
                                          std::vector<ComPtr<IPerformanceMetric> > &aMetrics)
 {
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
 
     pm::Filter filter(aMetricNames, aObjects);
@@ -336 +336 @@
     {
         ComObjPtr<PerformanceMetric> metric;
-        rc = metric.createObject();
-        if (SUCCEEDED(rc))
-            rc = metric->init(*it);
-        AssertComRCReturnRC(rc);
+        hrc = metric.createObject();
+        if (SUCCEEDED(hrc))
+            hrc = metric->init(*it);
+        AssertComRCReturnRC(hrc);
         LogFlow(("PerformanceCollector::GetMetrics() store a metric at retMetrics[%zu]...\n", i));
         aMetrics[i++] = metric;
     }
-    return rc;
+    return hrc;
 }
 
@@ -356 +356 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
     BaseMetricList filteredMetrics;
     BaseMetricList::iterator it;
@@ -369 +369 @@
                 LogFlow(("PerformanceCollector::SetupMetrics() disabling %s\n",
                          (*it)->getName()));
-                rc = (*it)->disable();
-                if (FAILED(rc))
+                hrc = (*it)->disable();
+                if (FAILED(hrc))
                     break;
             }
@@ -377 +377 @@
                 LogFlow(("PerformanceCollector::SetupMetrics() enabling %s\n",
                          (*it)->getName()));
-                rc = (*it)->enable();
-                if (FAILED(rc))
+                hrc = (*it)->enable();
+                if (FAILED(hrc))
                     break;
             }
@@ -387 +387 @@
     size_t i = 0;
     for (it = filteredMetrics.begin();
-         it != filteredMetrics.end() && SUCCEEDED(rc); ++it)
-        rc = toIPerformanceMetric(*it, aAffectedMetrics[i++]);
-
-    if (FAILED(rc))
+         it != filteredMetrics.end() && SUCCEEDED(hrc); ++it)
+        hrc = toIPerformanceMetric(*it, aAffectedMetrics[i++]);
+
+    if (FAILED(hrc))
         return setError(E_FAIL, tr("Failed to setup metrics for '%s'"),
                         getFailedGuestName().c_str());
-    return rc;
+    return hrc;
 }
 
@@ -406 +406 @@
                                 /* care for those who come next :-). */
 
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
     BaseMetricList filteredMetrics;
     BaseMetricList::iterator it;
@@ -412 +412 @@
         if (filter.match((*it)->getObject(), (*it)->getName()))
         {
-            rc = (*it)->enable();
-            if (FAILED(rc))
+            hrc = (*it)->enable();
+            if (FAILED(hrc))
                 break;
             filteredMetrics.push_back(*it);
@@ -421 +421 @@
     size_t i = 0;
     for (it = filteredMetrics.begin();
-         it != filteredMetrics.end() && SUCCEEDED(rc); ++it)
-        rc = toIPerformanceMetric(*it, aAffectedMetrics[i++]);
+         it != filteredMetrics.end() && SUCCEEDED(hrc); ++it)
+        hrc = toIPerformanceMetric(*it, aAffectedMetrics[i++]);
 
     LogFlowThisFuncLeave();
 
-    if (FAILED(rc))
+    if (FAILED(hrc))
         return setError(E_FAIL, tr("Failed to enable metrics for '%s'"),
                         getFailedGuestName().c_str());
-    return rc;
+    return hrc;
 }
 
@@ -442 +442 @@
                                 /* care for those who come next :-). */
 
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
     BaseMetricList filteredMetrics;
     BaseMetricList::iterator it;
@@ -448 +448 @@
         if (filter.match((*it)->getObject(), (*it)->getName()))
         {
-            rc = (*it)->disable();
-            if (FAILED(rc))
+            hrc = (*it)->disable();
+            if (FAILED(hrc))
                 break;
             filteredMetrics.push_back(*it);
@@ -457 +457 @@
     size_t i = 0;
     for (it = filteredMetrics.begin();
-         it != filteredMetrics.end() && SUCCEEDED(rc); ++it)
-        rc = toIPerformanceMetric(*it, aAffectedMetrics[i++]);
+         it != filteredMetrics.end() && SUCCEEDED(hrc); ++it)
+        hrc = toIPerformanceMetric(*it, aAffectedMetrics[i++]);
 
     LogFlowThisFuncLeave();
 
-    if (FAILED(rc))
+    if (FAILED(hrc))
         return setError(E_FAIL, tr("Failed to disable metrics for '%s'"),
                         getFailedGuestName().c_str());
-    return rc;
+    return hrc;
 }
 
@@ -621 +621 @@
     if (!SUCCEEDED(autoCaller.hrc())) return;
 
-    int rc = RTTimerLRStop(m.sampler);
-    if (   RT_FAILURE(rc)
-        && rc != VERR_TIMER_SUSPENDED)     /* calling suspendSampling() successively shouldn't assert. See @bugref{3495}. */
-        AssertMsgFailed(("PerformanceCollector::suspendSampling(): RTTimerLRStop returned %Rrc\n", rc));
+    int vrc = RTTimerLRStop(m.sampler);
+    if (   RT_FAILURE(vrc)
+        && vrc != VERR_TIMER_SUSPENDED)     /* calling suspendSampling() successively shouldn't assert. See @bugref{3495}. */
+        AssertMsgFailed(("PerformanceCollector::suspendSampling(): RTTimerLRStop returned %Rrc\n", vrc));
 }
 
@@ -632 +632 @@
     if (!SUCCEEDED(autoCaller.hrc())) return;
 
-    int rc = RTTimerLRStart(m.sampler, 0);
-    if (   RT_FAILURE(rc)
-        && rc != VERR_TIMER_ACTIVE)     /* calling resumeSampling() successively shouldn't assert. See @bugref{3495}. */
-        AssertMsgFailed(("PerformanceCollector::resumeSampling(): RTTimerLRStart returned %Rrc\n", rc));
+    int vrc = RTTimerLRStart(m.sampler, 0);
+    if (   RT_FAILURE(vrc)
+        && vrc != VERR_TIMER_ACTIVE)     /* calling resumeSampling() successively shouldn't assert. See @bugref{3495}. */
+        AssertMsgFailed(("PerformanceCollector::resumeSampling(): RTTimerLRStart returned %Rrc\n", vrc));
 }
 

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

@@ -55 +55 @@
     muOtherProgressStartOperation = 0;
 
-    HRESULT rc = Progress::FinalConstruct();
-    return rc;
+    return Progress::FinalConstruct();
 }
 

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

@@ -577 +577 @@
         pGraphicsAdapter->COMGETTER(MonitorCount)(&cMonitors);
 
-    int rc2 = i_syncToMachineDisplays(cMonitors);
-    AssertRC(rc2);
+    int vrc2 = i_syncToMachineDisplays(cMonitors);
+    AssertRC(vrc2);
 
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);

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

@@ -404 +404 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
 
     if (m->bd->ulIOBase != aIOBase)
@@ -422 +422 @@
     }
 
-    return rc;
+    return hrc;
 }
 
@@ -445 +445 @@
     if (aPath != m->bd->strPath)
     {
-        HRESULT rc = i_checkSetPath(aPath);
-        if (FAILED(rc)) return rc;
+        HRESULT hrc = i_checkSetPath(aPath);
+        if (FAILED(hrc)) return hrc;
 
         m->bd.backup();

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

@@ -384 +384 @@
 HRESULT Snapshot::setName(const com::Utf8Str &aName)
 {
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
 
     // prohibit setting a UUID only as the machine name, or else it can
@@ -399 +399 @@
         m->strName = aName;
         alock.release(); /* Important! (child->parent locks are forbidden) */
-        rc = m->pMachine->i_onSnapshotChange(this);
-    }
-
-    return rc;
+        hrc = m->pMachine->i_onSnapshotChange(this);
+    }
+
+    return hrc;
 }
 
@@ -414 +414 @@
 HRESULT Snapshot::setDescription(const com::Utf8Str &aDescription)
 {
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -421 +421 @@
         m->strDescription = aDescription;
         alock.release(); /* Important! (child->parent locks are forbidden) */
-        rc = m->pMachine->i_onSnapshotChange(this);
-    }
-
-    return rc;
+        hrc = m->pMachine->i_onSnapshotChange(this);
+    }
+
+    return hrc;
 }
 
@@ -903 +903 @@
         llSettingsTodo.pop_front();
 
-        HRESULT rc = pSnapshot->i_saveSnapshotOne(*current);
-        if (FAILED(rc))
-            return rc;
+        HRESULT hrc = pSnapshot->i_saveSnapshotOne(*current);
+        if (FAILED(hrc))
+            return hrc;
 
         /* save all children */
@@ -954 +954 @@
     Assert(m->pMachine->isWriteLockOnCurrentThread());
 
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
 
     SnapshotsList llSnapshotsTodo;
@@ -987 +987 @@
         llSnapshotsAll.pop_front();
 
-        rc = pSnapshot->m->pMachine->i_detachAllMedia(writeLock,
-                                                      pSnapshot,
-                                                      cleanupMode,
-                                                      llMedia);
-        if (SUCCEEDED(rc))
+        hrc = pSnapshot->m->pMachine->i_detachAllMedia(writeLock, pSnapshot, cleanupMode, llMedia);
+        if (SUCCEEDED(hrc))
         {
             Utf8Str strFile;
@@ -1096 +1093 @@
     mSSData->strStateFilePath = aStateFilePath;
 
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
 
     /* Create copies of all attachments (mMediaData after attaching a copy
@@ -1110 +1107 @@
         ComObjPtr<MediumAttachment> pAtt;
         pAtt.createObject();
-        rc = pAtt->initCopy(this, *it);
-        if (FAILED(rc)) return rc;
+        hrc = pAtt->initCopy(this, *it);
+        if (FAILED(hrc)) return hrc;
         mMediumAttachments->push_back(pAtt);
 
@@ -1117 +1114 @@
         if (pMedium) // can be NULL for non-harddisk
         {
-            rc = pMedium->i_addBackReference(mData->mUuid, mSnapshotId);
-            AssertComRC(rc);
+            hrc = pMedium->i_addBackReference(mData->mUuid, mSnapshotId);
+            AssertComRC(hrc);
         }
     }
@@ -1131 +1128 @@
         ComObjPtr<SharedFolder> pFolder;
         pFolder.createObject();
-        rc = pFolder->initCopy(this, *it);
-        if (FAILED(rc)) return rc;
+        hrc = pFolder->initCopy(this, *it);
+        if (FAILED(hrc)) return hrc;
         *it = pFolder;
     }
@@ -1145 +1142 @@
         ComObjPtr<PCIDeviceAttachment> pDev;
         pDev.createObject();
-        rc = pDev->initCopy(this, *it);
-        if (FAILED(rc)) return rc;
+        hrc = pDev->initCopy(this, *it);
+        if (FAILED(hrc)) return hrc;
         *it = pDev;
     }
@@ -1160 +1157 @@
         ComObjPtr<StorageController> ctrl;
         ctrl.createObject();
-        rc = ctrl->initCopy(this, *it);
-        if (FAILED(rc)) return rc;
+        hrc = ctrl->initCopy(this, *it);
+        if (FAILED(hrc)) return hrc;
         mStorageControllers->push_back(ctrl);
     }
@@ -1168 +1165 @@
 
     unconst(mBIOSSettings).createObject();
-    rc = mBIOSSettings->initCopy(this, pMachine->mBIOSSettings);
-    if (FAILED(rc)) return rc;
+    hrc = mBIOSSettings->initCopy(this, pMachine->mBIOSSettings);
+    if (FAILED(hrc)) return hrc;
 
     unconst(mRecordingSettings).createObject();
-    rc = mRecordingSettings->initCopy(this, pMachine->mRecordingSettings);
-    if (FAILED(rc)) return rc;
+    hrc = mRecordingSettings->initCopy(this, pMachine->mRecordingSettings);
+    if (FAILED(hrc)) return hrc;
 
     unconst(mTrustedPlatformModule).createObject();
-    rc = mTrustedPlatformModule->initCopy(this, pMachine->mTrustedPlatformModule);
-    if (FAILED(rc)) return rc;
+    hrc = mTrustedPlatformModule->initCopy(this, pMachine->mTrustedPlatformModule);
+    if (FAILED(hrc)) return hrc;
 
     unconst(mNvramStore).createObject();
-    rc = mNvramStore->initCopy(this, pMachine->mNvramStore);
-    if (FAILED(rc)) return rc;
+    hrc = mNvramStore->initCopy(this, pMachine->mNvramStore);
+    if (FAILED(hrc)) return hrc;
 
     unconst(mGraphicsAdapter).createObject();
-    rc = mGraphicsAdapter->initCopy(this, pMachine->mGraphicsAdapter);
-    if (FAILED(rc)) return rc;
+    hrc = mGraphicsAdapter->initCopy(this, pMachine->mGraphicsAdapter);
+    if (FAILED(hrc)) return hrc;
 
     unconst(mVRDEServer).createObject();
-    rc = mVRDEServer->initCopy(this, pMachine->mVRDEServer);
-    if (FAILED(rc)) return rc;
+    hrc = mVRDEServer->initCopy(this, pMachine->mVRDEServer);
+    if (FAILED(hrc)) return hrc;
 
     unconst(mAudioSettings).createObject();
-    rc = mAudioSettings->initCopy(this, pMachine->mAudioSettings);
-    if (FAILED(rc)) return rc;
+    hrc = mAudioSettings->initCopy(this, pMachine->mAudioSettings);
+    if (FAILED(hrc)) return hrc;
 
     /* create copies of all USB controllers (mUSBControllerData
@@ -1205 +1202 @@
         ComObjPtr<USBController> ctrl;
         ctrl.createObject();
-        rc = ctrl->initCopy(this, *it);
-        if (FAILED(rc)) return rc;
+        hrc = ctrl->initCopy(this, *it);
+        if (FAILED(hrc)) return hrc;
         mUSBControllers->push_back(ctrl);
     }
 
     unconst(mUSBDeviceFilters).createObject();
-    rc = mUSBDeviceFilters->initCopy(this, pMachine->mUSBDeviceFilters);
-    if (FAILED(rc)) return rc;
+    hrc = mUSBDeviceFilters->initCopy(this, pMachine->mUSBDeviceFilters);
+    if (FAILED(hrc)) return hrc;
 
     mNetworkAdapters.resize(pMachine->mNetworkAdapters.size());
@@ -1218 +1215 @@
     {
         unconst(mNetworkAdapters[slot]).createObject();
-        rc = mNetworkAdapters[slot]->initCopy(this, pMachine->mNetworkAdapters[slot]);
-        if (FAILED(rc)) return rc;
+        hrc = mNetworkAdapters[slot]->initCopy(this, pMachine->mNetworkAdapters[slot]);
+        if (FAILED(hrc)) return hrc;
     }
 
@@ -1225 +1222 @@
     {
         unconst(mSerialPorts[slot]).createObject();
-        rc = mSerialPorts[slot]->initCopy(this, pMachine->mSerialPorts[slot]);
-        if (FAILED(rc)) return rc;
+        hrc = mSerialPorts[slot]->initCopy(this, pMachine->mSerialPorts[slot]);
+        if (FAILED(hrc)) return hrc;
     }
 
@@ -1232 +1229 @@
     {
         unconst(mParallelPorts[slot]).createObject();
-        rc = mParallelPorts[slot]->initCopy(this, pMachine->mParallelPorts[slot]);
-        if (FAILED(rc)) return rc;
+        hrc = mParallelPorts[slot]->initCopy(this, pMachine->mParallelPorts[slot]);
+        if (FAILED(hrc)) return hrc;
     }
 
     unconst(mBandwidthControl).createObject();
-    rc = mBandwidthControl->initCopy(this, pMachine->mBandwidthControl);
-    if (FAILED(rc)) return rc;
+    hrc = mBandwidthControl->initCopy(this, pMachine->mBandwidthControl);
+    if (FAILED(hrc)) return hrc;
 
     unconst(mGuestDebugControl).createObject();
-    rc = mGuestDebugControl->initCopy(this, pMachine->mGuestDebugControl);
-    if (FAILED(rc)) return rc;
+    hrc = mGuestDebugControl->initCopy(this, pMachine->mGuestDebugControl);
+    if (FAILED(hrc)) return hrc;
 
     /* Confirm a successful initialization when it's the case */
@@ -1436 +1433 @@
     mMachine->i_setModified(Machine::IsModified_Snapshots, false /* fAllowStateModification */);
     slock.release();
-    HRESULT rc = mMachine->i_saveSettings(&fNeedsGlobalSaveSettings,
-                                          alock,
-                                          SaveS_Force);        // we know we need saving, no need to check
+    HRESULT hrc = mMachine->i_saveSettings(&fNeedsGlobalSaveSettings,
+                                           alock,
+                                           SaveS_Force);        // we know we need saving, no need to check
     alock.release();
 
-    if (SUCCEEDED(rc) && fNeedsGlobalSaveSettings)
+    if (SUCCEEDED(hrc) && fNeedsGlobalSaveSettings)
     {
         // save the global settings
         AutoWriteLock vboxlock(mParent COMMA_LOCKVAL_SRC_POS);
-        rc = mParent->i_saveSettings();
+        hrc = mParent->i_saveSettings();
     }
 
@@ -1451 +1448 @@
     mParent->i_onSnapshotChanged(uuidMachine, uuidSnapshot);
 
-    return rc;
+    return hrc;
 }
 
@@ -1634 +1631 @@
                         Global::stringifyMachineState(mData->mMachineState));
 
-    HRESULT rc = i_checkStateDependency(MutableOrSavedOrRunningStateDep);
-    if (FAILED(rc))
-        return rc;
+    HRESULT hrc = i_checkStateDependency(MutableOrSavedOrRunningStateDep);
+    if (FAILED(hrc))
+        return hrc;
 
     // prepare the progress object:
@@ -1672 +1669 @@
     ComObjPtr<Progress> pProgress;
     pProgress.createObject();
-    rc = pProgress->init(mParent,
-                         static_cast<IMachine *>(this),
-                         Bstr(tr("Taking a snapshot of the virtual machine")).raw(),
-                         fTakingSnapshotOnline /* aCancelable */,
-                         cOperations,
-                         ulTotalOperationsWeight,
-                         Bstr(tr("Setting up snapshot operation")).raw(),      // first sub-op description
-                         1);        // ulFirstOperationWeight
-    if (FAILED(rc))
-        return rc;
+    hrc = pProgress->init(mParent,
+                          static_cast<IMachine *>(this),
+                          Bstr(tr("Taking a snapshot of the virtual machine")).raw(),
+                          fTakingSnapshotOnline /* aCancelable */,
+                          cOperations,
+                          ulTotalOperationsWeight,
+                          Bstr(tr("Setting up snapshot operation")).raw(),      // first sub-op description
+                          1);        // ulFirstOperationWeight
+    if (FAILED(hrc))
+        return hrc;
 
     /* create an ID for the snapshot */
@@ -1700 +1697 @@
                                                    fTakingSnapshotOnline);
     MachineState_T const machineStateBackup = pTask->m_machineStateBackup;
-    rc = pTask->createThread();
+    hrc = pTask->createThread();
     pTask = NULL;
-    if (FAILED(rc))
-        return rc;
+    if (FAILED(hrc))
+        return hrc;
 
     /* set the proper machine state (note: after creating a Task instance) */
@@ -1720 +1717 @@
     pProgress.queryInterfaceTo(aProgress.asOutParam());
 
-    return rc;
+    return hrc;
 }
 
@@ -1746 +1743 @@
     // 5) update the various snapshot/machine objects, save settings
 
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
     AutoCaller autoCaller(this);
     LogFlowThisFunc(("state=%d\n", getObjectState().getState()));
@@ -1753 +1750 @@
         /* we might have been uninitialized because the session was accidentally
          * closed by the client, so don't assert */
-        rc = setError(E_FAIL,
-                      tr("The session has been accidentally closed"));
-        task.m_pProgress->i_notifyComplete(rc);
+        hrc = setError(E_FAIL, tr("The session has been accidentally closed"));
+        task.m_pProgress->i_notifyComplete(hrc);
         LogFlowThisFuncLeave();
         return;
@@ -1789 +1785 @@
         /* save settings to ensure current changes are committed and
          * hard disks are fixed up */
-        rc = i_saveSettings(NULL, alock); /******************1 */
+        hrc = i_saveSettings(NULL, alock); /******************1 */
             // no need to check for whether VirtualBox.xml needs changing since
             // we can't have a machine XML rename pending at this point
-        if (FAILED(rc))
-            throw rc;
+        if (FAILED(hrc))
+            throw hrc;
 
         /* task.m_strStateFilePath is "" when the machine is offline or saved */
@@ -1799 +1795 @@
         {
             Bstr value;
-            rc = GetExtraData(Bstr("VBoxInternal2/ForceTakeSnapshotWithoutState").raw(),
-                              value.asOutParam());
-            if (FAILED(rc) || value != "1")
+            hrc = GetExtraData(Bstr("VBoxInternal2/ForceTakeSnapshotWithoutState").raw(), value.asOutParam());
+            if (FAILED(hrc) || value != "1")
                 // creating a new online snapshot: we need a fresh saved state file
                 i_composeSavedStateFilename(task.m_strStateFilePath);
@@ -1812 +1807 @@
         {
             // ensure the directory for the saved state file exists
-            rc = VirtualBox::i_ensureFilePathExists(task.m_strStateFilePath, true /* fCreate */);
-            if (FAILED(rc))
-                throw rc;
+            hrc = VirtualBox::i_ensureFilePathExists(task.m_strStateFilePath, true /* fCreate */);
+            if (FAILED(hrc))
+                throw hrc;
         }
 
@@ -1822 +1817 @@
         ComObjPtr<SnapshotMachine> pSnapshotMachine;
         pSnapshotMachine.createObject();
-        rc = pSnapshotMachine->init(this, task.m_uuidSnapshot.ref(), task.m_strStateFilePath);
-        AssertComRCThrowRC(rc);
+        hrc = pSnapshotMachine->init(this, task.m_uuidSnapshot.ref(), task.m_strStateFilePath);
+        AssertComRCThrowRC(hrc);
 
         /* create a snapshot object */
@@ -1829 +1824 @@
         RTTimeNow(&time);
         task.m_pSnapshot.createObject();
-        rc = task.m_pSnapshot->init(mParent,
-                                    task.m_uuidSnapshot,
-                                    task.m_strName,
-                                    task.m_strDescription,
-                                    time,
-                                    pSnapshotMachine,
-                                    mData->mCurrentSnapshot);
-        AssertComRCThrowRC(rc);
+        hrc = task.m_pSnapshot->init(mParent,
+                                     task.m_uuidSnapshot,
+                                     task.m_strName,
+                                     task.m_strDescription,
+                                     time,
+                                     pSnapshotMachine,
+                                     mData->mCurrentSnapshot);
+        AssertComRCThrowRC(hrc);
 
         /* STEP 2: create the diff images */
-        LogFlowThisFunc(("Creating differencing hard disks (online=%d)...\n",
-                         task.m_fTakingSnapshotOnline));
+        LogFlowThisFunc(("Creating differencing hard disks (online=%d)...\n", task.m_fTakingSnapshotOnline));
 
         // Backup the media data so we can recover if something goes wrong.
@@ -1849 +1843 @@
         alock.release();
         /* create new differencing hard disks and attach them to this machine */
-        rc = i_createImplicitDiffs(task.m_pProgress,
-                                   1,            // operation weight; must be the same as in Machine::TakeSnapshot()
-                                   task.m_fTakingSnapshotOnline);
-        if (FAILED(rc))
-            throw rc;
+        hrc = i_createImplicitDiffs(task.m_pProgress,
+                                    1,            // operation weight; must be the same as in Machine::TakeSnapshot()
+                                    task.m_fTakingSnapshotOnline);
+        if (FAILED(hrc))
+            throw hrc;
         alock.acquire();
 
@@ -1873 +1867 @@
                 alock.release();
                 task.m_pProgress->i_setCancelCallback(i_takeSnapshotProgressCancelCallback, &task);
-                rc = task.m_pDirectControl->SaveStateWithReason(Reason_Snapshot,
-                                                                task.m_pProgress,
-                                                                task.m_pSnapshot,
-                                                                Bstr(task.m_strStateFilePath).raw(),
-                                                                task.m_fPause,
-                                                                &fSuspendedBySave);
+                hrc = task.m_pDirectControl->SaveStateWithReason(Reason_Snapshot,
+                                                                 task.m_pProgress,
+                                                                 task.m_pSnapshot,
+                                                                 Bstr(task.m_strStateFilePath).raw(),
+                                                                 task.m_fPause,
+                                                                 &fSuspendedBySave);
                 task.m_pProgress->i_setCancelCallback(NULL, NULL);
                 alock.acquire();
-                if (FAILED(rc))
-                    throw rc;
+                if (FAILED(hrc))
+                    throw hrc;
             }
             else
@@ -1897 +1891 @@
 
             com::SafeIfaceArray<IMediumAttachment> atts;
-            rc = COMGETTER(MediumAttachments)(ComSafeArrayAsOutParam(atts));
-            if (FAILED(rc))
-                throw rc;
+            hrc = COMGETTER(MediumAttachments)(ComSafeArrayAsOutParam(atts));
+            if (FAILED(hrc))
+                throw hrc;
 
             alock.release();
-            rc = task.m_pDirectControl->ReconfigureMediumAttachments(ComSafeArrayAsInParam(atts));
+            hrc = task.m_pDirectControl->ReconfigureMediumAttachments(ComSafeArrayAsInParam(atts));
             alock.acquire();
-            if (FAILED(rc))
-                throw rc;
+            if (FAILED(hrc))
+                throw hrc;
         }
 
@@ -1915 +1909 @@
             Utf8Str strNVRAMSnapAbs;
             i_calculateFullPath(strNVRAMSnap, strNVRAMSnapAbs);
-            rc = VirtualBox::i_ensureFilePathExists(strNVRAMSnapAbs, true /* fCreate */);
-            if (FAILED(rc))
-                throw rc;
+            hrc = VirtualBox::i_ensureFilePathExists(strNVRAMSnapAbs, true /* fCreate */);
+            if (FAILED(hrc))
+                throw hrc;
             int vrc = RTFileCopy(strNVRAM.c_str(), strNVRAMSnapAbs.c_str());
             if (RT_FAILURE(vrc))
@@ -1965 +1959 @@
          * machine state to the state it had at the beginning.
          */
-        rc = i_finishTakingSnapshot(task, alock, true /*aSuccess*/); /*******************2+3 */
-        // do not throw rc here because we can't call i_finishTakingSnapshot() twice
-        LogFlowThisFunc(("i_finishTakingSnapshot -> %Rhrc [mMachineState=%s]\n", rc, ::stringifyMachineState(mData->mMachineState)));
-    }
-    catch (HRESULT rcThrown)
-    {
-        rc = rcThrown;
-        LogThisFunc(("Caught %Rhrc [mMachineState=%s]\n", rc, ::stringifyMachineState(mData->mMachineState)));
+        hrc = i_finishTakingSnapshot(task, alock, true /*aSuccess*/); /*******************2+3 */
+        // do not throw hrc here because we can't call i_finishTakingSnapshot() twice
+        LogFlowThisFunc(("i_finishTakingSnapshot -> %Rhrc [mMachineState=%s]\n", hrc, ::stringifyMachineState(mData->mMachineState)));
+    }
+    catch (HRESULT hrcXcpt)
+    {
+        hrc = hrcXcpt;
+        LogThisFunc(("Caught %Rhrc [mMachineState=%s]\n", hrc, ::stringifyMachineState(mData->mMachineState)));
 
         /// @todo r=klaus check that the implicit diffs created above are cleaned up im the relevant error cases
@@ -2013 +2007 @@
             {
                 MachineState_T enmMachineState = MachineState_Null;
-                HRESULT rc2 = task.m_pDirectControl->COMGETTER(NominalState)(&enmMachineState);
-                if (FAILED(rc2) || enmMachineState == MachineState_Null)
+                HRESULT hrc2 = task.m_pDirectControl->COMGETTER(NominalState)(&enmMachineState);
+                if (FAILED(hrc2) || enmMachineState == MachineState_Null)
                 {
                     AssertMsgFailed(("state=%s\n", ::stringifyMachineState(enmMachineState)));
@@ -2025 +2019 @@
                     {
                         alock.release();
-                        rc2 = task.m_pDirectControl->ResumeWithReason(Reason_Snapshot);
+                        hrc2 = task.m_pDirectControl->ResumeWithReason(Reason_Snapshot);
                         alock.acquire();
-                        if (SUCCEEDED(rc2))
+                        if (SUCCEEDED(hrc2))
                             enmMachineState = task.m_machineStateBackup;
                     }
@@ -2057 +2051 @@
     }
 
-    task.m_pProgress->i_notifyComplete(rc);
-
-    if (SUCCEEDED(rc))
+    task.m_pProgress->i_notifyComplete(hrc);
+
+    if (SUCCEEDED(hrc))
         mParent->i_onSnapshotTaken(mData->mUuid, task.m_uuidSnapshot);
 
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
     {
         for (std::map<Guid, DeviceType_T>::const_iterator it = uIdsForNotify.begin();
@@ -2126 +2120 @@
     ComObjPtr<Snapshot> pOldCurrentSnap = mData->mCurrentSnapshot;
 
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
 
     if (aSuccess)
@@ -2144 +2138 @@
             flSaveSettings |= SaveS_ResetCurStateModified;
 
-        rc = i_saveSettings(NULL, alock, flSaveSettings); /******************2 */
-    }
-
-    if (aSuccess && SUCCEEDED(rc))
+        hrc = i_saveSettings(NULL, alock, flSaveSettings); /******************2 */
+    }
+
+    if (aSuccess && SUCCEEDED(hrc))
     {
         /* associate old hard disks with the snapshot and do locking/unlocking*/
@@ -2186 +2180 @@
     alock.acquire();
 
-    return rc;
+    return hrc;
 }
 
@@ -2228 +2222 @@
                         Global::stringifyMachineState(mData->mMachineState));
 
-    HRESULT rc = i_checkStateDependency(MutableOrSavedStateDep);
-    if (FAILED(rc))
-        return rc;
+    HRESULT hrc = i_checkStateDependency(MutableOrSavedStateDep);
+    if (FAILED(hrc))
+        return hrc;
 
     /* We need to explicitly check if the given snapshot is valid and bail out if not. */
@@ -2285 +2279 @@
                                                          "RestoreSnap",
                                                          pSnapshot);
-    rc = pTask->createThread();
+    hrc = pTask->createThread();
     pTask = NULL;
-    if (FAILED(rc))
-        return rc;
+    if (FAILED(hrc))
+        return hrc;
 
     /* set the proper machine state (note: after creating a Task instance) */
@@ -2333 +2327 @@
     }
 
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
     Guid snapshotId;
     std::set<ComObjPtr<Medium> > pMediumsForNotify;
@@ -2362 +2356 @@
             task.modifyBackedUpState(MachineState_PoweredOff);
 
-            rc = i_saveStateSettings(SaveSTS_StateFilePath);
-            if (FAILED(rc))
-                throw rc;
+            hrc = i_saveStateSettings(SaveSTS_StateFilePath);
+            if (FAILED(hrc))
+                throw hrc;
         }
 
@@ -2405 +2399 @@
             alock.release();
 
-            rc = i_createImplicitDiffs(task.m_pProgress,
-                                       1,
-                                       false /* aOnline */);
-            if (FAILED(rc))
-                throw rc;
+            hrc = i_createImplicitDiffs(task.m_pProgress, 1, false /* aOnline */);
+            if (FAILED(hrc))
+                throw hrc;
 
             alock.acquire();
@@ -2553 +2545 @@
         // save machine settings, reset the modified flag and commit;
         bool fNeedsGlobalSaveSettings = false;
-        rc = i_saveSettings(&fNeedsGlobalSaveSettings, alock,
-                            SaveS_ResetCurStateModified);
-        if (FAILED(rc))
-            throw rc;
+        hrc = i_saveSettings(&fNeedsGlobalSaveSettings, alock, SaveS_ResetCurStateModified);
+        if (FAILED(hrc))
+            throw hrc;
 
         // release the locks before updating registry and deleting image files
@@ -2576 +2567 @@
             // store the id here because it becomes NULL after deleting storage.
             com::Guid id = pMedium->i_getId();
-            HRESULT rc2 = pMedium->i_deleteStorage(NULL /* aProgress */,
-                                                   true /* aWait */,
-                                                   false /* aNotify */);
+            HRESULT hrc2 = pMedium->i_deleteStorage(NULL /* aProgress */, true /* aWait */, false /* aNotify */);
             // ignore errors here because we cannot roll back after i_saveSettings() above
-            if (SUCCEEDED(rc2))
+            if (SUCCEEDED(hrc2))
             {
                 pMediumsForNotify.insert(pParent);
@@ -2590 +2579 @@
     catch (HRESULT hrcXcpt)
     {
-        rc = hrcXcpt;
-    }
-
-    if (FAILED(rc))
+        hrc = hrcXcpt;
+    }
+
+    if (FAILED(hrc))
     {
         /* preserve existing error info */
@@ -2609 +2598 @@
 
     /* set the result (this will try to fetch current error info on failure) */
-    task.m_pProgress->i_notifyComplete(rc);
-
-    if (SUCCEEDED(rc))
+    task.m_pProgress->i_notifyComplete(hrc);
+
+    if (SUCCEEDED(hrc))
     {
         mParent->i_onSnapshotRestored(mData->mUuid, snapshotId);
@@ -2629 +2618 @@
     }
 
-    LogFlowThisFunc(("Done restoring snapshot (rc=%08X)\n", rc));
+    LogFlowThisFunc(("Done restoring snapshot (hrc=%08X)\n", hrc));
 
     LogFlowThisFuncLeave();
@@ -2731 +2720 @@
                         Global::stringifyMachineState(mData->mMachineState));
 
-    HRESULT rc = i_checkStateDependency(MutableOrSavedOrRunningStateDep);
-    if (FAILED(rc))
-        return rc;
+    HRESULT hrc = i_checkStateDependency(MutableOrSavedOrRunningStateDep);
+    if (FAILED(hrc))
+        return hrc;
 
     ComObjPtr<Snapshot> pSnapshot;
-    rc = i_findSnapshotById(aStartId, pSnapshot, true /* aSetError */);
-    if (FAILED(rc))
-        return rc;
+    hrc = i_findSnapshotById(aStartId, pSnapshot, true /* aSetError */);
+    if (FAILED(hrc))
+        return hrc;
 
     AutoWriteLock snapshotLock(pSnapshot COMMA_LOCKVAL_SRC_POS);
@@ -2766 +2755 @@
         {
             snapshotLock.release();
-            rc = i_saveSettings(NULL, alock);
+            hrc = i_saveSettings(NULL, alock);
             snapshotLock.acquire();
                 // no need to change for whether VirtualBox.xml needs saving since
                 // we can't have a machine XML rename pending at this point
-            if (FAILED(rc)) return rc;
+            if (FAILED(hrc)) return hrc;
         }
     }
@@ -2839 +2828 @@
                                                        fDeleteOnline,
                                                        pSnapshot);
-    rc = pTask->createThread();
+    hrc = pTask->createThread();
     pTask = NULL;
-    if (FAILED(rc))
-        return rc;
+    if (FAILED(hrc))
+        return hrc;
 
     // the task might start running but will block on acquiring the machine's write lock
@@ -2988 +2977 @@
     try
     {
-        HRESULT rc = S_OK;
+        HRESULT hrc = S_OK;
 
         /* Locking order:  */
@@ -3069 +3058 @@
                 if (pOnlineMediumAttachment)
                 {
-                    rc = mData->mSession.mLockedMedia.Get(pOnlineMediumAttachment,
-                                                          pVMMALockList);
-                    if (FAILED(rc))
+                    hrc = mData->mSession.mLockedMedia.Get(pOnlineMediumAttachment, pVMMALockList);
+                    if (FAILED(hrc))
                         fOnlineMergePossible = false;
                 }
@@ -3082 +3070 @@
 
             treeLock.release();
-            rc = i_prepareDeleteSnapshotMedium(pHD, machineId, snapshotId,
-                                               fOnlineMergePossible,
-                                               pVMMALockList, pSource, pTarget,
-                                               fMergeForward, pParentForTarget,
-                                               pChildrenToReparent,
-                                               fNeedsOnlineMerge,
-                                               pMediumLockList,
-                                               pHDLockToken);
+            hrc = i_prepareDeleteSnapshotMedium(pHD, machineId, snapshotId,
+                                                fOnlineMergePossible,
+                                                pVMMALockList, pSource, pTarget,
+                                                fMergeForward, pParentForTarget,
+                                                pChildrenToReparent,
+                                                fNeedsOnlineMerge,
+                                                pMediumLockList,
+                                                pHDLockToken);
             treeLock.acquire();
-            if (FAILED(rc))
-                throw rc;
+            if (FAILED(hrc))
+                throw hrc;
 
             // For simplicity, prepareDeleteSnapshotMedium selects the merge
@@ -3107 +3095 @@
             // not going to merge a big source into a small target on online merge. Otherwise it will be resized
             if (fNeedsOnlineMerge && pSource->i_getLogicalSize() > pTarget->i_getLogicalSize())
-            {
-                rc = setError(E_FAIL,
-                              tr("Unable to merge storage '%s', because it is smaller than the source image. If you resize it to have a capacity of at least %lld bytes you can retry",
-                                 "", pSource->i_getLogicalSize()),
-                              pTarget->i_getLocationFull().c_str(), pSource->i_getLogicalSize());
-                throw rc;
-            }
+                throw setError(E_FAIL,
+                               tr("Unable to merge storage '%s', because it is smaller than the source image. If you resize it to have a capacity of at least %lld bytes you can retry",
+                                  "", pSource->i_getLogicalSize()),
+                               pTarget->i_getLocationFull().c_str(), pSource->i_getLogicalSize());
 
             // a couple paranoia checks for backward merges
@@ -3147 +3132 @@
                 // Note that the medium attachment object stays associated
                 // with the snapshot until the merge was successful.
-                HRESULT rc2 = S_OK;
-                rc2 = pSource->i_removeBackReference(replaceMachineId, replaceSnapshotId);
-                AssertComRC(rc2);
+                HRESULT hrc2 = pSource->i_removeBackReference(replaceMachineId, replaceSnapshotId);
+                AssertComRC(hrc2);
 
                 toDelete.push_back(MediumDeleteRec(pHD, pSource, pTarget,
@@ -3199 +3183 @@
                 }
 
-                rc = pTarget_local->COMGETTER(MediumFormat)(pTargetFormat.asOutParam());
-                if (FAILED(rc))
-                    throw rc;
+                hrc = pTarget_local->COMGETTER(MediumFormat)(pTargetFormat.asOutParam());
+                if (FAILED(hrc))
+                    throw hrc;
 
                 if (pTarget_local->i_isMediumFormatFile())
@@ -3207 +3191 @@
                     int vrc = RTFsQuerySerial(pTarget_local->i_getLocationFull().c_str(), &pu32Serial);
                     if (RT_FAILURE(vrc))
-                    {
-                        rc = setError(E_FAIL,
-                                      tr("Unable to merge storage '%s'. Can't get storage UID"),
-                                      pTarget_local->i_getLocationFull().c_str());
-                        throw rc;
-                    }
+                        throw setError(E_FAIL,
+                                       tr("Unable to merge storage '%s'. Can't get storage UID"),
+                                       pTarget_local->i_getLocationFull().c_str());
 
                     pSource_local->COMGETTER(Size)((LONG64*)&diskSize);
@@ -3250 +3231 @@
                     LogFlowThisFunc(("Path to the storage wasn't found...\n"));
 
-                    rc = setError(E_INVALIDARG,
-                                  tr("Unable to merge storage '%s'. Path to the storage wasn't found"),
-                                  it_sm->second);
-                    throw rc;
+                    throw setError(E_INVALIDARG,
+                                   tr("Unable to merge storage '%s'. Path to the storage wasn't found"),
+                                   it_sm->second);
                 }
 
@@ -3259 +3239 @@
                 if (RT_FAILURE(vrc))
                 {
-                    rc = setError(E_FAIL,
-                                  tr("Unable to merge storage '%s'. Can't get the storage size"),
-                                  it_sm->second);
-                    throw rc;
+                    throw setError(E_FAIL,
+                                   tr("Unable to merge storage '%s'. Can't get the storage size"),
+                                   it_sm->second);
                 }
 
@@ -3269 +3248 @@
                     LogFlowThisFunc(("Not enough free space to merge...\n"));
 
-                    rc = setError(E_OUTOFMEMORY,
-                                  tr("Unable to merge storage '%s'. Not enough free storage space"),
-                                  it_sm->second);
-                    throw rc;
+                    throw setError(E_OUTOFMEMORY,
+                                   tr("Unable to merge storage '%s'. Not enough free storage space"),
+                                   it_sm->second);
                 }
 
@@ -3363 +3341 @@
                     Guid uMedium = pMedium->i_getId();
                     DeviceType_T uMediumType = pMedium->i_getDeviceType();
-                    rc = pMedium->i_deleteStorage(&task.m_pProgress,
-                                                  true /* aWait */,
-                                                  false /* aNotify */);
-                    if (FAILED(rc))
-                        throw rc;
+                    hrc = pMedium->i_deleteStorage(&task.m_pProgress, true /* aWait */, false /* aNotify */);
+                    if (FAILED(hrc))
+                        throw hrc;
 
                     pMediumsForNotify.insert(pParent);
@@ -3424 +3400 @@
                     mConsoleTaskData.mDeleteSnapshotInfo = (void *)&(*it);
                     // online medium merge, in the direction decided earlier
-                    rc = i_onlineMergeMedium(it->mpOnlineMediumAttachment,
-                                             it->mpSource,
-                                             it->mpTarget,
-                                             it->mfMergeForward,
-                                             it->mpParentForTarget,
-                                             it->mpChildrenToReparent,
-                                             it->mpMediumLockList,
-                                             task.m_pProgress,
-                                             &fNeedsSave);
+                    hrc = i_onlineMergeMedium(it->mpOnlineMediumAttachment,
+                                              it->mpSource,
+                                              it->mpTarget,
+                                              it->mfMergeForward,
+                                              it->mpParentForTarget,
+                                              it->mpChildrenToReparent,
+                                              it->mpMediumLockList,
+                                              task.m_pProgress,
+                                              &fNeedsSave);
                     mConsoleTaskData.mDeleteSnapshotInfo = NULL;
                 }
@@ -3438 +3414 @@
                 {
                     // normal medium merge, in the direction decided earlier
-                    rc = it->mpSource->i_mergeTo(it->mpTarget,
-                                                 it->mfMergeForward,
-                                                 it->mpParentForTarget,
-                                                 it->mpChildrenToReparent,
-                                                 it->mpMediumLockList,
-                                                 &task.m_pProgress,
-                                                 true /* aWait */,
-                                                 false /* aNotify */);
+                    hrc = it->mpSource->i_mergeTo(it->mpTarget,
+                                                  it->mfMergeForward,
+                                                  it->mpParentForTarget,
+                                                  it->mpChildrenToReparent,
+                                                  it->mpMediumLockList,
+                                                  &task.m_pProgress,
+                                                  true /* aWait */,
+                                                  false /* aNotify */);
                 }
 
@@ -3454 +3430 @@
                 // moment) is still there or not. Be careful not to lose the
                 // error code below, before the "Delayed failure exit".
-                if (FAILED(rc))
+                if (FAILED(hrc))
                 {
                     AutoReadLock mlock(it->mpSource COMMA_LOCKVAL_SRC_POS);
@@ -3460 +3436 @@
                         // Diff medium not backed by a file - cannot get status so
                         // be pessimistic.
-                        throw rc;
+                        throw hrc;
                     const Utf8Str &loc = it->mpSource->i_getLocationFull();
                     // Source medium is still there, so merge failed early.
                     if (RTFileExists(loc.c_str()))
-                        throw rc;
+                        throw hrc;
 
                     // Source medium is gone. Assume the merge succeeded and
@@ -3551 +3527 @@
             // Delayed failure exit when the merge cleanup failed but the
             // merge actually succeeded.
-            if (FAILED(rc))
-                throw rc;
+            if (FAILED(hrc))
+                throw hrc;
         }
 
@@ -3638 +3614 @@
     }
 
-    LogFlowThisFunc(("Done deleting snapshot (rc=%08X)\n", (HRESULT)mrc));
+    LogFlowThisFunc(("Done deleting snapshot (mrc=%08X)\n", (HRESULT)mrc));
     LogFlowThisFuncLeave();
 }
@@ -3764 +3740 @@
         childLock.release();
         alock.release();
-        HRESULT rc = aHD->i_queryPreferredMergeDirection(pChild, fMergeForward);
+        HRESULT hrc = aHD->i_queryPreferredMergeDirection(pChild, fMergeForward);
         alock.acquire();
         childLock.acquire();
 
-        if (FAILED(rc) && rc != E_FAIL)
-            return rc;
+        if (FAILED(hrc) && hrc != E_FAIL)
+            return hrc;
 
         if (fMergeForward)
@@ -3785 +3761 @@
     }
 
-    HRESULT rc;
+    HRESULT hrc;
     childLock.release();
     alock.release();
-    rc = aSource->i_prepareMergeTo(aTarget, &aMachineId, &aSnapshotId,
-                                   !fOnlineMergePossible /* fLockMedia */,
-                                   aMergeForward, aParentForTarget,
-                                   aChildrenToReparent, aMediumLockList);
+    hrc = aSource->i_prepareMergeTo(aTarget, &aMachineId, &aSnapshotId,
+                                    !fOnlineMergePossible /* fLockMedia */,
+                                    aMergeForward, aParentForTarget,
+                                    aChildrenToReparent, aMediumLockList);
     alock.acquire();
     childLock.acquire();
-    if (SUCCEEDED(rc) && fOnlineMergePossible)
+    if (SUCCEEDED(hrc) && fOnlineMergePossible)
     {
         /* Try to lock the newly constructed medium lock list. If it succeeds
@@ -3802 +3778 @@
         childLock.release();
         alock.release();
-        rc = aMediumLockList->Lock();
+        hrc = aMediumLockList->Lock();
         alock.acquire();
         childLock.acquire();
-        if (FAILED(rc))
+        if (FAILED(hrc))
         {
             /* Locking failed, this cannot be done as an offline merge. Try to
@@ -3834 +3810 @@
                 childLock.release();
                 alock.release();
-                rc = it->UpdateLock(fLockReq);
+                hrc = it->UpdateLock(fLockReq);
                 alock.acquire();
                 childLock.acquire();
-                if (FAILED(rc))
+                if (FAILED(hrc))
                 {
                     // could not update the lock, trigger cleanup below
@@ -3862 +3838 @@
                     childLock.release();
                     alock.release();
-                    rc = aChildrenToReparent->Lock(true /* fSkipOverLockedMedia */);
+                    hrc = aChildrenToReparent->Lock(true /* fSkipOverLockedMedia */);
                     alock.acquire();
                     childLock.acquire();
@@ -3878 +3854 @@
                             childLock.release();
                             alock.release();
-                            rc = aVMMALockList->Update(pMedium, true);
+                            hrc = aVMMALockList->Update(pMedium, true);
                             alock.acquire();
                             childLock.acquire();
                             mediumLock.acquire();
-                            if (FAILED(rc))
-                                throw rc;
+                            if (FAILED(hrc))
+                                throw hrc;
                         }
                     }
@@ -3893 +3869 @@
                 childLock.release();
                 alock.release();
-                rc = aVMMALockList->Lock();
+                hrc = aVMMALockList->Lock();
                 alock.acquire();
                 childLock.acquire();
-                if (FAILED(rc))
+                if (FAILED(hrc))
                 {
                     aSource->i_cancelMergeTo(aChildrenToReparent, aMediumLockList);
-                    rc = setError(rc,
-                                  tr("Cannot lock hard disk '%s' for a live merge"),
-                                  aHD->i_getLocationFull().c_str());
+                    hrc = setError(hrc,
+                                   tr("Cannot lock hard disk '%s' for a live merge"),
+                                   aHD->i_getLocationFull().c_str());
                 }
                 else
@@ -3913 +3889 @@
             {
                 aSource->i_cancelMergeTo(aChildrenToReparent, aMediumLockList);
-                rc = setError(rc,
-                              tr("Failed to construct lock list for a live merge of hard disk '%s'"),
-                              aHD->i_getLocationFull().c_str());
+                hrc = setError(hrc,
+                               tr("Failed to construct lock list for a live merge of hard disk '%s'"),
+                               aHD->i_getLocationFull().c_str());
             }
 
             // fix the VM's lock list if anything failed
-            if (FAILED(rc))
+            if (FAILED(hrc))
             {
                 lockListVMMABegin = aVMMALockList->GetBegin();
@@ -3943 +3919 @@
         }
     }
-    else if (FAILED(rc))
+    else if (FAILED(hrc))
     {
         aSource->i_cancelMergeTo(aChildrenToReparent, aMediumLockList);
-        rc = setError(rc,
-                      tr("Cannot lock hard disk '%s' when deleting a snapshot"),
-                      aHD->i_getLocationFull().c_str());
-    }
-
-    return rc;
+        hrc = setError(hrc,
+                       tr("Cannot lock hard disk '%s' when deleting a snapshot"),
+                       aHD->i_getLocationFull().c_str());
+    }
+
+    return hrc;
 }
 
@@ -3990 +3966 @@
             if (!aHDLockToken.isNull())
             {
-                HRESULT rc = aHDLockToken->Abandon();
-                AssertComRC(rc);
+                HRESULT hrc = aHDLockToken->Abandon();
+                AssertComRC(hrc);
             }
         }
         else
         {
-            HRESULT rc = aHD->i_unmarkForDeletion();
-            AssertComRC(rc);
+            HRESULT hrc = aHD->i_unmarkForDeletion();
+            AssertComRC(hrc);
         }
     }
@@ -4043 +4019 @@
     {
         // reattach the source media to the snapshot
-        HRESULT rc = aSource->i_addBackReference(aMachineId, aSnapshotId);
-        AssertComRC(rc);
+        HRESULT hrc = aSource->i_addBackReference(aMachineId, aSnapshotId);
+        AssertComRC(hrc);
     }
 }
@@ -4084 +4060 @@
     NOREF(aChildrenToReparent);
 
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
 
     try
@@ -4136 +4112 @@
         // Must not hold any locks here, as this will call back to finish
         // updating the medium attachment, chain linking and state.
-        rc = directControl->OnlineMergeMedium(aMediumAttachment,
-                                              uSourceIdx, uTargetIdx,
-                                              aProgress);
-        if (FAILED(rc))
-            throw rc;
-    }
-    catch (HRESULT hrcXcpt) { rc = hrcXcpt; }
+        hrc = directControl->OnlineMergeMedium(aMediumAttachment, uSourceIdx, uTargetIdx, aProgress);
+        if (FAILED(hrc))
+            throw hrc;
+    }
+    catch (HRESULT hrcXcpt) { hrc = hrcXcpt; }
 
     // The callback mentioned above takes care of update the medium state
@@ -4149 +4123 @@
         *pfNeedsMachineSaveSettings = true;
 
-    return rc;
+    return hrc;
 }
 
@@ -4164 +4138 @@
 HRESULT SessionMachine::finishOnlineMergeMedium()
 {
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
     MediumDeleteRec *pDeleteRec = (MediumDeleteRec *)mConsoleTaskData.mDeleteSnapshotInfo;
     AssertReturn(pDeleteRec, E_FAIL);
@@ -4183 +4157 @@
         // first, unregister the target since it may become a base
         // hard disk which needs re-registration
-        rc = mParent->i_unregisterMedium(pDeleteRec->mpTarget);
-        AssertComRC(rc);
+        hrc = mParent->i_unregisterMedium(pDeleteRec->mpTarget);
+        AssertComRC(hrc);
 
         // then, reparent it and disconnect the deleted branch at
@@ -4194 +4168 @@
 
         // then, register again
-        rc = mParent->i_registerMedium(pDeleteRec->mpTarget, &pDeleteRec->mpTarget, treeLock);
-        AssertComRC(rc);
+        hrc = mParent->i_registerMedium(pDeleteRec->mpTarget, &pDeleteRec->mpTarget, treeLock);
+        AssertComRC(hrc);
     }
     else
@@ -4242 +4216 @@
     /* unregister and uninitialize all hard disks removed by the merge */
     MediumLockList *pMediumLockList = NULL;
-    rc = mData->mSession.mLockedMedia.Get(pDeleteRec->mpOnlineMediumAttachment, pMediumLockList);
+    hrc = mData->mSession.mLockedMedia.Get(pDeleteRec->mpOnlineMediumAttachment, pMediumLockList);
     const ComObjPtr<Medium> &pLast = pDeleteRec->mfMergeForward ? pDeleteRec->mpTarget : pDeleteRec->mpSource;
-    AssertReturn(SUCCEEDED(rc) && pMediumLockList, E_FAIL);
+    AssertReturn(SUCCEEDED(hrc) && pMediumLockList, E_FAIL);
     MediumLockList::Base::iterator lockListBegin =
         pMediumLockList->GetBegin();
@@ -4266 +4240 @@
         else
         {
-            rc = mParent->i_unregisterMedium(pMedium);
-            AssertComRC(rc);
+            hrc = mParent->i_unregisterMedium(pMedium);
+            AssertComRC(hrc);
 
             /* now, uninitialize the deleted hard disk (note that
@@ -4290 +4264 @@
              * caller added by MergeChain before uninit() and updates the
              * iterator to point to the right place. */
-            rc = pMediumLockList->RemoveByIterator(it);
-            AssertComRC(rc);
+            hrc = pMediumLockList->RemoveByIterator(it);
+            AssertComRC(hrc);
 
             treeLock.release();

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

@@ -112 +112 @@
     ULONG maxInstances;
     ChipsetType_T chipsetType;
-    HRESULT rc = aParent->COMGETTER(ChipsetType)(&chipsetType);
-    if (FAILED(rc))
-        return rc;
-    rc = aParent->i_getVirtualBox()->i_getSystemProperties()->
+    HRESULT hrc = aParent->COMGETTER(ChipsetType)(&chipsetType);
+    if (FAILED(hrc))
+        return hrc;
+    hrc = aParent->i_getVirtualBox()->i_getSystemProperties()->
         GetMaxInstancesOfStorageBus(chipsetType, aStorageBus, &maxInstances);
-    if (FAILED(rc))
-        return rc;
+    if (FAILED(hrc))
+        return hrc;
     if (aInstance >= maxInstances)
         return setError(E_INVALIDARG,
@@ -322 +322 @@
     {
         ComObjPtr<StorageController> ctrl;
-        HRESULT rc = m->pParent->i_getStorageControllerByName(aName, ctrl, false /* aSetError */);
-        if (SUCCEEDED(rc))
+        HRESULT hrc = m->pParent->i_getStorageControllerByName(aName, ctrl, false /* aSetError */);
+        if (SUCCEEDED(hrc))
             return setError(VBOX_E_OBJECT_IN_USE,
                             tr("Storage controller named '%s' already exists"),
@@ -329 +329 @@
 
         Machine::MediumAttachmentList atts;
-        rc = m->pParent->i_getMediumAttachmentsOfController(m->bd->strName, atts);
+        hrc = m->pParent->i_getMediumAttachmentsOfController(m->bd->strName, atts);
         for (Machine::MediumAttachmentList::const_iterator
              it = atts.begin();
@@ -380 +380 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    HRESULT rc = S_OK;
-
+    HRESULT hrc = S_OK;
     switch (m->bd->storageBus)
     {
         case StorageBus_IDE:
-        {
             if (   (aControllerType != StorageControllerType_PIIX3)
                 && (aControllerType != StorageControllerType_PIIX4)
                 && (aControllerType != StorageControllerType_ICH6))
-                rc = E_INVALIDARG;
-            break;
-        }
+                hrc = E_INVALIDARG;
+            break;
         case StorageBus_SATA:
-        {
             if (aControllerType != StorageControllerType_IntelAhci)
-                rc = E_INVALIDARG;
-            break;
-        }
+                hrc = E_INVALIDARG;
+            break;
         case StorageBus_SCSI:
-        {
             if (   (aControllerType != StorageControllerType_LsiLogic)
                 && (aControllerType != StorageControllerType_BusLogic))
-                rc = E_INVALIDARG;
-            break;
-        }
+                hrc = E_INVALIDARG;
+            break;
         case StorageBus_Floppy:
-        {
             if (aControllerType != StorageControllerType_I82078)
-                rc = E_INVALIDARG;
-            break;
-        }
+                hrc = E_INVALIDARG;
+            break;
         case StorageBus_SAS:
-        {
             if (aControllerType != StorageControllerType_LsiLogicSas)
-                rc = E_INVALIDARG;
-            break;
-        }
+                hrc = E_INVALIDARG;
+            break;
         case StorageBus_USB:
-        {
             if (aControllerType != StorageControllerType_USB)
-                rc = E_INVALIDARG;
-            break;
-        }
+                hrc = E_INVALIDARG;
+            break;
         case StorageBus_PCIe:
-        {
             if (aControllerType != StorageControllerType_NVMe)
-                rc = E_INVALIDARG;
-            break;
-        }
+                hrc = E_INVALIDARG;
+            break;
         case StorageBus_VirtioSCSI:
-        {
             if (aControllerType != StorageControllerType_VirtioSCSI)
-                rc = E_INVALIDARG;
-            break;
-        }
+                hrc = E_INVALIDARG;
+            break;
         default:
             AssertMsgFailed(("Invalid controller type %d\n", m->bd->storageBus));
-            rc = E_INVALIDARG;
-    }
-
-    if (!SUCCEEDED(rc))
-        return setError(rc,
-                        tr("Invalid controller type %d"),
-                        aControllerType);
+            hrc = E_INVALIDARG;
+            break;
+    }
+
+    if (!SUCCEEDED(hrc))
+        return setError(hrc, tr("Invalid controller type %d"), aControllerType);
 
     if (m->bd->controllerType != aControllerType)
@@ -464 +446 @@
 {
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    HRESULT rc = m->pSystemProperties->GetMaxDevicesPerPortForStorageBus(m->bd->storageBus, aMaxDevicesPerPortCount);
-
-    return rc;
+    return m->pSystemProperties->GetMaxDevicesPerPortForStorageBus(m->bd->storageBus, aMaxDevicesPerPortCount);
 }
 
@@ -473 +452 @@
 {
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    HRESULT rc = m->pSystemProperties->GetMinPortCountForStorageBus(m->bd->storageBus, aMinPortCount);
-    return rc;
+    return m->pSystemProperties->GetMinPortCountForStorageBus(m->bd->storageBus, aMinPortCount);
 }
 
@@ -481 +458 @@
 {
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-    HRESULT rc = m->pSystemProperties->GetMaxPortCountForStorageBus(m->bd->storageBus, aMaxPortCount);
-
-    return rc;
+    return m->pSystemProperties->GetMaxPortCountForStorageBus(m->bd->storageBus, aMaxPortCount);
 }
 
@@ -732 +707 @@
     ULONG portCount = m->bd->ulPortCount;
     ULONG devicesPerPort;
-    HRESULT rc = m->pSystemProperties->GetMaxDevicesPerPortForStorageBus(m->bd->storageBus, &devicesPerPort);
-    if (FAILED(rc)) return rc;
+    HRESULT hrc = m->pSystemProperties->GetMaxDevicesPerPortForStorageBus(m->bd->storageBus, &devicesPerPort);
+    if (FAILED(hrc)) return hrc;
 
     if (   aControllerPort < 0

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

@@ -129 +129 @@
 #endif
 
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
 
     /* Fetch info of all available hd backends. */
@@ -145 +145 @@
         {
             ComObjPtr<MediumFormat> hdf;
-            rc = hdf.createObject();
-            if (FAILED(rc)) break;
-
-            rc = hdf->init(&aVDInfo[i]);
-            if (FAILED(rc)) break;
+            hrc = hdf.createObject();
+            if (FAILED(hrc)) break;
+
+            hrc = hdf->init(&aVDInfo[i]);
+            if (FAILED(hrc)) break;
 
             m_llMediumFormats.push_back(hdf);
@@ -156 +156 @@
 
     /* Confirm a successful initialization */
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
         autoInitSpan.setSucceeded();
 
-    return rc;
+    return hrc;
 }
 
@@ -319 +319 @@
     // VirtualBox::i_saveSettings() needs vbox write lock
     AutoWriteLock vboxLock(mParent COMMA_LOCKVAL_SRC_POS);
-    HRESULT rc = mParent->i_saveSettings();
-
-    return rc;
+    return mParent->i_saveSettings();
 }
 
@@ -921 +919 @@
 {
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-    HRESULT rc = i_setDefaultMachineFolder(aDefaultMachineFolder);
+    HRESULT hrc = i_setDefaultMachineFolder(aDefaultMachineFolder);
     alock.release();
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
     {
         // VirtualBox::i_saveSettings() needs vbox write lock
         AutoWriteLock vboxLock(mParent COMMA_LOCKVAL_SRC_POS);
-        rc = mParent->i_saveSettings();
-    }
-
-    return rc;
+        hrc = mParent->i_saveSettings();
+    }
+
+    return hrc;
 }
 
@@ -949 +947 @@
 {
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-    HRESULT rc = i_setLoggingLevel(aLoggingLevel);
+    HRESULT hrc = i_setLoggingLevel(aLoggingLevel);
     alock.release();
 
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
     {
         AutoWriteLock vboxLock(mParent COMMA_LOCKVAL_SRC_POS);
-        rc = mParent->i_saveSettings();
+        hrc = mParent->i_saveSettings();
     }
     else
-        LogRel(("Cannot set passed logging level=%s, or the default one - Error=%Rhrc \n", aLoggingLevel.c_str(), rc));
-
-    return rc;
+        LogRel(("Cannot set passed logging level=%s, or the default one - Error=%Rhrc \n", aLoggingLevel.c_str(), hrc));
+
+    return hrc;
 }
 
@@ -984 +982 @@
 {
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-    HRESULT rc = i_setDefaultHardDiskFormat(aDefaultHardDiskFormat);
+    HRESULT hrc = i_setDefaultHardDiskFormat(aDefaultHardDiskFormat);
     alock.release();
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
     {
         // VirtualBox::i_saveSettings() needs vbox write lock
         AutoWriteLock vboxLock(mParent COMMA_LOCKVAL_SRC_POS);
-        rc = mParent->i_saveSettings();
-    }
-
-    return rc;
+        hrc = mParent->i_saveSettings();
+    }
+
+    return hrc;
 }
 
@@ -1052 +1050 @@
 {
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-    HRESULT rc = i_setVRDEAuthLibrary(aVRDEAuthLibrary);
+    HRESULT hrc = i_setVRDEAuthLibrary(aVRDEAuthLibrary);
     alock.release();
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
     {
         // VirtualBox::i_saveSettings() needs vbox write lock
         AutoWriteLock vboxLock(mParent COMMA_LOCKVAL_SRC_POS);
-        rc = mParent->i_saveSettings();
-    }
-
-    return rc;
+        hrc = mParent->i_saveSettings();
+    }
+
+    return hrc;
 }
 
@@ -1076 +1074 @@
 {
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-    HRESULT rc = i_setWebServiceAuthLibrary(aWebServiceAuthLibrary);
+    HRESULT hrc = i_setWebServiceAuthLibrary(aWebServiceAuthLibrary);
     alock.release();
 
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
     {
         // VirtualBox::i_saveSettings() needs vbox write lock
         AutoWriteLock vboxLock(mParent COMMA_LOCKVAL_SRC_POS);
-        rc = mParent->i_saveSettings();
-    }
-
-    return rc;
+        hrc = mParent->i_saveSettings();
+    }
+
+    return hrc;
 }
 
@@ -1265 +1263 @@
     // VirtualBox::i_saveSettings() needs vbox write lock
     AutoWriteLock vboxLock(mParent COMMA_LOCKVAL_SRC_POS);
-    HRESULT rc = mParent->i_saveSettings();
-
-    return rc;
+    return mParent->i_saveSettings();
 }
 
@@ -1291 +1287 @@
 {
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-    HRESULT rc = i_setAutostartDatabasePath(aAutostartDbPath);
+    HRESULT hrc = i_setAutostartDatabasePath(aAutostartDbPath);
     alock.release();
 
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
     {
         // VirtualBox::i_saveSettings() needs vbox write lock
         AutoWriteLock vboxLock(mParent COMMA_LOCKVAL_SRC_POS);
-        rc = mParent->i_saveSettings();
-    }
-
-    return rc;
+        hrc = mParent->i_saveSettings();
+    }
+
+    return hrc;
 }
 
@@ -1316 +1312 @@
 #if 0 /* not implemented */
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-    HRESULT rc = i_setDefaultAdditionsISO(aDefaultAdditionsISO);
+    HRESULT hrc = i_setDefaultAdditionsISO(aDefaultAdditionsISO);
     alock.release();
 
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
     {
         // VirtualBox::i_saveSettings() needs vbox write lock
         AutoWriteLock vboxLock(mParent COMMA_LOCKVAL_SRC_POS);
-        rc = mParent->i_saveSettings();
-    }
-
-    return rc;
+        hrc = mParent->i_saveSettings();
+    }
+
+    return hrc;
 #endif
 }
@@ -1342 +1338 @@
     if (m->strDefaultFrontend == aDefaultFrontend)
         return S_OK;
-    HRESULT rc = i_setDefaultFrontend(aDefaultFrontend);
+    HRESULT hrc = i_setDefaultFrontend(aDefaultFrontend);
     alock.release();
 
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
     {
         // VirtualBox::i_saveSettings() needs vbox write lock
         AutoWriteLock vboxLock(mParent COMMA_LOCKVAL_SRC_POS);
-        rc = mParent->i_saveSettings();
-    }
-
-    return rc;
+        hrc = mParent->i_saveSettings();
+    }
+
+    return hrc;
 }
 
@@ -1963 +1959 @@
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-    HRESULT rc = S_OK;
-    rc = i_setDefaultMachineFolder(data.strDefaultMachineFolder);
-    if (FAILED(rc)) return rc;
-
-    rc = i_setLoggingLevel(data.strLoggingLevel);
-    if (FAILED(rc)) return rc;
-
-    rc = i_setDefaultHardDiskFormat(data.strDefaultHardDiskFormat);
-    if (FAILED(rc)) return rc;
-
-    rc = i_setVRDEAuthLibrary(data.strVRDEAuthLibrary);
-    if (FAILED(rc)) return rc;
-
-    rc = i_setWebServiceAuthLibrary(data.strWebServiceAuthLibrary);
-    if (FAILED(rc)) return rc;
-
-    rc = i_setDefaultVRDEExtPack(data.strDefaultVRDEExtPack);
-    if (FAILED(rc)) return rc;
-
-    rc = i_setDefaultCryptoExtPack(data.strDefaultCryptoExtPack);
-    if (FAILED(rc)) return rc;
+    HRESULT hrc = i_setDefaultMachineFolder(data.strDefaultMachineFolder);
+    if (FAILED(hrc)) return hrc;
+
+    hrc = i_setLoggingLevel(data.strLoggingLevel);
+    if (FAILED(hrc)) return hrc;
+
+    hrc = i_setDefaultHardDiskFormat(data.strDefaultHardDiskFormat);
+    if (FAILED(hrc)) return hrc;
+
+    hrc = i_setVRDEAuthLibrary(data.strVRDEAuthLibrary);
+    if (FAILED(hrc)) return hrc;
+
+    hrc = i_setWebServiceAuthLibrary(data.strWebServiceAuthLibrary);
+    if (FAILED(hrc)) return hrc;
+
+    hrc = i_setDefaultVRDEExtPack(data.strDefaultVRDEExtPack);
+    if (FAILED(hrc)) return hrc;
+
+    hrc = i_setDefaultCryptoExtPack(data.strDefaultCryptoExtPack);
+    if (FAILED(hrc)) return hrc;
 
     m->uLogHistoryCount  = data.uLogHistoryCount;
@@ -1992 +1987 @@
     m->strLanguageId     = data.strLanguageId;
 
-    rc = i_setAutostartDatabasePath(data.strAutostartDatabasePath);
-    if (FAILED(rc)) return rc;
+    hrc = i_setAutostartDatabasePath(data.strAutostartDatabasePath);
+    if (FAILED(hrc)) return hrc;
 
     {
@@ -2002 +1997 @@
     }
 
-    rc = i_setDefaultFrontend(data.strDefaultFrontend);
-    if (FAILED(rc)) return rc;
+    hrc = i_setDefaultFrontend(data.strDefaultFrontend);
+    if (FAILED(hrc)) return hrc;
 
     return S_OK;
@@ -2175 +2170 @@
     {
         // new default with VirtualBox 4.0: "$HOME/VirtualBox VMs"
-        HRESULT rc = i_getUserHomeDirectory(path);
-        if (FAILED(rc)) return rc;
+        HRESULT hrc = i_getUserHomeDirectory(path);
+        if (FAILED(hrc)) return hrc;
         path += RTPATH_SLASH_STR "VirtualBox VMs";
     }
@@ -2195 +2190 @@
     if (useLoggingLevel.isEmpty())
         useLoggingLevel = VBOXSVC_LOG_DEFAULT;
-    int rc = RTLogGroupSettings(RTLogRelGetDefaultInstance(), useLoggingLevel.c_str());
+    int vrc = RTLogGroupSettings(RTLogRelGetDefaultInstance(), useLoggingLevel.c_str());
     //  If failed and not the default logging level - try to use the default logging level.
-    if (RT_FAILURE(rc))
+    if (RT_FAILURE(vrc))
     {
         // If failed write message to the release log.
-        LogRel(("Cannot set passed logging level=%s Error=%Rrc \n", useLoggingLevel.c_str(), rc));
+        LogRel(("Cannot set passed logging level=%s Error=%Rrc \n", useLoggingLevel.c_str(), vrc));
         //  If attempted logging level not the default one then try the default one.
         if (!useLoggingLevel.equals(VBOXSVC_LOG_DEFAULT))
         {
-            rc = RTLogGroupSettings(RTLogRelGetDefaultInstance(), VBOXSVC_LOG_DEFAULT);
+            vrc = RTLogGroupSettings(RTLogRelGetDefaultInstance(), VBOXSVC_LOG_DEFAULT);
             // If failed report this to the release log.
-            if (RT_FAILURE(rc))
-                LogRel(("Cannot set default logging level Error=%Rrc \n", rc));
+            if (RT_FAILURE(vrc))
+                LogRel(("Cannot set default logging level Error=%Rrc \n", vrc));
         }
         // On any failure - set default level as the one to be stored.
@@ -2214 +2209 @@
     //  Set to passed value or if default used/attempted (even if error condition) use empty string.
     m->strLoggingLevel = (useLoggingLevel.equals(VBOXSVC_LOG_DEFAULT) ? "" : useLoggingLevel);
-    return RT_SUCCESS(rc) ? S_OK : E_FAIL;
+    return RT_SUCCESS(vrc) ? S_OK : E_FAIL;
 }
 
@@ -2263 +2258 @@
 HRESULT SystemProperties::i_setAutostartDatabasePath(const com::Utf8Str &aPath)
 {
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
     AutostartDb *autostartDb = this->mParent->i_getAutostartDb();
 
@@ -2273 +2268 @@
             m->strAutostartDatabasePath = aPath;
         else
-            rc = setErrorBoth(E_FAIL, vrc,
-                              tr("Cannot set the autostart database path (%Rrc)"),
-                              vrc);
+            hrc = setErrorBoth(E_FAIL, vrc, tr("Cannot set the autostart database path (%Rrc)"), vrc);
     }
     else
@@ -2283 +2276 @@
             m->strAutostartDatabasePath = "";
         else
-            rc = setErrorBoth(E_FAIL, vrc,
-                              tr("Deleting the autostart database path failed (%Rrc)"),
-                              vrc);
-    }
-
-    return rc;
+            hrc = setErrorBoth(E_FAIL, vrc, tr("Deleting the autostart database path failed (%Rrc)"), vrc);
+    }
+
+    return hrc;
 }
 

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

@@ -187 +187 @@
         if (m.fWrite)
         {
-            HRESULT rc = m.pMedium->i_unlockWrite(NULL);
-            AssertComRC(rc);
+            HRESULT hrc = m.pMedium->i_unlockWrite(NULL);
+            AssertComRC(hrc);
         }
         else
         {
-            HRESULT rc = m.pMedium->i_unlockRead(NULL);
-            AssertComRC(rc);
+            HRESULT hrc = m.pMedium->i_unlockRead(NULL);
+            AssertComRC(hrc);
         }
         m.pMedium.setNull();

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

@@ -257 +257 @@
     {
         ComObjPtr<USBController> ctrl;
-        HRESULT rc = m->pParent->i_getUSBControllerByName(aName, ctrl, false /* aSetError */);
-        if (SUCCEEDED(rc))
+        HRESULT hrc = m->pParent->i_getUSBControllerByName(aName, ctrl, false /* aSetError */);
+        if (SUCCEEDED(hrc))
             return setError(VBOX_E_OBJECT_IN_USE,
                             tr("USB controller named '%s' already exists"),

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

@@ -244 +244 @@
      * handling */
 
-    HRESULT rc = S_OK;
-    do
-    {
-        rc = i_usbFilterFieldSetter(USBFILTERIDX_VENDOR_ID, data.strVendorId);
-        if (FAILED(rc)) break;
-
-        rc = i_usbFilterFieldSetter(USBFILTERIDX_PRODUCT_ID, data.strProductId);
-        if (FAILED(rc)) break;
-
-        rc = i_usbFilterFieldSetter(USBFILTERIDX_DEVICE, data.strRevision);
-        if (FAILED(rc)) break;
-
-        rc = i_usbFilterFieldSetter(USBFILTERIDX_MANUFACTURER_STR, data.strManufacturer);
-        if (FAILED(rc)) break;
-
-        rc = i_usbFilterFieldSetter(USBFILTERIDX_PRODUCT_STR, data.strProduct);
-        if (FAILED(rc)) break;
-
-        rc = i_usbFilterFieldSetter(USBFILTERIDX_SERIAL_NUMBER_STR, data.strSerialNumber);
-        if (FAILED(rc)) break;
-
-        rc = i_usbFilterFieldSetter(USBFILTERIDX_PORT, data.strPort);
-        if (FAILED(rc)) break;
-
-        rc = COMSETTER(Remote)(Bstr(data.strRemote).raw());
-        if (FAILED(rc)) break;
-
-        rc = COMSETTER(MaskedInterfaces)(data.ulMaskedInterfaces);
-        if (FAILED(rc)) break;
-    }
-    while (0);
-
-    /* Confirm successful initialization when it's the case */
-    if (SUCCEEDED(rc))
-        autoInitSpan.setSucceeded();
-
-    return rc;
+    HRESULT hrc = i_usbFilterFieldSetter(USBFILTERIDX_VENDOR_ID, data.strVendorId);
+    if (FAILED(hrc)) return hrc;
+
+    hrc = i_usbFilterFieldSetter(USBFILTERIDX_PRODUCT_ID, data.strProductId);
+    if (FAILED(hrc)) return hrc;
+
+    hrc = i_usbFilterFieldSetter(USBFILTERIDX_DEVICE, data.strRevision);
+    if (FAILED(hrc)) return hrc;
+
+    hrc = i_usbFilterFieldSetter(USBFILTERIDX_MANUFACTURER_STR, data.strManufacturer);
+    if (FAILED(hrc)) return hrc;
+
+    hrc = i_usbFilterFieldSetter(USBFILTERIDX_PRODUCT_STR, data.strProduct);
+    if (FAILED(hrc)) return hrc;
+
+    hrc = i_usbFilterFieldSetter(USBFILTERIDX_SERIAL_NUMBER_STR, data.strSerialNumber);
+    if (FAILED(hrc)) return hrc;
+
+    hrc = i_usbFilterFieldSetter(USBFILTERIDX_PORT, data.strPort);
+    if (FAILED(hrc)) return hrc;
+
+    hrc = COMSETTER(Remote)(Bstr(data.strRemote).raw());
+    if (FAILED(hrc)) return hrc;
+
+    hrc = COMSETTER(MaskedInterfaces)(data.ulMaskedInterfaces);
+    if (FAILED(hrc)) return hrc;
+
+    /* Confirm successful initialization */
+    autoInitSpan.setSucceeded();
+
+    return S_OK;
 }
 
@@ -812 +806 @@
 
         com::Utf8Str errStr;
-        HRESULT rc = i_usbFilterFieldFromString(&bd->mUSBFilter, aIdx, strNew, errStr);
-        if (FAILED(rc))
+        HRESULT hrc = i_usbFilterFieldFromString(&bd->mUSBFilter, aIdx, strNew, errStr);
+        if (FAILED(hrc))
         {
             bd.rollback();
-            return setError(rc, "%s", errStr.c_str());
+            return setError(hrc, "%s", errStr.c_str());
         }
 
@@ -898 +892 @@
      * handling */
 
-    HRESULT rc = S_OK;
-    do
-    {
-        rc = setAction(data.action);
-        if (FAILED(rc)) break;
-
-        rc = i_usbFilterFieldSetter(USBFILTERIDX_VENDOR_ID, data.strVendorId);
-        if (FAILED(rc)) break;
-
-        rc = i_usbFilterFieldSetter(USBFILTERIDX_PRODUCT_ID, data.strProductId);
-        if (FAILED(rc)) break;
-
-        rc = i_usbFilterFieldSetter(USBFILTERIDX_DEVICE, data.strRevision);
-        if (FAILED(rc)) break;
-
-        rc = i_usbFilterFieldSetter(USBFILTERIDX_MANUFACTURER_STR, data.strManufacturer);
-        if (FAILED(rc)) break;
-
-        rc = i_usbFilterFieldSetter(USBFILTERIDX_PRODUCT_ID, data.strProduct);
-        if (FAILED(rc)) break;
-
-        rc = i_usbFilterFieldSetter(USBFILTERIDX_SERIAL_NUMBER_STR, data.strSerialNumber);
-        if (FAILED(rc)) break;
-
-        rc = i_usbFilterFieldSetter(USBFILTERIDX_PORT, data.strPort);
-        if (FAILED(rc)) break;
-    }
-    while (0);
-
-    /* Confirm successful initialization when it's the case */
-    if (SUCCEEDED(rc))
-        autoInitSpan.setSucceeded();
-
-    return rc;
+    HRESULT hrc = setAction(data.action);
+    if (FAILED(hrc)) return hrc;
+
+    hrc = i_usbFilterFieldSetter(USBFILTERIDX_VENDOR_ID, data.strVendorId);
+    if (FAILED(hrc)) return hrc;
+
+    hrc = i_usbFilterFieldSetter(USBFILTERIDX_PRODUCT_ID, data.strProductId);
+    if (FAILED(hrc)) return hrc;
+
+    hrc = i_usbFilterFieldSetter(USBFILTERIDX_DEVICE, data.strRevision);
+    if (FAILED(hrc)) return hrc;
+
+    hrc = i_usbFilterFieldSetter(USBFILTERIDX_MANUFACTURER_STR, data.strManufacturer);
+    if (FAILED(hrc)) return hrc;
+
+    hrc = i_usbFilterFieldSetter(USBFILTERIDX_PRODUCT_ID, data.strProduct);
+    if (FAILED(hrc)) return hrc;
+
+    hrc = i_usbFilterFieldSetter(USBFILTERIDX_SERIAL_NUMBER_STR, data.strSerialNumber);
+    if (FAILED(hrc)) return hrc;
+
+    hrc = i_usbFilterFieldSetter(USBFILTERIDX_PORT, data.strPort);
+    if (FAILED(hrc)) return hrc;
+
+    /* Confirm successful initialization */
+    autoInitSpan.setSucceeded();
+
+    return S_OK;
 }
 
@@ -1269 +1257 @@
         //bd.backup();
         com::Utf8Str errStr;
-        HRESULT rc = USBDeviceFilter::i_usbFilterFieldFromString(&bd->mUSBFilter, aIdx, aStr, errStr);
-        if (FAILED(rc))
+        HRESULT hrc = USBDeviceFilter::i_usbFilterFieldFromString(&bd->mUSBFilter, aIdx, aStr, errStr);
+        if (FAILED(hrc))
         {
             //bd.rollback();
-            return setError(rc, "%s", errStr.c_str());
+            return setError(hrc, "%s", errStr.c_str());
         }
 

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

@@ -339 +339 @@
     ComObjPtr<USBDeviceFilter> pFilter;
     pFilter.createObject();
-    HRESULT rc = pFilter->init(this, Bstr(aName).raw());
-    ComAssertComRCRetRC(rc);
-    rc = pFilter.queryInterfaceTo(aFilter.asOutParam());
-    AssertComRCReturnRC(rc);
+    HRESULT hrc = pFilter->init(this, Bstr(aName).raw());
+    ComAssertComRCRetRC(hrc);
+    hrc = pFilter.queryInterfaceTo(aFilter.asOutParam());
+    AssertComRCReturnRC(hrc);
 
     return S_OK;
@@ -516 +516 @@
         ComObjPtr<USBDeviceFilter> pFilter;
         pFilter.createObject();
-        HRESULT rc = pFilter->init(this,        // parent
-                                   f);
-        if (FAILED(rc)) return rc;
+        HRESULT hrc = pFilter->init(this /*aParent*/, f);
+        if (FAILED(hrc)) return hrc;
 
         m->llDeviceFilters->push_back(pFilter);
@@ -942 +941 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    HRESULT rc = S_OK;
-
     /* query fields */
     USBFILTER dev;
@@ -949 +946 @@
 
     USHORT vendorId = 0;
-    rc = aUSBDevice->COMGETTER(VendorId)(&vendorId);
-    ComAssertComRCRet(rc, false);
+    HRESULT hrc = aUSBDevice->COMGETTER(VendorId)(&vendorId);
+    ComAssertComRCRet(hrc, false);
     ComAssertRet(vendorId, false);
     int vrc = USBFilterSetNumExact(&dev, USBFILTERIDX_VENDOR_ID, vendorId, true); AssertRC(vrc);
 
     USHORT productId = 0;
-    rc = aUSBDevice->COMGETTER(ProductId)(&productId);
-    ComAssertComRCRet(rc, false);
+    hrc = aUSBDevice->COMGETTER(ProductId)(&productId);
+    ComAssertComRCRet(hrc, false);
     vrc = USBFilterSetNumExact(&dev, USBFILTERIDX_PRODUCT_ID, productId, true); AssertRC(vrc);
 
     USHORT revision;
-    rc = aUSBDevice->COMGETTER(Revision)(&revision);
-    ComAssertComRCRet(rc, false);
+    hrc = aUSBDevice->COMGETTER(Revision)(&revision);
+    ComAssertComRCRet(hrc, false);
     vrc = USBFilterSetNumExact(&dev, USBFILTERIDX_DEVICE, revision, true); AssertRC(vrc);
 
     Bstr manufacturer;
-    rc = aUSBDevice->COMGETTER(Manufacturer)(manufacturer.asOutParam());
-    ComAssertComRCRet(rc, false);
+    hrc = aUSBDevice->COMGETTER(Manufacturer)(manufacturer.asOutParam());
+    ComAssertComRCRet(hrc, false);
     if (!manufacturer.isEmpty())
         USBFilterSetStringExact(&dev, USBFILTERIDX_MANUFACTURER_STR, Utf8Str(manufacturer).c_str(),
@@ -972 +969 @@
 
     Bstr product;
-    rc = aUSBDevice->COMGETTER(Product)(product.asOutParam());
-    ComAssertComRCRet(rc, false);
+    hrc = aUSBDevice->COMGETTER(Product)(product.asOutParam());
+    ComAssertComRCRet(hrc, false);
     if (!product.isEmpty())
         USBFilterSetStringExact(&dev, USBFILTERIDX_PRODUCT_STR, Utf8Str(product).c_str(),
@@ -979 +976 @@
 
     Bstr serialNumber;
-    rc = aUSBDevice->COMGETTER(SerialNumber)(serialNumber.asOutParam());
-    ComAssertComRCRet(rc, false);
+    hrc = aUSBDevice->COMGETTER(SerialNumber)(serialNumber.asOutParam());
+    ComAssertComRCRet(hrc, false);
     if (!serialNumber.isEmpty())
         USBFilterSetStringExact(&dev, USBFILTERIDX_SERIAL_NUMBER_STR, Utf8Str(serialNumber).c_str(),
@@ -986 +983 @@
 
     Bstr address;
-    rc = aUSBDevice->COMGETTER(Address)(address.asOutParam());
-    ComAssertComRCRet(rc, false);
+    hrc = aUSBDevice->COMGETTER(Address)(address.asOutParam());
+    ComAssertComRCRet(hrc, false);
 
     USHORT port = 0;
-    rc = aUSBDevice->COMGETTER(Port)(&port);
-    ComAssertComRCRet(rc, false);
+    hrc = aUSBDevice->COMGETTER(Port)(&port);
+    ComAssertComRCRet(hrc, false);
     USBFilterSetNumExact(&dev, USBFILTERIDX_PORT, port, true);
 
     BOOL remote = FALSE;
-    rc = aUSBDevice->COMGETTER(Remote)(&remote);
-    ComAssertComRCRet(rc, false);
+    hrc = aUSBDevice->COMGETTER(Remote)(&remote);
+    ComAssertComRCRet(hrc, false);
     ComAssertRet(remote == TRUE, false);
 

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

@@ -144 +144 @@
     uint32_t uVal;
     char *pszNext;
-    int rc = RTStrToUInt32Ex(pszLine, &pszNext, 16, &uVal);
-    if (   rc == VWRN_TRAILING_CHARS
-        || rc == VWRN_TRAILING_SPACES
-        || rc == VINF_SUCCESS)
+    int vrc = RTStrToUInt32Ex(pszLine, &pszNext, 16, &uVal);
+    if (   vrc == VWRN_TRAILING_CHARS
+        || vrc == VWRN_TRAILING_SPACES
+        || vrc == VINF_SUCCESS)
     {
         /* Skip the whipespace following it and at the end of the line. */
@@ -153 +153 @@
         if (*pszNext != '\0')
         {
-            rc = RTStrValidateEncoding(pszNext);
-            if (RT_SUCCESS(rc))
+            vrc = RTStrValidateEncoding(pszNext);
+            if (RT_SUCCESS(vrc))
             {
                 size_t cchDesc = strlen(pszNext);
@@ -167 +167 @@
             }
             else
-                RTMsgError("Invalid encoding: '%s' (rc=%Rrc)", pszNext, rc);
+                RTMsgError("Invalid encoding: '%s' (vrc=%Rrc)", pszNext, vrc);
         }
         else
@@ -173 +173 @@
     }
     else
-        RTMsgError("Error converting number at the start of '%s': %Rrc", pszLine, rc);
+        RTMsgError("Error converting number at the start of '%s': %Rrc", pszLine, vrc);
     return ERROR_IN_PARSE_LINE;
 }
@@ -203 +203 @@
     {
         char szLine[_4K];
-        int rc = RTStrmGetLine(pInStrm, szLine, sizeof(szLine));
-        if (RT_SUCCESS(rc))
+        int vrc = RTStrmGetLine(pInStrm, szLine, sizeof(szLine));
+        if (RT_SUCCESS(vrc))
         {
             iLine++;
@@ -243 +243 @@
                 vendor.vendorID = 0;
         }
-        else if (rc == VERR_EOF)
+        else if (vrc == VERR_EOF)
             return RTEXITCODE_SUCCESS;
         else
-            return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTStrmGetLine failed: %Rrc", rc);
+            return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTStrmGetLine failed: %Rrc", vrc);
     }
 }
@@ -336 +336 @@
      * Initialize IPRT and convert argv to UTF-8.
      */
-    int rc = RTR3InitExe(argc, &argv, 0);
-    if (RT_FAILURE(rc))
-        return RTMsgInitFailure(rc);
+    int vrc = RTR3InitExe(argc, &argv, 0);
+    if (RT_FAILURE(vrc))
+        return RTMsgInitFailure(vrc);
 
     /*
@@ -368 +368 @@
 
         PRTSTREAM pInStrm;
-        rc = RTStrmOpen(argv[i], "r", &pInStrm);
-        if (RT_FAILURE(rc))
+        vrc = RTStrmOpen(argv[i], "r", &pInStrm);
+        if (RT_FAILURE(vrc))
             return RTMsgErrorExit((RTEXITCODE)ERROR_OPEN_FILE,
-                                  "Failed to open file '%s' for reading: %Rrc", argv[i], rc);
-
-        rc = ParseUsbIds(pInStrm, argv[i]);
+                                  "Failed to open file '%s' for reading: %Rrc", argv[i], vrc);
+
+        vrc = ParseUsbIds(pInStrm, argv[i]);
         RTStrmClose(pInStrm);
-        if (rc != 0)
+        if (vrc != 0)
         {
             RTMsgError("Failed parsing USB devices file '%s'", argv[i]);
-            return rc;
+            return vrc;
         }
     }

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

@@ -272 +272 @@
 int USBProxyBackend::start(void)
 {
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
     if (mThread == NIL_RTTHREAD)
     {
@@ -278 +278 @@
          * Force update before starting the poller thread.
          */
-        rc = wait(0);
-        if (rc == VERR_TIMEOUT || rc == VERR_INTERRUPTED || RT_SUCCESS(rc))
+        vrc = wait(0);
+        if (vrc == VERR_TIMEOUT || vrc == VERR_INTERRUPTED || RT_SUCCESS(vrc))
         {
             PUSBDEVICE pDevices = getDevices();
@@ -288 +288 @@
              */
             mTerminate = false;
-            rc = RTThreadCreate(&mThread, USBProxyBackend::serviceThread, this,
-                                0, RTTHREADTYPE_INFREQUENT_POLLER, RTTHREADFLAGS_WAITABLE, "USBPROXY");
-            AssertRC(rc);
-            if (RT_SUCCESS(rc))
+            vrc = RTThreadCreate(&mThread, USBProxyBackend::serviceThread, this,
+                                 0, RTTHREADTYPE_INFREQUENT_POLLER, RTTHREADFLAGS_WAITABLE, "USBPROXY");
+            AssertRC(vrc);
+            if (RT_SUCCESS(vrc))
                 LogFlowThisFunc(("started mThread=%RTthrd\n", mThread));
             else
@@ -299 +299 @@
     else
         LogFlowThisFunc(("already running, mThread=%RTthrd\n", mThread));
-    return rc;
+    return vrc;
 }
 
@@ -310 +310 @@
 int USBProxyBackend::stop(void)
 {
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
     if (mThread != NIL_RTTHREAD)
     {
@@ -317 +317 @@
          */
         ASMAtomicXchgSize(&mTerminate, true);
-        rc = interruptWait();
-        AssertRC(rc);
+        vrc = interruptWait();
+        AssertRC(vrc);
 
         /*
          * Wait for the thread to finish and then update the state.
          */
-        rc = RTThreadWait(mThread, 60000, NULL);
-        if (rc == VERR_INVALID_HANDLE)
-            rc = VINF_SUCCESS;
-        if (RT_SUCCESS(rc))
+        vrc = RTThreadWait(mThread, 60000, NULL);
+        if (vrc == VERR_INVALID_HANDLE)
+            vrc = VINF_SUCCESS;
+        if (RT_SUCCESS(vrc))
         {
             LogFlowThisFunc(("stopped mThread=%RTthrd\n", mThread));
@@ -333 +333 @@
         }
         else
-            AssertRC(rc);
+            AssertRC(vrc);
     }
     else
@@ -341 +341 @@
     updateDeviceList(NULL);
 
-    return rc;
+    return vrc;
 }
 
@@ -356 +356 @@
     LogFlowFunc(("pThis=%p\n", pThis));
     pThis->serviceThreadInit();
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
 
     /*
@@ -363 +363 @@
     for (;;)
     {
-        rc = pThis->wait(RT_INDEFINITE_WAIT);
-        if (RT_FAILURE(rc) && rc != VERR_INTERRUPTED && rc != VERR_TIMEOUT)
+        vrc = pThis->wait(RT_INDEFINITE_WAIT);
+        if (RT_FAILURE(vrc) && vrc != VERR_INTERRUPTED && vrc != VERR_TIMEOUT)
             break;
         if (pThis->mTerminate)
@@ -374 +374 @@
 
     pThis->serviceThreadTerm();
-    LogFlowFunc(("returns %Rrc\n", rc));
-    return rc;
+    LogFlowFunc(("returns %Rrc\n", vrc));
+    return vrc;
 }
 

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

@@ -603 +603 @@
         SessionMachinesList llOpenedMachines;
         mHost->i_parent()->i_getOpenedMachines(llOpenedMachines);
-        HRESULT rc = runAllFiltersOnDevice(aDevice, llOpenedMachines, NULL /* aIgnoreMachine */);
-        AssertComRC(rc);
+        HRESULT hrc = runAllFiltersOnDevice(aDevice, llOpenedMachines, NULL /* aIgnoreMachine */);
+        AssertComRC(hrc);
     }
 }
@@ -702 +702 @@
         SessionMachinesList llOpenedMachines;
         mHost->i_parent()->i_getOpenedMachines(llOpenedMachines);
-        HRESULT rc = runAllFiltersOnDevice(aDevice, llOpenedMachines, aIgnoreMachine);
-        AssertComRC(rc);
+        HRESULT hrc = runAllFiltersOnDevice(aDevice, llOpenedMachines, aIgnoreMachine);
+        AssertComRC(hrc);
     }
 }
@@ -959 +959 @@
     va_list va;
     va_start(va, aText);
-    HRESULT rc = VirtualBoxBase::setErrorInternalV(aResultCode,
-                                                   COM_IIDOF(IHost),
-                                                   "USBProxyService",
-                                                   aText, va,
-                                                   false /* aWarning*/,
-                                                   true /* aLogIt*/);
+    HRESULT hrc = VirtualBoxBase::setErrorInternalV(aResultCode,
+                                                    COM_IIDOF(IHost),
+                                                    "USBProxyService",
+                                                    aText, va,
+                                                    false /* aWarning*/,
+                                                    true /* aLogIt*/);
     va_end(va);
-    return rc;
+    return hrc;
 }
 

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

@@ -1473 +1473 @@
 HRESULT UnattendedSuseInstaller::setUserData()
 {
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
     //here base class function must be called first
     //because user home directory is set after user name
-    rc = UnattendedInstaller::setUserData();
-
-    rc = mAlg->setField(USERHOMEDIR_ID, "");
-    if (FAILED(rc))
-        return rc;
-
-    return rc;
+    hrc = UnattendedInstaller::setUserData();
+
+    hrc = mAlg->setField(USERHOMEDIR_ID, "");
+    if (FAILED(hrc))
+        return hrc;
+
+    return hrc;
 }
 
@@ -1504 +1504 @@
 HRESULT UnattendedSuseInstaller::setupScriptOnAuxiliaryCD(const Utf8Str &path)
 {
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
 
     GeneralTextScript isoSuseCfgScript(mpParent);
-    rc = isoSuseCfgScript.read(path);
-    rc = isoSuseCfgScript.parse();
+    hrc = isoSuseCfgScript.read(path);
+    hrc = isoSuseCfgScript.parse();
     //fix linux core bootable parameters: add path to the preseed script
 
@@ -1540 +1540 @@
     }
 
-    rc = isoSuseCfgScript.save(path, true);
+    hrc = isoSuseCfgScript.save(path, true);
 
     LogRelFunc(("UnattendedSuseInstaller::setupScriptsOnAuxiliaryCD(): The file %s has been changed\n", path.c_str()));
 
-    return rc;
+    return hrc;
 }
 #endif

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

@@ -95 +95 @@
     /** @todo Differentiate tasks once we have more stuff to do (downloading, installing, ++). */
 
-    HRESULT rc = pUpdateAgent->i_checkForUpdateTask(this);
+    HRESULT hrc = pUpdateAgent->i_checkForUpdateTask(this);
 
     if (!m_pProgress.isNull())
-        m_pProgress->i_notifyComplete(rc);
-
-    LogFlowFunc(("rc=%Rhrc\n", rc)); RT_NOREF(rc);
+        m_pProgress->i_notifyComplete(hrc);
+
+    LogFlowFunc(("hrc=%Rhrc\n", hrc)); RT_NOREF(hrc);
 }
 
@@ -792 +792 @@
 HRESULT UpdateAgent::i_configureProxy(RTHTTP hHttp)
 {
-    HRESULT rc;
-
     ProxyMode_T enmProxyMode;
-    rc = i_getProxyMode(&enmProxyMode);
-    ComAssertComRCRetRC(rc);
+    HRESULT hrc = i_getProxyMode(&enmProxyMode);
+    ComAssertComRCRetRC(hrc);
+
     Utf8Str strProxyUrl;
-    rc = i_getProxyURL(strProxyUrl);
-    ComAssertComRCRetRC(rc);
+    hrc = i_getProxyURL(strProxyUrl);
+    ComAssertComRCRetRC(hrc);
 
     if (enmProxyMode == ProxyMode_Manual)
@@ -923 +922 @@
 
     ComObjPtr<Progress> pProgress;
-    HRESULT rc = pProgress.createObject();
-    if (FAILED(rc))
-        return rc;
-
-    rc = pProgress->init(m_VirtualBox,
-                         static_cast<IUpdateAgent*>(this),
-                         tr("Checking for update for %s ...", this->mData.m_strName.c_str()),
-                         TRUE /* aCancelable */);
-    if (FAILED(rc))
-        return rc;
+    HRESULT hrc = pProgress.createObject();
+    if (FAILED(hrc))
+        return hrc;
+
+    hrc = pProgress->init(m_VirtualBox,
+                          static_cast<IUpdateAgent*>(this),
+                          tr("Checking for update for %s ...", this->mData.m_strName.c_str()),
+                          TRUE /* aCancelable */);
+    if (FAILED(hrc))
+        return hrc;
 
     /* initialize the worker task */
     UpdateAgentTask *pTask = new UpdateAgentTask(this, pProgress);
-    rc = pTask->createThread();
+    hrc = pTask->createThread();
     pTask = NULL;
-    if (FAILED(rc))
-        return rc;
+    if (FAILED(hrc))
+        return hrc;
 
     return pProgress.queryInterfaceTo(aProgress.asOutParam());
@@ -968 +967 @@
     // Add platform ID.
     Bstr platform;
-    HRESULT rc = m_VirtualBox->COMGETTER(PackageType)(platform.asOutParam());
-    AssertComRCReturn(rc, rc);
+    HRESULT hrc = m_VirtualBox->COMGETTER(PackageType)(platform.asOutParam());
+    AssertComRCReturn(hrc, hrc);
     strUrl.appendPrintf("platform=%ls", platform.raw()); // e.g. SOLARIS_64BITS_GENERIC
 
     // Get the complete current version string for the query URL
     Bstr versionNormalized;
-    rc = m_VirtualBox->COMGETTER(VersionNormalized)(versionNormalized.asOutParam());
-    AssertComRCReturn(rc, rc);
+    hrc = m_VirtualBox->COMGETTER(VersionNormalized)(versionNormalized.asOutParam());
+    AssertComRCReturn(hrc, hrc);
     strUrl.appendPrintf("&version=%ls", versionNormalized.raw()); // e.g. 6.1.1
 #ifdef DEBUG // Comment out previous line and uncomment this one for testing.
@@ -982 +981 @@
 
     ULONG revision = 0;
-    rc = m_VirtualBox->COMGETTER(Revision)(&revision);
-    AssertComRCReturn(rc, rc);
+    hrc = m_VirtualBox->COMGETTER(Revision)(&revision);
+    AssertComRCReturn(hrc, hrc);
     strUrl.appendPrintf("_%u", revision); // e.g. 135618
 
@@ -998 +997 @@
     m->uCheckCount++;
 
-    rc = i_commitSettings(alock);
-    AssertComRCReturn(rc, rc);
+    hrc = i_commitSettings(alock);
+    AssertComRCReturn(hrc, hrc);
 
     strUrl.appendPrintf("&count=%RU32", m->uCheckCount);
@@ -1026 +1025 @@
      */
     Bstr version;
-    rc = m_VirtualBox->COMGETTER(Version)(version.asOutParam()); // e.g. 6.1.0_RC1
-    AssertComRCReturn(rc, rc);
+    hrc = m_VirtualBox->COMGETTER(Version)(version.asOutParam()); // e.g. 6.1.0_RC1
+    AssertComRCReturn(hrc, hrc);
 
     Utf8StrFmt const strUserAgent("VirtualBox %ls <%s>", version.raw(), UpdateAgent::i_getPlatformInfo().c_str());
@@ -1042 +1041 @@
         try
         {
-            rc = i_checkForUpdateInner(hHttp, strUrl, strUserAgent);
+            hrc = i_checkForUpdateInner(hHttp, strUrl, strUserAgent);
         }
         catch (...)
         {
             AssertFailed();
-            rc = E_UNEXPECTED;
+            hrc = E_UNEXPECTED;
         }
         RTHttpDestroy(hHttp);
     }
     else
-        rc = i_reportError(vrc, tr("RTHttpCreate() failed: %Rrc"), vrc);
-
-    return rc;
+        hrc = i_reportError(vrc, tr("RTHttpCreate() failed: %Rrc"), vrc);
+
+    return hrc;
 }
 
@@ -1070 +1069 @@
      * Configure the proxy (if any).
      */
-    HRESULT rc = i_configureProxy(hHttp);
-    if (FAILED(rc))
-        return rc;
+    HRESULT hrc = i_configureProxy(hHttp);
+    if (FAILED(hrc))
+        return hrc;
 
     /** @todo Are there any other headers needed to be added first via RTHttpSetHeaders()? */
@@ -1121 +1120 @@
 
         mData.m_enmState = UpdateState_NotAvailable;
-        rc = S_OK;
+        hrc = S_OK;
 
         alock.release(); /* Release lock before firing off event. */
@@ -1137 +1136 @@
         {
             /** @todo Any additional sanity checks we could perform here? */
-            rc = mData.m_lastResult.strVer.assignEx(pchWord0, cchWord0);
-            if (SUCCEEDED(rc))
-                rc = mData.m_lastResult.strDownloadUrl.assignEx(pchWord1, cchWord1);
-
-            if (SUCCEEDED(rc))
+            hrc = mData.m_lastResult.strVer.assignEx(pchWord0, cchWord0);
+            if (SUCCEEDED(hrc))
+                hrc = mData.m_lastResult.strDownloadUrl.assignEx(pchWord1, cchWord1);
+
+            if (SUCCEEDED(hrc))
             {
                 AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -1158 +1157 @@
             }
             else
-                rc = i_reportError(VERR_GENERAL_FAILURE /** @todo Use a better rc */,
-                                   tr("Invalid server response [1]: %Rhrc (%.*Rhxs -- %.*Rhxs)"),
-                                   rc, cchWord0, pchWord0, cchWord1, pchWord1);
+                hrc = i_reportError(VERR_GENERAL_FAILURE /** @todo Use a better hrc */,
+                                    tr("Invalid server response [1]: %Rhrc (%.*Rhxs -- %.*Rhxs)"),
+                                    hrc, cchWord0, pchWord0, cchWord1, pchWord1);
 
             LogRel2(("Update agent (%s): HTTP server replied: %.*s %.*s\n",
@@ -1166 +1165 @@
         }
         else
-            rc = i_reportError(vrc, tr("Invalid server response [2]: %Rrc (%.*Rhxs -- %.*Rhxs)"),
-                               vrc, cchWord0, pchWord0, cchWord1, pchWord1);
+            hrc = i_reportError(vrc, tr("Invalid server response [2]: %Rrc (%.*Rhxs -- %.*Rhxs)"),
+                                vrc, cchWord0, pchWord0, cchWord1, pchWord1);
     }
 
     RTHttpFreeResponse(pvResponse);
 
-    return rc;
-}
-
+    return hrc;
+}
+

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

@@ -212 +212 @@
     LogFlowFunc(("VFSExplorer %p\n", pVFSExplorer));
 
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
 
     switch (this->m_taskType)
@@ -219 +219 @@
         {
             if (pVFSExplorer->m->storageType == VFSType_File)
-                rc = pVFSExplorer->i_updateFS(this);
+                hrc = pVFSExplorer->i_updateFS(this);
             else if (pVFSExplorer->m->storageType == VFSType_S3)
-                rc = E_NOTIMPL;
+                hrc = E_NOTIMPL;
             break;
         }
@@ -227 +227 @@
         {
             if (pVFSExplorer->m->storageType == VFSType_File)
-                rc = pVFSExplorer->i_deleteFS(this);
+                hrc = pVFSExplorer->i_deleteFS(this);
             else if (pVFSExplorer->m->storageType == VFSType_S3)
-                rc = E_NOTIMPL;
+                hrc = E_NOTIMPL;
             break;
         }
@@ -237 +237 @@
     }
 
-    LogFlowFunc(("rc=%Rhrc\n", rc)); NOREF(rc);
+    LogFlowFunc(("hrc=%Rhrc\n", hrc)); NOREF(hrc);
     LogFlowFuncLeave();
 }
@@ -285 +285 @@
     AutoWriteLock appLock(this COMMA_LOCKVAL_SRC_POS);
 
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
 
     std::list<VFSExplorer::Data::DirEntry> fileList;
@@ -316 +316 @@
         catch (HRESULT hrcXcpt)
         {
-            rc = hrcXcpt;
+            hrc = hrcXcpt;
         }
 
@@ -323 +323 @@
     }
     else
-        rc = setErrorBoth(VBOX_E_FILE_ERROR, vrc, tr ("Can't open directory '%s' (%Rrc)"), m->strPath.c_str(), vrc);
+        hrc = setErrorBoth(VBOX_E_FILE_ERROR, vrc, tr ("Can't open directory '%s' (%Rrc)"), m->strPath.c_str(), vrc);
 
     if (aTask->m_ptrProgress)
@@ -329 +329 @@
 
     /* Assign the result on success (this clears the old list) */
-    if (rc == S_OK)
+    if (hrc == S_OK)
         m->entryList.assign(fileList.begin(), fileList.end());
 
-    aTask->m_rc = rc;
+    aTask->m_rc = hrc;
 
     if (!aTask->m_ptrProgress.isNull())
-        aTask->m_ptrProgress->i_notifyComplete(rc);
-
-    LogFlowFunc(("rc=%Rhrc\n", rc));
+        aTask->m_ptrProgress->i_notifyComplete(hrc);
+
+    LogFlowFunc(("hrc=%Rhrc\n", hrc));
     LogFlowFuncLeave();
 
@@ -352 +352 @@
     AutoWriteLock appLock(this COMMA_LOCKVAL_SRC_POS);
 
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
 
     float fPercentStep = 100.0f / (float)aTask->m_lstFilenames.size();
@@ -376 +376 @@
     catch (HRESULT hrcXcpt)
     {
-        rc = hrcXcpt;
-    }
-
-    aTask->m_rc = rc;
+        hrc = hrcXcpt;
+    }
+
+    aTask->m_rc = hrc;
 
     if (aTask->m_ptrProgress.isNotNull())
-        aTask->m_ptrProgress->i_notifyComplete(rc);
-
-    LogFlowFunc(("rc=%Rhrc\n", rc));
+        aTask->m_ptrProgress->i_notifyComplete(hrc);
+
+    LogFlowFunc(("hrc=%Rhrc\n", hrc));
     LogFlowFuncLeave();
 
@@ -394 +394 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
 
     ComObjPtr<Progress> progress;
@@ -404 +404 @@
         progress.createObject();
 
-        rc = progress->init(mVirtualBox,
-                            static_cast<IVFSExplorer*>(this),
-                            progressDesc.raw(),
-                            TRUE /* aCancelable */);
-        if (FAILED(rc)) throw rc;
+        hrc = progress->init(mVirtualBox, static_cast<IVFSExplorer*>(this), progressDesc.raw(), TRUE /* aCancelable */);
+        if (FAILED(hrc)) throw hrc;
 
         /* Initialize our worker task */
@@ -414 +411 @@
 
         //this function delete task in case of exceptions, so there is no need in the call of delete operator
-        rc = pTask->createThreadWithType(RTTHREADTYPE_MAIN_HEAVY_WORKER);
+        hrc = pTask->createThreadWithType(RTTHREADTYPE_MAIN_HEAVY_WORKER);
     }
     catch (HRESULT hrcXcpt)
     {
-        rc = hrcXcpt;
-    }
-
-     if (SUCCEEDED(rc))
+        hrc = hrcXcpt;
+    }
+
+     if (SUCCEEDED(hrc))
          /* Return progress to the caller */
          progress.queryInterfaceTo(aProgress.asOutParam());
 
-    return rc;
+    return hrc;
 }
 
@@ -511 +508 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
 
     ComObjPtr<Progress> progress;
@@ -519 +516 @@
         progress.createObject();
 
-        rc = progress->init(mVirtualBox, static_cast<IVFSExplorer*>(this),
-                            Bstr(tr("Delete files")).raw(),
-                            TRUE /* aCancelable */);
-        if (FAILED(rc)) throw rc;
+        hrc = progress->init(mVirtualBox, static_cast<IVFSExplorer*>(this),
+                             Bstr(tr("Delete files")).raw(),
+                             TRUE /* aCancelable */);
+        if (FAILED(hrc)) throw hrc;
 
         /* Initialize our worker task */
@@ -532 +529 @@
 
         //this function delete task in case of exceptions, so there is no need in the call of delete operator
-        rc = pTask->createThreadWithType(RTTHREADTYPE_MAIN_HEAVY_WORKER);
+        hrc = pTask->createThreadWithType(RTTHREADTYPE_MAIN_HEAVY_WORKER);
     }
     catch (HRESULT hrcXcpt)
     {
-        rc = hrcXcpt;
-    }
-
-    if (SUCCEEDED(rc))
+        hrc = hrcXcpt;
+    }
+
+    if (SUCCEEDED(hrc))
         /* Return progress to the caller */
         progress.queryInterfaceTo(aProgress.asOutParam());
 
-    return rc;
-}
-
+    return hrc;
+}
+

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

@@ -253 +253 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
 
     if (mData->fEnabled != RT_BOOL(aEnabled))
@@ -270 +270 @@
         adep.release();
 
-        rc = mParent->i_onVRDEServerChange(/* aRestart */ TRUE);
-        if (FAILED(rc))
+        hrc = mParent->i_onVRDEServerChange(/* aRestart */ TRUE);
+        if (FAILED(hrc))
         {
             /* Failed to enable/disable the server. Revert the internal state. */
@@ -286 +286 @@
     }
 
-    return rc;
+    return hrc;
 }
 
@@ -354 +354 @@
 
         /* A probably valid range. Verify and parse it. */
-        int rc;
+        int vrc;
         if (pszDash)
         {
-            rc = i_portParseNumber(NULL, pszStart, pszDash);
-            if (RT_SUCCESS(rc))
-                rc = i_portParseNumber(NULL, pszDash + 1, pszEnd);
+            vrc = i_portParseNumber(NULL, pszStart, pszDash);
+            if (RT_SUCCESS(vrc))
+                vrc = i_portParseNumber(NULL, pszDash + 1, pszEnd);
         }
         else
-            rc = i_portParseNumber(NULL, pszStart, pszEnd);
-
-        if (RT_FAILURE(rc))
-            return rc;
+            vrc = i_portParseNumber(NULL, pszStart, pszEnd);
+
+        if (RT_FAILURE(vrc))
+            return vrc;
     }
 
@@ -476 +476 @@
 #endif
 {
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
 
     RTLDRMOD hmod = NIL_RTLDRMOD;
@@ -483 +483 @@
     RTErrInfoInitStatic(&ErrInfo);
     if (RTPathHavePath(pszLibraryName))
-        rc = SUPR3HardenedLdrLoadPlugIn(pszLibraryName, &hmod, &ErrInfo.Core);
+        vrc = SUPR3HardenedLdrLoadPlugIn(pszLibraryName, &hmod, &ErrInfo.Core);
     else
-        rc = SUPR3HardenedLdrLoadAppPriv(pszLibraryName, &hmod, RTLDRLOAD_FLAGS_LOCAL, &ErrInfo.Core);
-    if (RT_SUCCESS(rc))
-    {
-        rc = RTLdrGetSymbol(hmod, "VRDESupportedProperties", (void **)ppfn);
-
-        if (RT_FAILURE(rc) && rc != VERR_SYMBOL_NOT_FOUND)
-            LogRel(("VRDE: Error resolving symbol '%s', rc %Rrc.\n", "VRDESupportedProperties", rc));
+        vrc = SUPR3HardenedLdrLoadAppPriv(pszLibraryName, &hmod, RTLDRLOAD_FLAGS_LOCAL, &ErrInfo.Core);
+    if (RT_SUCCESS(vrc))
+    {
+        vrc = RTLdrGetSymbol(hmod, "VRDESupportedProperties", (void **)ppfn);
+
+        if (RT_FAILURE(vrc) && vrc != VERR_SYMBOL_NOT_FOUND)
+            LogRel(("VRDE: Error resolving symbol '%s', vrc %Rrc.\n", "VRDESupportedProperties", vrc));
     }
     else
     {
         if (RTErrInfoIsSet(&ErrInfo.Core))
-            LogRel(("VRDE: Error loading the library '%s': %s (%Rrc)\n", pszLibraryName, ErrInfo.Core.pszMsg, rc));
+            LogRel(("VRDE: Error loading the library '%s': %s (%Rrc)\n", pszLibraryName, ErrInfo.Core.pszMsg, vrc));
         else
-            LogRel(("VRDE: Error loading the library '%s' rc = %Rrc.\n", pszLibraryName, rc));
+            LogRel(("VRDE: Error loading the library '%s' vrc = %Rrc.\n", pszLibraryName, vrc));
 
         hmod = NIL_RTLDRMOD;
     }
 
-    if (RT_SUCCESS(rc))
-    {
+    if (RT_SUCCESS(vrc))
         *phmod = hmod;
-    }
     else
     {
@@ -516 +514 @@
     }
 
-    return rc;
+    return vrc;
 }
 
@@ -557 +555 @@
 #endif
     }
-    Log(("VRDEPROP: library get rc %Rrc\n", vrc));
+    Log(("VRDEPROP: library get vrc %Rrc\n", vrc));
 
     if (RT_SUCCESS(vrc))
@@ -571 +569 @@
         vrc = loadVRDELibrary(strVrdeLibrary.c_str(), &hmod, &pfn);
 #endif
-        Log(("VRDEPROP: load library [%s] rc %Rrc\n", strVrdeLibrary.c_str(), vrc));
+        Log(("VRDEPROP: load library [%s] vrc %Rrc\n", strVrdeLibrary.c_str(), vrc));
         if (RT_SUCCESS(vrc))
         {

trunk/src/VBox/Main/src-server/generic/USBProxyBackendUsbIp.cpp

@@ -351 +351 @@
                 {
                     RTPollSetRemove(m->hPollSet, USBIP_POLL_ID_PIPE);
-                    int rc2 = RTPollSetDestroy(m->hPollSet);
-                    AssertRC(rc2);
+                    int vrc2 = RTPollSetDestroy(m->hPollSet);
+                    AssertRC(vrc2);
                     m->hPollSet = NIL_RTPOLLSET;
                 }
@@ -359 +359 @@
             if (RT_FAILURE(vrc))
             {
-                int rc2 = RTPipeClose(m->hWakeupPipeR);
-                AssertRC(rc2);
-                rc2 = RTPipeClose(m->hWakeupPipeW);
-                AssertRC(rc2);
+                int vrc2 = RTPipeClose(m->hWakeupPipeR);
+                AssertRC(vrc2);
+                vrc2 = RTPipeClose(m->hWakeupPipeW);
+                AssertRC(vrc2);
                 m->hWakeupPipeR = m->hWakeupPipeW = NIL_RTPIPE;
             }

trunk/src/VBox/Main/src-server/linux/HostHardwareLinux.cpp

@@ -151 +151 @@
     if (RT_SUCCESS(vrc))
     {
-        int rcIoCtl;
-        vrc = RTFileIoCtl(File, FDGETDRVTYP, pszName, 0, &rcIoCtl);
+        int iRcIoCtl;
+        vrc = RTFileIoCtl(File, FDGETDRVTYP, pszName, 0, &iRcIoCtl);
         RTFileClose(File);
-        if (RT_SUCCESS(vrc) && rcIoCtl >= 0)
+        if (RT_SUCCESS(vrc) && iRcIoCtl >= 0)
             return true;
     }
@@ -313 +313 @@
     if (RT_SUCCESS(vrc))
     {
-        int                             rcIoCtl          = 0;
+        int                             iRcIoCtl         = 0;
         unsigned char                   auchResponse[96] = { 0 };
         struct cdrom_generic_command    CdromCommandReq;
@@ -323 +323 @@
         CdromCommandReq.data_direction = CGC_DATA_READ;
         CdromCommandReq.timeout        = 5000;  /* ms */
-        vrc = RTFileIoCtl(hFile, CDROM_SEND_PACKET, &CdromCommandReq, 0, &rcIoCtl);
-        if (RT_SUCCESS(vrc) && rcIoCtl < 0)
+        vrc = RTFileIoCtl(hFile, CDROM_SEND_PACKET, &CdromCommandReq, 0, &iRcIoCtl);
+        if (RT_SUCCESS(vrc) && iRcIoCtl < 0)
             vrc = RTErrConvertFromErrno(-CdromCommandReq.stat);
         RTFileClose(hFile);
@@ -435 +435 @@
     if (RT_SUCCESS(vrc))
     {
-        int rcIoCtl;
-        vrc = RTFileIoCtl(File, NVME_IOCTL_ID, NULL, 0, &rcIoCtl);
+        int iRcIoCtl;
+        vrc = RTFileIoCtl(File, NVME_IOCTL_ID, NULL, 0, &iRcIoCtl);
         RTFileClose(File);
-        if (RT_SUCCESS(vrc) && rcIoCtl >= 0)
+        if (RT_SUCCESS(vrc) && iRcIoCtl >= 0)
             return true;
     }

trunk/src/VBox/Main/src-server/linux/USBGetDevices.cpp

@@ -1584 +1584 @@
 bool s_fTestDevicesAccessible;
 /** The result of the usbfs/inotify-specific init */
-int s_rcTestMethodInitResult;
+int s_vrcTestMethodInitResult;
 /** The value of the VBOX_USB environment variable. */
 const char *s_pszTestEnvUsb;
@@ -1596 +1596 @@
 void TestUSBSetupInit(const char *pszUsbfsRoot, bool fUsbfsAccessible,
                       const char *pszDevicesRoot, bool fDevicesAccessible,
-                      int rcMethodInitResult)
+                      int vrcMethodInitResult)
 {
     s_pszTestUsbfsRoot = pszUsbfsRoot;
@@ -1602 +1602 @@
     s_pszTestDevicesRoot = pszDevicesRoot;
     s_fTestDevicesAccessible = fDevicesAccessible;
-    s_rcTestMethodInitResult = rcMethodInitResult;
+    s_vrcTestMethodInitResult = vrcMethodInitResult;
 }
 

trunk/src/VBox/Main/src-server/os2/USBProxyBackendOs2.cpp

@@ -59 +59 @@
      * Try initialize the usbcalls stuff.
      */
-    int rc = DosCreateEventSem(NULL, &mhev, 0, FALSE);
-    rc = RTErrConvertFromOS2(rc);
-    if (RT_SUCCESS(rc))
+    APIRET orc = DosCreateEventSem(NULL, &mhev, 0, FALSE);
+    int vrc = RTErrConvertFromOS2(orc);
+    if (RT_SUCCESS(vrc))
     {
-        rc = DosLoadModule(NULL, 0, (PCSZ)"usbcalls", &mhmod);
-        rc = RTErrConvertFromOS2(rc);
-        if (RT_SUCCESS(rc))
+        orc = DosLoadModule(NULL, 0, (PCSZ)"usbcalls", &mhmod);
+        vrc = RTErrConvertFromOS2(orc);
+        if (RT_SUCCESS(vrc))
         {
-            if (    (rc = DosQueryProcAddr(mhmod, 0, (PCSZ)"UsbQueryNumberDevices",         (PPFN)&mpfnUsbQueryNumberDevices))          == NO_ERROR
-                &&  (rc = DosQueryProcAddr(mhmod, 0, (PCSZ)"UsbQueryDeviceReport",          (PPFN)&mpfnUsbQueryDeviceReport))           == NO_ERROR
-                &&  (rc = DosQueryProcAddr(mhmod, 0, (PCSZ)"UsbRegisterChangeNotification", (PPFN)&mpfnUsbRegisterChangeNotification))  == NO_ERROR
-                &&  (rc = DosQueryProcAddr(mhmod, 0, (PCSZ)"UsbDeregisterNotification",     (PPFN)&mpfnUsbDeregisterNotification))      == NO_ERROR
+            if (    (orc = DosQueryProcAddr(mhmod, 0, (PCSZ)"UsbQueryNumberDevices",         (PPFN)&mpfnUsbQueryNumberDevices))          == NO_ERROR
+                &&  (orc = DosQueryProcAddr(mhmod, 0, (PCSZ)"UsbQueryDeviceReport",          (PPFN)&mpfnUsbQueryDeviceReport))           == NO_ERROR
+                &&  (orc = DosQueryProcAddr(mhmod, 0, (PCSZ)"UsbRegisterChangeNotification", (PPFN)&mpfnUsbRegisterChangeNotification))  == NO_ERROR
+                &&  (orc = DosQueryProcAddr(mhmod, 0, (PCSZ)"UsbDeregisterNotification",     (PPFN)&mpfnUsbDeregisterNotification))      == NO_ERROR
                )
             {
-                rc = mpfnUsbRegisterChangeNotification(&mNotifyId, mhev, mhev);
-                if (!rc)
+                orc = mpfnUsbRegisterChangeNotification(&mNotifyId, mhev, mhev);
+                if (!orc)
                 {
                     /*
                      * Start the poller thread.
                      */
-                    rc = start();
-                    if (RT_SUCCESS(rc))
+                    vrc = start();
+                    if (RT_SUCCESS(vrc))
                     {
                         LogFlowThisFunc(("returns successfully - mNotifyId=%d\n", mNotifyId));
@@ -86 +86 @@
                         return;
                     }
+                    LogRel(("USBProxyBackendOs2: failed to start poller thread, vrc=%Rrc\n", vrc));
                 }
-
-                LogRel(("USBProxyBackendOs2: failed to register change notification, rc=%d\n", rc));
+                else
+                {
+                    LogRel(("USBProxyBackendOs2: failed to register change notification, orc=%d\n", orc));
+                    vrc = RTErrConvertFromOS2(orc);
+                }
             }
             else
+            {
                 LogRel(("USBProxyBackendOs2: failed to load usbcalls\n"));
+                vrc = RTErrConvertFromOS2(orc);
+            }
 
             DosFreeModule(mhmod);
         }
         else
-            LogRel(("USBProxyBackendOs2: failed to load usbcalls, rc=%d\n", rc));
+            LogRel(("USBProxyBackendOs2: failed to load usbcalls, vrc=%d\n", vrc));
         mhmod = NULLHANDLE;
     }
@@ -102 +109 @@
         mhev = NULLHANDLE;
 
-    mLastError = rc;
-    LogFlowThisFunc(("returns failure!!! (rc=%Rrc)\n", rc));
+    mLastError = vrc;
+    LogFlowThisFunc(("returns failure!!! (vrc=%Rrc)\n", vrc));
 }
 
@@ -191 +198 @@
 int USBProxyBackendOs2::wait(RTMSINTERVAL aMillies)
 {
-    int rc = DosWaitEventSem(mhev, aMillies);
-    return RTErrConvertFromOS2(rc);
+    int orc = DosWaitEventSem(mhev, aMillies);
+    return RTErrConvertFromOS2(orc);
 }
 
@@ -198 +205 @@
 int USBProxyBackendOs2::interruptWait(void)
 {
-    int rc = DosPostEventSem(mhev);
-    return rc == NO_ERROR || rc == ERROR_ALREADY_POSTED
+    int orc = DosPostEventSem(mhev);
+    return orc == NO_ERROR || orc == ERROR_ALREADY_POSTED
          ? VINF_SUCCESS
-         : RTErrConvertFromOS2(rc);
+         : RTErrConvertFromOS2(orc);
 }
 
@@ -212 +219 @@
      */
     ULONG cDevices = 0;
-    int rc = mpfnUsbQueryNumberDevices((PULONG)&cDevices); /* Thanks to com/xpcom, PULONG and ULONG * aren't the same. */
-    if (rc)
+    int orc = mpfnUsbQueryNumberDevices((PULONG)&cDevices); /* Thanks to com/xpcom, PULONG and ULONG * aren't the same. */
+    if (orc)
         return NULL;
 
@@ -228 +235 @@
         uint8_t abBuf[1024];
         ULONG cb = sizeof(abBuf);
-        rc = mpfnUsbQueryDeviceReport(i + 1, (PULONG)&cb, &abBuf[0]); /* see above (PULONG) */
-        if (rc)
+        orc = mpfnUsbQueryDeviceReport(i + 1, (PULONG)&cb, &abBuf[0]); /* see above (PULONG) */
+        if (orc)
             continue;
         PUSBDEVICEDESC pDevDesc = (PUSBDEVICEDESC)&abBuf[0];

trunk/src/VBox/Main/src-server/solaris/DynLoadLibSolaris.cpp

@@ -62 +62 @@
         return g_hLibDlpi != NIL_RTLDRMOD;
     g_fCheckedForLibDlpi = true;
-    int rc = RTLdrLoad(LIB_DLPI, &hLibDlpi);
-    if (RT_SUCCESS(rc))
+    int vrc = RTLdrLoad(LIB_DLPI, &hLibDlpi);
+    if (RT_SUCCESS(vrc))
     {
         /*
@@ -69 +69 @@
          * open the VNIC/link which requires root permissions :/
          */
-        rc  = RTLdrGetSymbol(hLibDlpi, "dlpi_walk", (void **)&g_pfnLibDlpiWalk);
-        rc |= RTLdrGetSymbol(hLibDlpi, "dlpi_close", (void **)&g_pfnLibDlpiClose);
-        rc |= RTLdrGetSymbol(hLibDlpi, "dlpi_open", (void **)&g_pfnLibDlpiOpen);
-        if (RT_SUCCESS(rc))
+        vrc  = RTLdrGetSymbol(hLibDlpi, "dlpi_walk", (void **)&g_pfnLibDlpiWalk);
+        vrc |= RTLdrGetSymbol(hLibDlpi, "dlpi_close", (void **)&g_pfnLibDlpiClose);
+        vrc |= RTLdrGetSymbol(hLibDlpi, "dlpi_open", (void **)&g_pfnLibDlpiOpen);
+        if (RT_SUCCESS(vrc))
         {
             g_hLibDlpi = hLibDlpi;

trunk/src/VBox/Main/src-server/solaris/NetIf-solaris.cpp

@@ -461 +461 @@
         RT_ZERO(IfNum);
         IfNum.lifn_family = AF_INET;
-        int rc = ioctl(Sock, SIOCGLIFNUM, &IfNum);
-        if (!rc)
+        int iRc = ioctl(Sock, SIOCGLIFNUM, &IfNum);
+        if (!iRc)
         {
             int cIfaces = RT_MIN(1024, IfNum.lifn_count); /* sane limit */
@@ -474 +474 @@
                 IfConfig.lifc_len = (int)cbIfaces;
                 IfConfig.lifc_buf = (caddr_t)paIfaces;
-                rc = ioctl(Sock, SIOCGLIFCONF, &IfConfig);
-                if (!rc)
+                iRc = ioctl(Sock, SIOCGLIFCONF, &IfConfig);
+                if (!iRc)
                 {
                     for (int i = 0; i < cIfaces; i++)
@@ -486 +486 @@
 
 #if 0
-                        rc = ioctl(Sock, SIOCGLIFADDR, &(paIfaces[i]));
-                        if (rc >= 0)
+                        iRc = ioctl(Sock, SIOCGLIFADDR, &(paIfaces[i]));
+                        if (iRc >= 0)
                         {
                             memcpy(Info.IPAddress.au8, ((struct sockaddr *)&paIfaces[i].lifr_addr)->sa_data,
@@ -501 +501 @@
                              * address this way, so we just use all zeros there.
                              */
-                            rc = ioctl(Sock, SIOCGARP, &ArpReq);
-                            if (rc >= 0)
+                            iRc = ioctl(Sock, SIOCGARP, &ArpReq);
+                            if (iRc >= 0)
                                 memcpy(&Info.MACAddress, ArpReq.arp_ha.sa_data, sizeof(Info.MACAddress));
 

trunk/src/VBox/Main/src-server/solaris/PerformanceSolaris.cpp

@@ -181 +181 @@
 
     uint64_t cb;
-    int rc = RTSystemQueryTotalRam(&cb);
-    if (RT_FAILURE(rc))
+    int vrc = RTSystemQueryTotalRam(&cb);
+    if (RT_FAILURE(vrc))
         totalRAM = 0;
     else
@@ -201 +201 @@
 int CollectorSolaris::getRawHostCpuLoad(uint64_t *user, uint64_t *kernel, uint64_t *idle)
 {
-    int rc = VINF_SUCCESS;
     kstat_t *ksp;
     uint64_t tmpUser, tmpKernel, tmpIdle;
@@ -237 +236 @@
     if (idle)   *idle   = tmpIdle;
 
-    return rc;
+    return VINF_SUCCESS;
 }
 
 int CollectorSolaris::getRawProcessCpuLoad(RTPROCESS process, uint64_t *user, uint64_t *kernel, uint64_t *total)
 {
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
     char *pszName;
     prusage_t prusage;
@@ -275 +274 @@
         {
             Log(("read() -> %d\n", errno));
-            rc = VERR_FILE_IO_ERROR;
+            vrc = VERR_FILE_IO_ERROR;
         }
         close(h);
@@ -282 +281 @@
     {
         Log(("open() -> %d\n", errno));
-        rc = VERR_ACCESS_DENIED;
-    }
-
-    return rc;
+        vrc = VERR_ACCESS_DENIED;
+    }
+
+    return vrc;
 }
 
@@ -292 +291 @@
     AssertReturn(totalRAM, VERR_INTERNAL_ERROR);
     uint64_t cb;
-    int rc = RTSystemQueryAvailableRam(&cb);
-    if (RT_SUCCESS(rc))
+    int vrc = RTSystemQueryAvailableRam(&cb);
+    if (RT_SUCCESS(vrc))
     {
         *total = totalRAM;
@@ -299 +298 @@
         *used = *total - *available;
     }
-    return rc;
+    return vrc;
 }
 
 int CollectorSolaris::getProcessMemoryUsage(RTPROCESS process, ULONG *used)
 {
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
     char *pszName = NULL;
     psinfo_t psinfo;
@@ -327 +326 @@
         {
             Log(("read() -> %d\n", errno));
-            rc = VERR_FILE_IO_ERROR;
+            vrc = VERR_FILE_IO_ERROR;
         }
         close(h);
@@ -334 +333 @@
     {
         Log(("open() -> %d\n", errno));
-        rc = VERR_ACCESS_DENIED;
-    }
-
-    return rc;
+        vrc = VERR_ACCESS_DENIED;
+    }
+
+    return vrc;
 }
 
@@ -471 +470 @@
 int CollectorSolaris::getRawHostDiskLoad(const char *name, uint64_t *disk_ms, uint64_t *total_ms)
 {
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
     AssertReturn(strlen(name) < KSTAT_STRLEN, VERR_INVALID_PARAMETER);
     LogFlowThisFunc(("n=%s\n", name));
@@ -480 +479 @@
         {
             LogRel(("kstat_read(%s) -> %d\n", name, errno));
-            rc = VERR_INTERNAL_ERROR;
+            vrc = VERR_INTERNAL_ERROR;
         }
         else
@@ -496 +495 @@
     {
         LogRel(("kstat_lookup(%s) -> %d\n", name, errno));
-        rc = VERR_INTERNAL_ERROR;
-    }
-
-    return rc;
+        vrc = VERR_INTERNAL_ERROR;
+    }
+
+    return vrc;
 }
 
@@ -568 +567 @@
 int CollectorSolaris::getHostDiskSize(const char *name, uint64_t *size)
 {
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
     AssertReturn(strlen(name) + 5 < KSTAT_STRLEN, VERR_INVALID_PARAMETER);
     LogFlowThisFunc(("n=%s\n", name));
@@ -580 +579 @@
         {
             LogRel(("kstat_read(%s) -> %d\n", name, errno));
-            rc = VERR_INTERNAL_ERROR;
+            vrc = VERR_INTERNAL_ERROR;
         }
         else
@@ -596 +595 @@
     {
         LogRel(("kstat_lookup(%s) -> %d\n", szName, errno));
-        rc = VERR_INTERNAL_ERROR;
-    }
-
-
-    return rc;
+        vrc = VERR_INTERNAL_ERROR;
+    }
+
+
+    return vrc;
 }
 
@@ -731 +730 @@
     {
         struct mnttab Entry;
-        int rc = 0;
+        int iRc = 0;
         resetmnttab(fp);
-        while ((rc = getmntent(fp, &Entry)) == 0)
+        while ((iRc = getmntent(fp, &Entry)) == 0)
             mFsMap[Entry.mnt_mountp] = Entry.mnt_special;
         fclose(fp);
-        if (rc != -1)
-            LogRel(("Error while reading mnttab: %d\n", rc));
-    }
-}
-
-}
+        if (iRc != -1)
+            LogRel(("Error while reading mnttab: %d\n", iRc));
+    }
+}
+
+}

trunk/src/VBox/Main/src-server/solaris/USBProxyBackendSolaris.cpp

@@ -91 +91 @@
      * Create semaphore.
      */
-    int rc = RTSemEventCreate(&mNotifyEventSem);
-    if (RT_FAILURE(rc))
-        return rc;
+    int vrc = RTSemEventCreate(&mNotifyEventSem);
+    if (RT_FAILURE(vrc))
+        return vrc;
 
     /*
      * Initialize the USB library.
      */
-    rc = USBLibInit();
-    if (RT_FAILURE(rc))
+    vrc = USBLibInit();
+    if (RT_FAILURE(vrc))
     {
         /* mNotifyEventSem will be destroyed in uninit */
-        return rc;
+        return vrc;
     }
 
@@ -209 +209 @@
     int *pInt = NULL;
     char *pStr = NULL;
-    int rc = DI_WALK_CONTINUE;
+    int iRc = DI_WALK_CONTINUE;
     if (di_prop_lookup_ints(DDI_DEV_T_ANY, Node, "interface", &pInt) < 0)
     {
@@ -337 +337 @@
                 pList->pTail = pList->pHead = pCur;
 
-            rc = DI_WALK_CONTINUE;
+            iRc = DI_WALK_CONTINUE;
         } while (0);
 
@@ -344 +344 @@
             solarisFreeUSBDevice(pCur);
     }
-    return rc;
+    return iRc;
 }
 
@@ -393 +393 @@
 
     PUSBDEVICE pDev = aDevice->i_getUsbData();
-    int rc = USBLibResetDevice(pDev->pszDevicePath, true);
-    if (RT_SUCCESS(rc))
+    int vrc = USBLibResetDevice(pDev->pszDevicePath, true);
+    if (RT_SUCCESS(vrc))
         aDevice->i_setBackendUserData(pvId);
     else
@@ -401 +401 @@
         pvId = NULL;
     }
-    LogFlowThisFunc(("returns %Rrc pvId=%p\n", rc, pvId));
-    return rc;
+    LogFlowThisFunc(("returns %Rrc pvId=%p\n", vrc, pvId));
+    return vrc;
 }
 
@@ -449 +449 @@
 
     PUSBDEVICE pDev = aDevice->i_getUsbData();
-    int rc = USBLibResetDevice(pDev->pszDevicePath, true /* Re-attach */);
-    if (RT_SUCCESS(rc))
+    int vrc = USBLibResetDevice(pDev->pszDevicePath, true /* Re-attach */);
+    if (RT_SUCCESS(vrc))
         aDevice->i_setBackendUserData(pvId);
     else
@@ -457 +457 @@
         pvId = NULL;
     }
-    LogFlowThisFunc(("returns %Rrc pvId=%p\n", rc, pvId));
-    return rc;
+    LogFlowThisFunc(("returns %Rrc pvId=%p\n", vrc, pvId));
+    return vrc;
 }
 

trunk/src/VBox/Main/src-server/win/HostDnsServiceWin.cpp

@@ -191 +191 @@
     AssertPtr(m);
     SetEvent(m->haDataEvent[DATA_SHUTDOWN_EVENT]);
-    /** @todo r=andy Wait for thread? Check rc here. Timeouts? */
+    /** @todo r=andy Wait for thread? Check vrc here. Timeouts? */
 
     return VINF_SUCCESS;
@@ -267 +267 @@
     HostDnsInformation info;
 
-    LONG lrc;
-    int rc;
-
     std::string strDomain;
     std::string strSearchList;  /* NB: comma separated, no spaces */
@@ -280 +277 @@
      * is what ipconfig.exe seems to do).
      */
-    for (DWORD regIndex = 0; /**/; ++regIndex) {
+    for (DWORD regIndex = 0; /**/; ++regIndex)
+    {
         char keyName[256];
         DWORD cbKeyName = sizeof(keyName);
@@ -287 +285 @@
         DWORD cbKeyData = sizeof(keyData);
 
-        lrc = RegEnumValueA(m->hKeyTcpipParameters, regIndex,
-                            keyName, &cbKeyName, 0,
-                            &keyType, (LPBYTE)keyData, &cbKeyData);
+/** @todo use unicode API. This isn't UTF-8 clean!   */
+        LSTATUS lrc = RegEnumValueA(m->hKeyTcpipParameters, regIndex,
+                                    keyName, &cbKeyName, 0,
+                                    &keyType, (LPBYTE)keyData, &cbKeyData);
 
         if (lrc == ERROR_NO_MORE_ITEMS)
@@ -444 +443 @@
         {
             LogRel2(("HostDnsServiceWin: %ls (status %u) ...\n",
-                     pAdp->FriendlyName ? pAdp->FriendlyName : L"(null)",
-                     pAdp->OperStatus));
+                     pAdp->FriendlyName ? pAdp->FriendlyName : L"(null)", pAdp->OperStatus));
 
             if (pAdp->OperStatus != IfOperStatusUp)
@@ -454 +452 @@
 
             char *pszDnsSuffix = NULL;
-            rc = RTUtf16ToUtf8Ex(pAdp->DnsSuffix, RTSTR_MAX,
-                                 &pszDnsSuffix, 0, /* allocate */
-                                 NULL);
-            if (RT_FAILURE(rc))
-            {
-                LogRel2(("HostDnsServiceWin: failed to convert DNS suffix \"%ls\": %Rrc\n",
-                        pAdp->DnsSuffix, rc));
+            int vrc = RTUtf16ToUtf8Ex(pAdp->DnsSuffix, RTSTR_MAX, &pszDnsSuffix, 0, /* allocate */ NULL);
+            if (RT_FAILURE(vrc))
+            {
+                LogRel2(("HostDnsServiceWin: failed to convert DNS suffix \"%ls\": %Rrc\n", pAdp->DnsSuffix, vrc));
                 continue;
             }

trunk/src/VBox/Main/src-server/win/HostPowerWin.cpp

@@ -54 +54 @@
     mHwnd = 0;
 
-    int rc = RTThreadCreate(&mThread, HostPowerServiceWin::NotificationThread, this, 65536,
-                            RTTHREADTYPE_GUI, RTTHREADFLAGS_WAITABLE, "MainPower");
-
-    if (RT_FAILURE(rc))
-    {
-        Log(("HostPowerServiceWin::HostPowerServiceWin: RTThreadCreate failed with %Rrc\n", rc));
+    int vrc = RTThreadCreate(&mThread, HostPowerServiceWin::NotificationThread, this, 65536,
+                             RTTHREADTYPE_GUI, RTTHREADFLAGS_WAITABLE, "MainPower");
+
+    if (RT_FAILURE(vrc))
+    {
+        Log(("HostPowerServiceWin::HostPowerServiceWin: RTThreadCreate failed with %Rrc\n", vrc));
         return;
     }
@@ -86 +86 @@
 
     /* Create a window and make it a power event notification handler. */
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
 
     HINSTANCE hInstance = (HINSTANCE)GetModuleHandle(NULL);
@@ -108 +108 @@
     if (atomWindowClass == 0)
     {
-        rc = VERR_NOT_SUPPORTED;
+        vrc = VERR_NOT_SUPPORTED;
         Log(("HostPowerServiceWin::NotificationThread: RegisterClassA failed with %x\n", GetLastError()));
     }
@@ -122 +122 @@
         {
             Log(("HostPowerServiceWin::NotificationThread: CreateWindowExA failed with %x\n", GetLastError()));
-            rc = VERR_NOT_SUPPORTED;
+            vrc = VERR_NOT_SUPPORTED;
         }
         else
@@ -192 +192 @@
                             if (SystemPowerStatus.BatteryFlag == 2 /* low > 33% */)
                             {
-                                LONG rc;
                                 SYSTEM_BATTERY_STATE BatteryState;
-
-                                rc = CallNtPowerInformation(SystemBatteryState, NULL, 0, (PVOID)&BatteryState,
-                                                            sizeof(BatteryState));
+                                LONG lrc = CallNtPowerInformation(SystemBatteryState, NULL, 0, (PVOID)&BatteryState,
+                                                                  sizeof(BatteryState));
 #ifdef LOG_ENABLED
-                                if (rc == 0 /* STATUS_SUCCESS */)
+                                if (lrc == 0 /* STATUS_SUCCESS */)
                                     Log(("CallNtPowerInformation claims %d seconds of power left\n",
                                          BatteryState.EstimatedTime));
 #endif
-                                if (    rc == 0 /* STATUS_SUCCESS */
+                                if (    lrc == 0 /* STATUS_SUCCESS */
                                     &&  BatteryState.EstimatedTime < 60*5)
                                 {

trunk/src/VBox/Main/src-server/win/NetIf-win.cpp

@@ -302 +302 @@
     }
 
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
     int vrc = VINF_SUCCESS;
 
@@ -343 +343 @@
                         /* initialize the object returned to the caller by
                          * CreateHostOnlyNetworkInterface() */
-                        rc = d->iface->init(Bstr(name), Bstr(name), guid, HostNetworkInterfaceType_HostOnly);
-                        if (SUCCEEDED(rc))
+                        hrc = d->iface->init(Bstr(name), Bstr(name), guid, HostNetworkInterfaceType_HostOnly);
+                        if (SUCCEEDED(hrc))
                         {
-                            rc = d->iface->i_setVirtualBox(d->ptrVBox);
-                            if (SUCCEEDED(rc))
+                            hrc = d->iface->i_setVirtualBox(d->ptrVBox);
+                            if (SUCCEEDED(hrc))
                             {
-                                rc = d->iface->updateConfig();
-                                if (SUCCEEDED(rc))
-                                    rc = d->iface->i_updatePersistentConfig();
+                                hrc = d->iface->updateConfig();
+                                if (SUCCEEDED(hrc))
+                                    hrc = d->iface->i_updatePersistentConfig();
                             }
                         }
@@ -364 +364 @@
                         if (RT_FAILURE(vrc)) break;
 
-                        rc = E_FAIL;
+                        hrc = E_FAIL;
                         d->iface->setError(E_FAIL, errMsg.c_str());
                         endLoop = true;
@@ -372 +372 @@
                     {
                         endLoop = true;
-                        rc = E_FAIL;/// @todo ComAssertMsgFailedBreak((
+                        hrc = E_FAIL;/// @todo ComAssertMsgFailedBreak((
                             //"Invalid message code %d (%08lX)\n",
                             //reply, reply),
-                            //rc = E_FAIL);
+                            //hrc = E_FAIL);
                     }
                 }
@@ -407 +407 @@
                     {
                         /* no parameters */
-                        rc = S_OK;
+                        hrc = S_OK;
                         endLoop = true;
                         break;
@@ -418 +418 @@
                         if (RT_FAILURE(vrc)) break;
 
-                        rc = E_FAIL;
+                        hrc = E_FAIL;
                         d->iface->setError(E_FAIL, errMsg.c_str());
                         endLoop = true;
@@ -426 +426 @@
                     {
                         endLoop = true;
-                        rc = E_FAIL; /// @todo ComAssertMsgFailedBreak((
+                        hrc = E_FAIL; /// @todo ComAssertMsgFailedBreak((
                             //"Invalid message code %d (%08lX)\n",
                             //reply, reply),
-                            //rc = E_FAIL);
+                            //hrc = E_FAIL);
                     }
                 }
@@ -461 +461 @@
                     {
                         /* no parameters */
-                        rc = d->iface->updateConfig();
+                        hrc = d->iface->updateConfig();
                         endLoop = true;
                         break;
@@ -472 +472 @@
                         if (RT_FAILURE(vrc)) break;
 
-                        rc = E_FAIL;
+                        hrc = E_FAIL;
                         d->iface->setError(E_FAIL, errMsg.c_str());
                         endLoop = true;
@@ -480 +480 @@
                     {
                         endLoop = true;
-                        rc = E_FAIL; /// @todo ComAssertMsgFailedBreak((
+                        hrc = E_FAIL; /// @todo ComAssertMsgFailedBreak((
                             //"Invalid message code %d (%08lX)\n",
                             //reply, reply),
-                            //rc = E_FAIL);
+                            //hrc = E_FAIL);
                     }
                 }
@@ -519 +519 @@
                     {
                         /* no parameters */
-                        rc = d->iface->updateConfig();
+                        hrc = d->iface->updateConfig();
                         endLoop = true;
                         break;
@@ -530 +530 @@
                         if (RT_FAILURE(vrc)) break;
 
-                        rc = E_FAIL;
+                        hrc = E_FAIL;
                         d->iface->setError(E_FAIL, errMsg.c_str());
                         endLoop = true;
@@ -538 +538 @@
                     {
                         endLoop = true;
-                        rc = E_FAIL; /// @todo ComAssertMsgFailedBreak((
+                        hrc = E_FAIL; /// @todo ComAssertMsgFailedBreak((
                             //"Invalid message code %d (%08lX)\n",
                             //reply, reply),
-                            //rc = E_FAIL);
+                            //hrc = E_FAIL);
                     }
                 }
@@ -577 +577 @@
                     {
                         /* no parameters */
-                        rc = d->iface->updateConfig();
+                        hrc = d->iface->updateConfig();
                         endLoop = true;
                         break;
@@ -588 +588 @@
                         if (RT_FAILURE(vrc)) break;
 
-                        rc = E_FAIL;
+                        hrc = E_FAIL;
                         d->iface->setError(E_FAIL, errMsg.c_str());
                         endLoop = true;
@@ -596 +596 @@
                     {
                         endLoop = true;
-                        rc = E_FAIL; /// @todo ComAssertMsgFailedBreak((
+                        hrc = E_FAIL; /// @todo ComAssertMsgFailedBreak((
                             //"Invalid message code %d (%08lX)\n",
                             //reply, reply),
-                            //rc = E_FAIL);
+                            //hrc = E_FAIL);
                     }
                 }
@@ -631 +631 @@
                     {
                         /* no parameters */
-                        rc = d->iface->updateConfig();
+                        hrc = d->iface->updateConfig();
                         endLoop = true;
                         break;
@@ -642 +642 @@
                         if (RT_FAILURE(vrc)) break;
 
-                        rc = E_FAIL;
+                        hrc = E_FAIL;
                         d->iface->setError(E_FAIL, errMsg.c_str());
                         endLoop = true;
@@ -650 +650 @@
                     {
                         endLoop = true;
-                        rc = E_FAIL; /// @todo ComAssertMsgFailedBreak((
+                        hrc = E_FAIL; /// @todo ComAssertMsgFailedBreak((
                             //"Invalid message code %d (%08lX)\n",
                             //reply, reply),
-                            //rc = E_FAIL);
+                            //hrc = E_FAIL);
                     }
                 }
@@ -661 +661 @@
         }
         default:
-            rc = E_FAIL; /// @todo ComAssertMsgFailedBreak((
+            hrc = E_FAIL; /// @todo ComAssertMsgFailedBreak((
 //                "Invalid message code %d (%08lX)\n",
 //                d->msgCode, d->msgCode),
-//                rc = E_FAIL);
+//                hrc = E_FAIL);
     }
 
@@ -670 +670 @@
         *aVrc = vrc;
 
-    LogFlowFunc(("rc=0x%08X, vrc=%Rrc\n", rc, vrc));
+    LogFlowFunc(("hrc=0x%08X, vrc=%Rrc\n", hrc, vrc));
     LogFlowFuncLeave();
-    return rc;
+    return hrc;
 }
 
@@ -940 +940 @@
 static BOOL IsUACEnabled()
 {
-    LONG rc = 0;
-
     OSVERSIONINFOEX info;
     ZeroMemory(&info, sizeof(OSVERSIONINFOEX));
     info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
-    rc = GetVersionEx((OSVERSIONINFO *) &info);
-    AssertReturn(rc != 0, FALSE);
-
-    LogFlowFunc(("dwMajorVersion=%d, dwMinorVersion=%d\n",
-                 info.dwMajorVersion, info.dwMinorVersion));
+    BOOL frc = GetVersionEx((OSVERSIONINFO *) &info);
+    AssertReturn(frc != FALSE, FALSE);
+
+    LogFlowFunc(("dwMajorVersion=%d, dwMinorVersion=%d\n", info.dwMajorVersion, info.dwMinorVersion));
 
     /* we are interested only in Vista (and newer versions...). In all
@@ -960 +957 @@
 
     HKEY hKey;
-    rc = RegOpenKeyExA(HKEY_LOCAL_MACHINE,
-                       "Software\\Microsoft\\Windows\\CurrentVersion\\Policies\\System",
-                       0, KEY_QUERY_VALUE, &hKey);
-
-    Assert(rc == ERROR_SUCCESS || rc == ERROR_PATH_NOT_FOUND);
-    if (rc == ERROR_SUCCESS)
+    LSTATUS lrc = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion\\Policies\\System",
+                                0, KEY_QUERY_VALUE, &hKey);
+
+    Assert(lrc == ERROR_SUCCESS || lrc == ERROR_PATH_NOT_FOUND);
+    if (lrc == ERROR_SUCCESS)
     {
 
         DWORD cbEnableLUA = sizeof(dwEnableLUA);
-        rc = RegQueryValueExA(hKey, "EnableLUA", NULL, NULL,
-                              (LPBYTE) &dwEnableLUA, &cbEnableLUA);
+        lrc = RegQueryValueExA(hKey, "EnableLUA", NULL, NULL, (LPBYTE) &dwEnableLUA, &cbEnableLUA);
 
         RegCloseKey(hKey);
 
-        Assert(rc == ERROR_SUCCESS || rc == ERROR_FILE_NOT_FOUND);
-    }
-
-    LogFlowFunc(("rc=%d, dwEnableLUA=%d\n", rc, dwEnableLUA));
+        Assert(lrc == ERROR_SUCCESS || lrc == ERROR_FILE_NOT_FOUND);
+    }
+
+    LogFlowFunc(("lrc=%d, dwEnableLUA=%d\n", lrc, dwEnableLUA));
 
     return dwEnableLUA == 1;
@@ -991 +986 @@
     GUID                IfGuid;
     HRESULT hr;
-    int rc = VERR_GENERAL_FAILURE;
+    int vrc = VERR_GENERAL_FAILURE;
 
     hr = pncc->GetDisplayName(&lpszName);
@@ -1007 +1002 @@
             RT_ZERO(Info);
             Info.Uuid = *guidIfCopy.raw();
-            rc = collectNetIfInfo(name, guidIfCopy, &Info, iDefaultInterface);
-            if (RT_FAILURE(rc))
-                LogRelFunc(("collectNetIfInfo() -> %Rrc\n", rc));
+            vrc = collectNetIfInfo(name, guidIfCopy, &Info, iDefaultInterface);
+            if (RT_FAILURE(vrc))
+                LogRelFunc(("collectNetIfInfo() -> %Rrc\n", vrc));
             LogFunc(("adding %ls\n", lpszName));
             /* create a new object and add it to the list */
@@ -1015 +1010 @@
             iface.createObject();
             /* remove the curly bracket at the end */
-            rc = iface->init(name, enmType, &Info);
-            if (SUCCEEDED(rc))
+            vrc = iface->init(name, enmType, &Info);
+            if (SUCCEEDED(vrc))
             {
                 if (Info.fIsDefault)
@@ -1025 +1020 @@
             else
             {
-                LogRelFunc(("HostNetworkInterface::init() -> %Rrc\n", rc));
-                AssertComRC(rc);
+                LogRelFunc(("HostNetworkInterface::init() -> %Rrc\n", vrc));
+                AssertComRC(vrc);
             }
         }
@@ -1036 +1031 @@
         LogRelFunc(("failed to get device display name (0x%x)\n", hr));
 
-    return rc;
+    return vrc;
 }
 
@@ -1256 +1251 @@
 #else
     Bstr guid;
-    HRESULT rc = pIf->COMGETTER(Id)(guid.asOutParam());
-    if (SUCCEEDED(rc))
+    HRESULT hrc = pIf->COMGETTER(Id)(guid.asOutParam());
+    if (SUCCEEDED(hrc))
     {
 //        ComPtr<VirtualBox> pVBox;
-//        rc = pIf->getVirtualBox(pVBox.asOutParam());
-//        if (SUCCEEDED(rc))
+//        hrc = pIf->getVirtualBox(pVBox.asOutParam());
+//        if (SUCCEEDED(hrc))
         {
             /* create a progress object */
@@ -1267 +1262 @@
             progress.createObject();
 //            ComPtr<IHost> host;
-//            HRESULT rc = pVBox->COMGETTER(Host)(host.asOutParam());
-//            if (SUCCEEDED(rc))
-            {
-                rc = progress->init(pVBox, (IHostNetworkInterface*)pIf,
-                                    Bstr(NetIfWin::tr("Enabling Dynamic Ip Configuration")).raw(),
-                                    FALSE /* aCancelable */);
-                if (SUCCEEDED(rc))
-                {
-                    if (FAILED(rc)) return rc;
+//            HRESULT hrc = pVBox->COMGETTER(Host)(host.asOutParam());
+//            if (SUCCEEDED(hrc))
+            {
+                hrc = progress->init(pVBox, (IHostNetworkInterface*)pIf,
+                                     Bstr(NetIfWin::tr("Enabling Dynamic Ip Configuration")).raw(),
+                                     FALSE /* aCancelable */);
+                if (SUCCEEDED(hrc))
+                {
+                    if (FAILED(hrc)) return hrc;
 //                    progress.queryInterfaceTo(aProgress);
 
@@ -1287 +1282 @@
                     d->u.StaticIP.IPNetMask = mask;
 
-                    rc = pVBox->i_startSVCHelperClient(IsUACEnabled() == TRUE /* aPrivileged */,
-                                                       netIfNetworkInterfaceHelperClient,
-                                                       static_cast<void *>(d),
-                                                       progress);
+                    hrc = pVBox->i_startSVCHelperClient(IsUACEnabled() == TRUE /* aPrivileged */,
+                                                        netIfNetworkInterfaceHelperClient,
+                                                        static_cast<void *>(d),
+                                                        progress);
                     /* d is now owned by netIfNetworkInterfaceHelperClient(), no need to delete one here */
 
-                    if (SUCCEEDED(rc))
+                    if (SUCCEEDED(hrc))
                     {
                         progress->WaitForCompletion(-1);
@@ -1302 +1297 @@
     }
 
-    return SUCCEEDED(rc) ? VINF_SUCCESS : VERR_GENERAL_FAILURE;
+    return SUCCEEDED(hrc) ? VINF_SUCCESS : VERR_GENERAL_FAILURE;
 #endif
 }
@@ -1314 +1309 @@
 #else
     Bstr guid;
-    HRESULT rc = pIf->COMGETTER(Id)(guid.asOutParam());
-    if (SUCCEEDED(rc))
+    HRESULT hrc = pIf->COMGETTER(Id)(guid.asOutParam());
+    if (SUCCEEDED(hrc))
     {
 //        ComPtr<VirtualBox> pVBox;
-//        rc = pIf->getVirtualBox(pVBox.asOutParam());
-//        if (SUCCEEDED(rc))
+//        hrc = pIf->getVirtualBox(pVBox.asOutParam());
+//        if (SUCCEEDED(hrc))
         {
             /* create a progress object */
@@ -1325 +1320 @@
             progress.createObject();
 //            ComPtr<IHost> host;
-//            HRESULT rc = pVBox->COMGETTER(Host)(host.asOutParam());
-//            if (SUCCEEDED(rc))
-            {
-                rc = progress->init(pVBox, (IHostNetworkInterface*)pIf,
-                                    Bstr(NetIfWin::tr("Enabling Dynamic Ip Configuration")).raw(),
-                                    FALSE /* aCancelable */);
-                if (SUCCEEDED(rc))
-                {
-                    if (FAILED(rc)) return rc;
+//            HRESULT hrc = pVBox->COMGETTER(Host)(host.asOutParam());
+//            if (SUCCEEDED(hrc))
+            {
+                hrc = progress->init(pVBox, (IHostNetworkInterface*)pIf,
+                                     Bstr(NetIfWin::tr("Enabling Dynamic Ip Configuration")).raw(),
+                                     FALSE /* aCancelable */);
+                if (SUCCEEDED(hrc))
+                {
+                    if (FAILED(hrc)) return hrc;
 //                    progress.queryInterfaceTo(aProgress);
 
@@ -1345 +1340 @@
                     d->u.StaticIPV6.IPV6NetMaskLength = aIPV6MaskPrefixLength;
 
-                    rc = pVBox->i_startSVCHelperClient(IsUACEnabled() == TRUE /* aPrivileged */,
-                                                       netIfNetworkInterfaceHelperClient,
-                                                       static_cast<void *>(d),
-                                                       progress);
+                    hrc = pVBox->i_startSVCHelperClient(IsUACEnabled() == TRUE /* aPrivileged */,
+                                                        netIfNetworkInterfaceHelperClient,
+                                                        static_cast<void *>(d),
+                                                        progress);
                     /* d is now owned by netIfNetworkInterfaceHelperClient(), no need to delete one here */
 
-                    if (SUCCEEDED(rc))
+                    if (SUCCEEDED(hrc))
                     {
                         progress->WaitForCompletion(-1);
@@ -1360 +1355 @@
     }
 
-    return SUCCEEDED(rc) ? VINF_SUCCESS : VERR_GENERAL_FAILURE;
+    return SUCCEEDED(hrc) ? VINF_SUCCESS : VERR_GENERAL_FAILURE;
 #endif
 }
@@ -1369 +1364 @@
     return VERR_NOT_IMPLEMENTED;
 #else
-    HRESULT rc;
+    HRESULT hrc;
     Bstr guid;
-    rc = pIf->COMGETTER(Id)(guid.asOutParam());
-    if (SUCCEEDED(rc))
+    hrc = pIf->COMGETTER(Id)(guid.asOutParam());
+    if (SUCCEEDED(hrc))
     {
 //        ComPtr<VirtualBox> pVBox;
-//        rc = pIf->getVirtualBox(pVBox.asOutParam());
-//        if (SUCCEEDED(rc))
+//        hrc = pIf->getVirtualBox(pVBox.asOutParam());
+//        if (SUCCEEDED(hrc))
         {
             /* create a progress object */
@@ -1382 +1377 @@
             progress.createObject();
 //            ComPtr<IHost> host;
-//            HRESULT rc = pVBox->COMGETTER(Host)(host.asOutParam());
-//            if (SUCCEEDED(rc))
-            {
-                rc = progress->init(pVBox, (IHostNetworkInterface*)pIf,
-                                    Bstr(NetIfWin::tr("Enabling Dynamic Ip Configuration")).raw(),
-                                    FALSE /* aCancelable */);
-                if (SUCCEEDED(rc))
-                {
-                    if (FAILED(rc)) return rc;
+//            HRESULT hrc = pVBox->COMGETTER(Host)(host.asOutParam());
+//            if (SUCCEEDED(hrc))
+            {
+                hrc = progress->init(pVBox, (IHostNetworkInterface*)pIf,
+                                     Bstr(NetIfWin::tr("Enabling Dynamic Ip Configuration")).raw(),
+                                     FALSE /* aCancelable */);
+                if (SUCCEEDED(hrc))
+                {
+                    if (FAILED(hrc)) return hrc;
 //                    progress.queryInterfaceTo(aProgress);
 
@@ -1400 +1395 @@
                     d->iface = pIf;
 
-                    rc = pVBox->i_startSVCHelperClient(IsUACEnabled() == TRUE /* aPrivileged */,
-                                                       netIfNetworkInterfaceHelperClient,
-                                                       static_cast<void *>(d),
-                                                       progress);
+                    hrc = pVBox->i_startSVCHelperClient(IsUACEnabled() == TRUE /* aPrivileged */,
+                                                        netIfNetworkInterfaceHelperClient,
+                                                        static_cast<void *>(d),
+                                                        progress);
                     /* d is now owned by netIfNetworkInterfaceHelperClient(), no need to delete one here */
 
-                    if (SUCCEEDED(rc))
+                    if (SUCCEEDED(hrc))
                     {
                         progress->WaitForCompletion(-1);
@@ -1415 +1410 @@
     }
 
-    return SUCCEEDED(rc) ? VINF_SUCCESS : VERR_GENERAL_FAILURE;
+    return SUCCEEDED(hrc) ? VINF_SUCCESS : VERR_GENERAL_FAILURE;
 #endif
 }
@@ -1424 +1419 @@
     return VERR_NOT_IMPLEMENTED;
 #else
-    HRESULT rc;
+    HRESULT hrc;
     Bstr guid;
-    rc = pIf->COMGETTER(Id)(guid.asOutParam());
-    if (SUCCEEDED(rc))
+    hrc = pIf->COMGETTER(Id)(guid.asOutParam());
+    if (SUCCEEDED(hrc))
     {
 //        ComPtr<VirtualBox> pVBox;
-//        rc = pIf->getVirtualBox(pVBox.asOutParam());
-//        if (SUCCEEDED(rc))
+//        hrc = pIf->getVirtualBox(pVBox.asOutParam());
+//        if (SUCCEEDED(hrc))
         {
             /* create a progress object */
@@ -1437 +1432 @@
             progress.createObject();
 //            ComPtr<IHost> host;
-//            HRESULT rc = pVBox->COMGETTER(Host)(host.asOutParam());
-//            if (SUCCEEDED(rc))
-            {
-                rc = progress->init(pVBox, (IHostNetworkInterface*)pIf,
-                                    Bstr(NetIfWin::tr("Enabling Dynamic Ip Configuration")).raw(),
-                                    FALSE /* aCancelable */);
-                if (SUCCEEDED(rc))
-                {
-                    if (FAILED(rc)) return rc;
+//            HRESULT hrc = pVBox->COMGETTER(Host)(host.asOutParam());
+//            if (SUCCEEDED(hrc))
+            {
+                hrc = progress->init(pVBox, (IHostNetworkInterface*)pIf,
+                                     Bstr(NetIfWin::tr("Enabling Dynamic Ip Configuration")).raw(),
+                                     FALSE /* aCancelable */);
+                if (SUCCEEDED(hrc))
+                {
+                    if (FAILED(hrc)) return hrc;
 //                    progress.queryInterfaceTo(aProgress);
 
@@ -1455 +1450 @@
                     d->iface = pIf;
 
-                    rc = pVBox->i_startSVCHelperClient(IsUACEnabled() == TRUE /* aPrivileged */,
-                                                       netIfNetworkInterfaceHelperClient,
-                                                       static_cast<void *>(d),
-                                                       progress);
+                    hrc = pVBox->i_startSVCHelperClient(IsUACEnabled() == TRUE /* aPrivileged */,
+                                                        netIfNetworkInterfaceHelperClient,
+                                                        static_cast<void *>(d),
+                                                        progress);
                     /* d is now owned by netIfNetworkInterfaceHelperClient(), no need to delete one here */
 
-                    if (SUCCEEDED(rc))
+                    if (SUCCEEDED(hrc))
                     {
                         progress->WaitForCompletion(-1);
@@ -1470 +1465 @@
     }
 
-    return SUCCEEDED(rc) ? VINF_SUCCESS : VERR_GENERAL_FAILURE;
+    return SUCCEEDED(hrc) ? VINF_SUCCESS : VERR_GENERAL_FAILURE;
 #endif
 }
@@ -1989 +1984 @@
                 ComObjPtr<HostNetworkInterface> iface;
                 iface.createObject();
-                HostNetworkInterfaceType enmType =
-                    _wcsnicmp((*it).pHwId, L"sun_VBoxNetAdp", sizeof(L"sun_VBoxNetAdp")/2) ?
-                    HostNetworkInterfaceType_Bridged : HostNetworkInterfaceType_HostOnly;
+                HostNetworkInterfaceType enmType = _wcsnicmp((*it).pHwId, L"sun_VBoxNetAdp", sizeof(L"sun_VBoxNetAdp") / 2)
+                                                 ? HostNetworkInterfaceType_Bridged : HostNetworkInterfaceType_HostOnly;
                 netIfLog(("Adding %ls as %s\n", (*it).pName,
                         enmType == HostNetworkInterfaceType_Bridged ? "bridged" :
                         enmType == HostNetworkInterfaceType_HostOnly ? "host-only" : "unknown"));
-                int rc = iface->init((*it).pName, enmType, &info);
-                if (FAILED(rc))
-                    LogRelFunc(("HostNetworkInterface::init() -> %Rrc\n", rc));
+                HRESULT hrc = iface->init((*it).pName, enmType, &info);
+                if (FAILED(hrc))
+                    LogRelFunc(("HostNetworkInterface::init() -> %Rrc\n", hrc));
                 else
                 {

trunk/src/VBox/Main/src-server/win/PerformanceWin.cpp

@@ -120 +120 @@
 
     uint64_t cb;
-    int rc = RTSystemQueryTotalRam(&cb);
-    if (RT_FAILURE(rc))
+    int vrc = RTSystemQueryTotalRam(&cb);
+    if (RT_FAILURE(vrc))
         totalRAM = 0;
     else
@@ -138 +138 @@
 
     uint64_t user, kernel, idle, total;
-    int rc = getRawHostCpuLoad(&user, &kernel, &idle);
-    if (RT_FAILURE(rc))
-        return rc;
+    int vrc = getRawHostCpuLoad(&user, &kernel, &idle);
+    if (RT_FAILURE(vrc))
+        return vrc;
     total = user + kernel + idle;
 
@@ -149 +149 @@
     mProcessStats.clear();
 
-    for (it = processes.begin(); it != processes.end() && RT_SUCCESS(rc); ++it)
+    for (it = processes.begin(); it != processes.end() && RT_SUCCESS(vrc); ++it)
     {
         RTPROCESS process = it->first;
-        HANDLE h = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ,
-                               FALSE, process);
+        HANDLE h = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, process);
 
         if (!h)
@@ -159 +158 @@
             dwError = GetLastError();
             Log (("OpenProcess() -> 0x%x\n", dwError));
-            rc = RTErrConvertFromWin32(dwError);
+            vrc = RTErrConvertFromWin32(dwError);
             break;
         }
@@ -172 +171 @@
                 dwError = GetLastError();
                 Log (("GetProcessTimes() -> 0x%x\n", dwError));
-                rc = RTErrConvertFromWin32(dwError);
+                vrc = RTErrConvertFromWin32(dwError);
             }
             else
@@ -181 +180 @@
             }
         }
-        if (RT_SUCCESS(rc) && (it->second & COLLECT_RAM_USAGE) != 0)
+        if (RT_SUCCESS(vrc) && (it->second & COLLECT_RAM_USAGE) != 0)
         {
             PROCESS_MEMORY_COUNTERS pmc;
@@ -188 +187 @@
                 dwError = GetLastError();
                 Log (("GetProcessMemoryInfo() -> 0x%x\n", dwError));
-                rc = RTErrConvertFromWin32(dwError);
+                vrc = RTErrConvertFromWin32(dwError);
             }
             else
@@ -199 +198 @@
     LogFlowThisFuncLeave();
 
-    return rc;
+    return vrc;
 }
 
@@ -311 +310 @@
     AssertReturn(totalRAM, VERR_INTERNAL_ERROR);
     uint64_t cb;
-    int rc = RTSystemQueryAvailableRam(&cb);
-    if (RT_SUCCESS(rc))
+    int vrc = RTSystemQueryAvailableRam(&cb);
+    if (RT_SUCCESS(vrc))
     {
         *total = totalRAM;
@@ -318 +317 @@
         *used = *total - *available;
     }
-    return rc;
+    return vrc;
 }
 

trunk/src/VBox/Main/src-server/win/USBProxyBackendWindows.cpp

@@ -80 +80 @@
      * Initialize the USB lib and stuff.
      */
-    int rc = USBLibInit();
-    if (RT_SUCCESS(rc))
+    int vrc = USBLibInit();
+    if (RT_SUCCESS(vrc))
     {
         /*
          * Start the poller thread.
          */
-        rc = start();
-        if (RT_SUCCESS(rc))
+        vrc = start();
+        if (RT_SUCCESS(vrc))
         {
             LogFlowThisFunc(("returns successfully\n"));
@@ -99 +99 @@
     mhEventInterrupt = INVALID_HANDLE_VALUE;
 
-    LogFlowThisFunc(("returns failure!!! (rc=%Rrc)\n", rc));
-    return rc;
+    LogFlowThisFunc(("returns failure!!! (vrc=%Rrc)\n", vrc));
+    return vrc;
 }
 
@@ -124 +124 @@
      * Terminate the library...
      */
-    int rc = USBLibTerm();
-    AssertRC(rc);
+    int vrc = USBLibTerm();
+    AssertRC(vrc);
     USBProxyBackend::uninit();
 }
@@ -184 +184 @@
     }
 
-    int rc = USBLibRunFilters();
-    if (!RT_SUCCESS(rc))
+    int vrc = USBLibRunFilters();
+    if (!RT_SUCCESS(vrc))
     {
         AssertMsgFailed(("Run Filters failed\n"));
         USBLibRemoveFilter(pvId);
-        return rc;
+        return vrc;
     }
 
@@ -226 +226 @@
     }
 
-    int rc = USBLibRunFilters();
-    if (!RT_SUCCESS(rc))
+    int vrc = USBLibRunFilters();
+    if (!RT_SUCCESS(vrc))
     {
         AssertMsgFailed(("Run Filters failed\n"));
         USBLibRemoveFilter(pvId);
-        return rc;
+        return vrc;
     }
 

trunk/src/VBox/Main/src-server/win/svcmain.cpp

@@ -168 +168 @@
             {
                 char szDest[1024];
-                int rc = RTLogQueryDestinations(pReleaseLogger, szDest, sizeof(szDest));
-                if (RT_SUCCESS(rc))
+                int vrc = RTLogQueryDestinations(pReleaseLogger, szDest, sizeof(szDest));
+                if (RT_SUCCESS(vrc))
                 {
-                    rc = RTStrCat(szDest, sizeof(szDest), " nohistory");
-                    if (RT_SUCCESS(rc))
+                    vrc = RTStrCat(szDest, sizeof(szDest), " nohistory");
+                    if (RT_SUCCESS(vrc))
                     {
-                        rc = RTLogDestinations(pReleaseLogger, szDest);
-                        AssertRC(rc);
+                        vrc = RTLogDestinations(pReleaseLogger, szDest);
+                        AssertRC(vrc);
                     }
                 }
@@ -738 +738 @@
 static int CreateMainWindow()
 {
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
     Assert(g_hMainWindow == NULL);
 
@@ -759 +759 @@
     {
         LogRel(("Failed to register window class for session monitoring\n"));
-        rc = VERR_NOT_SUPPORTED;
+        vrc = VERR_NOT_SUPPORTED;
     }
     else
@@ -769 +769 @@
         {
             LogRel(("Failed to create window for session monitoring\n"));
-            rc = VERR_NOT_SUPPORTED;
-        }
-    }
-    return rc;
+            vrc = VERR_NOT_SUPPORTED;
+        }
+    }
+    return vrc;
 }
 
@@ -811 +811 @@
     const char *signame;
     char namebuf[48];
-    // int rc;
+    // int vrc;
 
     if (dwCtrlType < RT_ELEMENTS(ctrl_event_names))
@@ -1065 +1065 @@
                 vrc = RTPathAppend(szLogFile, sizeof(szLogFile), "VBoxSVC.log");
             if (RT_FAILURE(vrc))
-                return RTMsgErrorExit(RTEXITCODE_FAILURE, "failed to construct release log filename, rc=%Rrc", vrc);
+                return RTMsgErrorExit(RTEXITCODE_FAILURE, "failed to construct release log filename, vrc=%Rrc", vrc);
             pszLogFile = szLogFile;
         }