Changeset 94912 in vbox for trunk/src/VBox/Main/src-all

Timestamp:

May 8, 2022 7:05:31 PM (3 years ago)

Author:

vboxsync

Message:

Main/src-all: Adjust to the new rules wrt. to rc -> hrc,vrc usage, ​bugref:10223

Location:

trunk/src/VBox/Main/src-all

Files:

• AuthLibrary.cpp (modified) (6 diffs)
• AutoCaller.cpp (modified) (6 diffs)
• CryptoUtils.cpp (modified) (12 diffs)
• DisplayPNGUtil.cpp (modified) (12 diffs)
• EventImpl.cpp (modified) (22 diffs)
• ExtPackManagerImpl.cpp (modified) (4 diffs)
• ExtPackUtil.cpp (modified) (41 diffs)
• HashedPw.cpp (modified) (2 diffs)
• NvramStoreImpl.cpp (modified) (39 diffs)
• QMTranslatorImpl.cpp (modified) (4 diffs)
• SecretKeyStore.cpp (modified) (5 diffs)
• SharedFolderImpl.cpp (modified) (4 diffs)
• VirtualBoxBase.cpp (modified) (20 diffs)
• VirtualBoxErrorInfoImpl.cpp (modified) (7 diffs)
• VirtualBoxTranslator.cpp (modified) (16 diffs)

trunk/src/VBox/Main/src-all/AuthLibrary.cpp

@@ -75 +75 @@
     /* Use a separate thread because external modules might need a lot of stack space. */
     RTTHREAD thread = NIL_RTTHREAD;
-    int rc = RTThreadCreate(&thread, authThread, pCtx, 512*_1K,
-                            RTTHREADTYPE_DEFAULT, RTTHREADFLAGS_WAITABLE, "VRDEAuth");
-    LogFlowFunc(("RTThreadCreate %Rrc\n", rc));
-
-    if (RT_SUCCESS(rc))
-    {
-        rc = RTThreadWait(thread, RT_INDEFINITE_WAIT, NULL);
-        LogFlowFunc(("RTThreadWait %Rrc\n", rc));
-    }
-
-    if (RT_SUCCESS(rc))
+    int vrc = RTThreadCreate(&thread, authThread, pCtx, 512*_1K,
+                             RTTHREADTYPE_DEFAULT, RTTHREADFLAGS_WAITABLE, "VRDEAuth");
+    LogFlowFunc(("RTThreadCreate %Rrc\n", vrc));
+
+    if (RT_SUCCESS(vrc))
+    {
+        vrc = RTThreadWait(thread, RT_INDEFINITE_WAIT, NULL);
+        LogFlowFunc(("RTThreadWait %Rrc\n", vrc));
+    }
+
+    if (RT_SUCCESS(vrc))
     {
         /* Only update the result if the thread finished without errors. */
@@ -92 +92 @@
     else
     {
-        LogRel(("AUTH: Unable to execute the auth thread %Rrc\n", rc));
+        LogRel(("AUTH: Unable to execute the auth thread %Rrc\n", vrc));
     }
 
@@ -105 +105 @@
     LogRel(("AUTH: Loading external authentication library '%s'\n", pszLibrary));
 
-    int rc;
+    int vrc;
     if (RTPathHavePath(pszLibrary))
-        rc = RTLdrLoad(pszLibrary, &pAuthLibCtx->hAuthLibrary);
+        vrc = RTLdrLoad(pszLibrary, &pAuthLibCtx->hAuthLibrary);
     else
     {
-        rc = RTLdrLoadAppPriv(pszLibrary, &pAuthLibCtx->hAuthLibrary);
-        if (RT_FAILURE(rc))
+        vrc = RTLdrLoadAppPriv(pszLibrary, &pAuthLibCtx->hAuthLibrary);
+        if (RT_FAILURE(vrc))
         {
             /* Backward compatibility with old default 'VRDPAuth' name.
@@ -119 +119 @@
             {
                 LogRel(("AUTH: Loading external authentication library 'VBoxAuth'\n"));
-                rc = RTLdrLoadAppPriv("VBoxAuth", &pAuthLibCtx->hAuthLibrary);
+                vrc = RTLdrLoadAppPriv("VBoxAuth", &pAuthLibCtx->hAuthLibrary);
             }
         }
     }
 
-    if (RT_FAILURE(rc))
-    {
-        LogRel(("AUTH: Failed to load external authentication library: %Rrc\n", rc));
+    if (RT_FAILURE(vrc))
+    {
+        LogRel(("AUTH: Failed to load external authentication library: %Rrc\n", vrc));
         pAuthLibCtx->hAuthLibrary = NIL_RTLDRMOD;
     }
 
-    if (RT_SUCCESS(rc))
+    if (RT_SUCCESS(vrc))
     {
         typedef struct AuthEntryInfoStruct
@@ -152 +152 @@
             *pEntryInfo->ppvAddress = NULL;
 
-            int rc2 = RTLdrGetSymbol(pAuthLibCtx->hAuthLibrary, pEntryInfo->pszName, pEntryInfo->ppvAddress);
-            if (RT_SUCCESS(rc2))
+            int vrc2 = RTLdrGetSymbol(pAuthLibCtx->hAuthLibrary, pEntryInfo->pszName, pEntryInfo->ppvAddress);
+            if (RT_SUCCESS(vrc2))
             {
                 /* Found an entry point. */
                 LogRel(("AUTH: Using entry point '%s'\n", pEntryInfo->pszName));
-                rc = VINF_SUCCESS;
+                vrc = VINF_SUCCESS;
                 break;
             }
 
-            if (rc2 != VERR_SYMBOL_NOT_FOUND)
-                LogRel(("AUTH: Could not resolve import '%s': %Rrc\n", pEntryInfo->pszName, rc2));
-
-            rc = rc2;
+            if (vrc2 != VERR_SYMBOL_NOT_FOUND)
+                LogRel(("AUTH: Could not resolve import '%s': %Rrc\n", pEntryInfo->pszName, vrc2));
+
+            vrc = vrc2;
 
             pEntryInfo++;
@@ -170 +170 @@
     }
 
-    if (RT_FAILURE(rc))
+    if (RT_FAILURE(vrc))
         AuthLibUnload(pAuthLibCtx);
 
-    return rc;
+    return vrc;
 }
 

trunk/src/VBox/Main/src-all/AutoCaller.cpp

@@ -134 +134 @@
     AutoWriteLock stateLock(mStateLock COMMA_LOCKVAL_SRC_POS);
 
-    HRESULT rc = E_ACCESSDENIED;
+    HRESULT hrc = E_ACCESSDENIED;
 
     if (mState == Ready || (aLimited && mState == Limited))
@@ -140 +140 @@
         /* if Ready or allows Limited, increase the number of callers */
         ++mCallers;
-        rc = S_OK;
+        hrc = S_OK;
     }
     else
@@ -149 +149 @@
             /* Called from the same thread that is doing AutoInitSpan or
              * AutoUninitSpan, just succeed */
-            rc = S_OK;
+            hrc = S_OK;
         }
         else if (mState == InInit)
@@ -188 +188 @@
 
             if (mState == Ready || (aLimited && mState == Limited))
-                rc = S_OK;
+                hrc = S_OK;
             else
             {
@@ -202 +202 @@
     }
 
-    if (FAILED(rc))
+    if (FAILED(hrc))
     {
         if (mState == Limited)
-            rc = mObj->setError(rc, AutoCallerCtx::tr("The object functionality is limited"));
+            hrc = mObj->setError(hrc, AutoCallerCtx::tr("The object functionality is limited"));
         else if (FAILED(mFailedRC) && mFailedRC != E_ACCESSDENIED)
         {
@@ -211 +211 @@
             if (mpFailedEI)
                 ErrorInfoKeeper eik(*mpFailedEI);
-            rc = mFailedRC;
+            hrc = mFailedRC;
         }
         else
-            rc = mObj->setError(rc, AutoCallerCtx::tr("The object is not ready"));
-    }
-
-    return rc;
+            hrc = mObj->setError(hrc, AutoCallerCtx::tr("The object is not ready"));
+    }
+
+    return hrc;
 }
 

trunk/src/VBox/Main/src-all/CryptoUtils.cpp

@@ -141 +141 @@
 
 #ifdef VBOX_COM_INPROC
-        int rc = m_pVMM->pfnSSMR3Open(strFilename.c_str(), NULL /*pStreamOps*/, NULL /*pvStreamOps*/,
-                                      0 /*fFlags*/, &m_pSsm);
-#else
-        int rc = SSMR3Open(strFilename.c_str(), NULL /*pStreamOps*/, NULL /*pvStreamOps*/,
-                           0 /*fFlags*/, &m_pSsm);
-#endif
-        if (   RT_SUCCESS(rc)
+        int vrc = m_pVMM->pfnSSMR3Open(strFilename.c_str(), NULL /*pStreamOps*/, NULL /*pvStreamOps*/,
+                                       0 /*fFlags*/, &m_pSsm);
+#else
+        int vrc = SSMR3Open(strFilename.c_str(), NULL /*pStreamOps*/, NULL /*pvStreamOps*/,
+                            0 /*fFlags*/, &m_pSsm);
+#endif
+        if (   RT_SUCCESS(vrc)
             && ppSsmHandle)
             *ppSsmHandle = m_pSsm;
 
-        return rc;
-    }
-
-    int rc = VINF_SUCCESS;
+        return vrc;
+    }
+
+    int vrc = VINF_SUCCESS;
     if (!m_pCryptoIf)
     {
 #ifdef VBOX_COM_INPROC
-        rc = m_pParent->i_retainCryptoIf(&m_pCryptoIf);
-        if (RT_FAILURE(rc))
-            return rc;
+        vrc = m_pParent->i_retainCryptoIf(&m_pCryptoIf);
+        if (RT_FAILURE(vrc))
+            return vrc;
 #else
         HRESULT hrc = m_pParent->i_retainCryptoIf(&m_pCryptoIf);
@@ -169 +169 @@
 
     SecretKey *pKey;
-    rc = m_pKeyStore->retainSecretKey(m_strKeyId, &pKey);
-    if (RT_SUCCESS(rc))
+    vrc = m_pKeyStore->retainSecretKey(m_strKeyId, &pKey);
+    if (RT_SUCCESS(vrc))
     {
         RTVFSFILE hVfsFileSsm = NIL_RTVFSFILE;
@@ -177 +177 @@
                          : RTFILE_O_READ      | RTFILE_O_OPEN           | RTFILE_O_DENY_WRITE;
 
-        rc = RTVfsFileOpenNormal(strFilename.c_str(), fOpen, &hVfsFileSsm);
-        if (RT_SUCCESS(rc))
+        vrc = RTVfsFileOpenNormal(strFilename.c_str(), fOpen, &hVfsFileSsm);
+        if (RT_SUCCESS(vrc))
         {
             const char *pszPassword = (const char *)pKey->getKeyBuffer();
 
-            rc = m_pCryptoIf->pfnCryptoFileFromVfsFile(hVfsFileSsm, m_strKeyStore.c_str(), pszPassword, &m_hVfsFile);
-            if (RT_SUCCESS(rc))
+            vrc = m_pCryptoIf->pfnCryptoFileFromVfsFile(hVfsFileSsm, m_strKeyStore.c_str(), pszPassword, &m_hVfsFile);
+            if (RT_SUCCESS(vrc))
             {
 #ifdef VBOX_COM_INPROC
-                rc = m_pVMM->pfnSSMR3Open(NULL /*pszFilename*/, &m_StrmOps, this, 0 /*fFlags*/, &m_pSsm);
-#else
-                rc = SSMR3Open(NULL /*pszFilename*/, &m_StrmOps, this, 0 /*fFlags*/, &m_pSsm);
-#endif
-                if (   RT_SUCCESS(rc)
+                vrc = m_pVMM->pfnSSMR3Open(NULL /*pszFilename*/, &m_StrmOps, this, 0 /*fFlags*/, &m_pSsm);
+#else
+                vrc = SSMR3Open(NULL /*pszFilename*/, &m_StrmOps, this, 0 /*fFlags*/, &m_pSsm);
+#endif
+                if (   RT_SUCCESS(vrc)
                     && ppSsmHandle)
                     *ppSsmHandle = m_pSsm;
 
-                if (RT_FAILURE(rc))
+                if (RT_FAILURE(vrc))
                 {
                     RTVfsFileRelease(m_hVfsFile);
@@ -208 +208 @@
     }
 
-    return rc;
+    return vrc;
 }
 
@@ -218 +218 @@
     uint32_t fOpen = RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_WRITE;
 
-    int rc = RTVfsFileOpenNormal(strFilename.c_str(), fOpen, &hVfsFileSsm);
-    if (RT_SUCCESS(rc))
+    int vrc = RTVfsFileOpenNormal(strFilename.c_str(), fOpen, &hVfsFileSsm);
+    if (RT_SUCCESS(vrc))
     {
         if (m_strKeyId.isNotEmpty())
@@ -225 +225 @@
             /* File is encrypted, set up machinery. */
             if (!m_pCryptoIf)
-                rc = m_pParent->i_retainCryptoIf(&m_pCryptoIf);
-
-            if (RT_SUCCESS(rc))
+                vrc = m_pParent->i_retainCryptoIf(&m_pCryptoIf);
+
+            if (RT_SUCCESS(vrc))
             {
                 SecretKey *pKey;
-                rc = m_pKeyStore->retainSecretKey(m_strKeyId, &pKey);
-                if (RT_SUCCESS(rc))
+                vrc = m_pKeyStore->retainSecretKey(m_strKeyId, &pKey);
+                if (RT_SUCCESS(vrc))
                 {
                     const char *pszPassword = (const char *)pKey->getKeyBuffer();
 
-                    rc = m_pCryptoIf->pfnCryptoFileFromVfsFile(hVfsFileSsm, m_strKeyStore.c_str(), pszPassword, &m_hVfsFile);
+                    vrc = m_pCryptoIf->pfnCryptoFileFromVfsFile(hVfsFileSsm, m_strKeyStore.c_str(), pszPassword, &m_hVfsFile);
                     pKey->release();
                 }
@@ -247 +247 @@
     }
 
-    return rc;
+    return vrc;
 #else
     RT_NOREF(strFilename);
@@ -261 +261 @@
     uint32_t fOpen = RTFILE_O_READWRITE | RTFILE_O_CREATE_REPLACE | RTFILE_O_DENY_WRITE;
 
-    int rc = RTVfsFileOpenNormal(strFilename.c_str(), fOpen, &hVfsFileSsm);
-    if (RT_SUCCESS(rc))
+    int vrc = RTVfsFileOpenNormal(strFilename.c_str(), fOpen, &hVfsFileSsm);
+    if (RT_SUCCESS(vrc))
     {
         if (m_strKeyId.isNotEmpty())
@@ -268 +268 @@
             /* File is encrypted, set up machinery. */
             if (!m_pCryptoIf)
-                rc = m_pParent->i_retainCryptoIf(&m_pCryptoIf);
-
-            if (RT_SUCCESS(rc))
+                vrc = m_pParent->i_retainCryptoIf(&m_pCryptoIf);
+
+            if (RT_SUCCESS(vrc))
             {
                 SecretKey *pKey;
-                rc = m_pKeyStore->retainSecretKey(m_strKeyId, &pKey);
-                if (RT_SUCCESS(rc))
+                vrc = m_pKeyStore->retainSecretKey(m_strKeyId, &pKey);
+                if (RT_SUCCESS(vrc))
                 {
                     const char *pszPassword = (const char *)pKey->getKeyBuffer();
 
-                    rc = m_pCryptoIf->pfnCryptoFileFromVfsFile(hVfsFileSsm, m_strKeyStore.c_str(), pszPassword, &m_hVfsFile);
+                    vrc = m_pCryptoIf->pfnCryptoFileFromVfsFile(hVfsFileSsm, m_strKeyStore.c_str(), pszPassword, &m_hVfsFile);
                     pKey->release();
                 }
@@ -284 +284 @@
                 /* Also release in success case because the encrypted file handle retained a new reference to it. */
                 RTVfsFileRelease(hVfsFileSsm);
-                if (RT_FAILURE(rc))
+                if (RT_FAILURE(vrc))
                     RTFileDelete(strFilename.c_str());
             }
@@ -292 +292 @@
     }
 
-    return rc;
+    return vrc;
 #else
     RT_NOREF(strFilename);
@@ -315 +315 @@
     {
 #ifdef VBOX_COM_INPROC
-        int rc = m_pVMM->pfnSSMR3Close(m_pSsm);
-#else
-        int rc = SSMR3Close(m_pSsm);
-#endif
-        AssertRCReturn(rc, rc);
+        int vrc = m_pVMM->pfnSSMR3Close(m_pSsm);
+#else
+        int vrc = SSMR3Close(m_pSsm);
+#endif
+        AssertRCReturn(vrc, vrc);
     }
 

trunk/src/VBox/Main/src-all/DisplayPNGUtil.cpp

@@ -30 +30 @@
     uint32_t cbPNG;
     uint32_t cbAllocated;
-    int rc;
+    int vrc;
 } PNGWriteCtx;
 
@@ -38 +38 @@
     LogFlowFunc(("png_ptr %p, p %p, cb %d, pCtx %p\n", png_ptr, p, cb, pCtx));
 
-    if (pCtx && RT_SUCCESS(pCtx->rc))
+    if (pCtx && RT_SUCCESS(pCtx->vrc))
     {
         if (pCtx->cbAllocated - pCtx->cbPNG < cb)
         {
             uint32_t cbNew = pCtx->cbPNG + (uint32_t)cb;
-            AssertReturnVoidStmt(cbNew > pCtx->cbPNG && cbNew <= _1G, pCtx->rc = VERR_TOO_MUCH_DATA);
+            AssertReturnVoidStmt(cbNew > pCtx->cbPNG && cbNew <= _1G, pCtx->vrc = VERR_TOO_MUCH_DATA);
             cbNew = RT_ALIGN_32(cbNew, 4096) + 4096;
 
@@ -49 +49 @@
             if (!pNew)
             {
-                pCtx->rc = VERR_NO_MEMORY;
+                pCtx->vrc = VERR_NO_MEMORY;
                 return;
             }
@@ -72 +72 @@
                    uint8_t fLimitSize)
 {
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
 
     uint8_t * volatile pu8Bitmap = NULL; /* gcc setjmp  warning */
@@ -115 +115 @@
         else
         {
-            rc = VERR_NO_MEMORY;
+            vrc = VERR_NO_MEMORY;
         }
     }
@@ -121 +121 @@
     LogFlowFunc(("%dx%d -> %dx%d\n", cx, cy, cxBitmap, cyBitmap));
 
-    if (RT_SUCCESS(rc))
+    if (RT_SUCCESS(vrc))
     {
         png_bytep *row_pointers = (png_bytep *)RTMemAlloc(cyBitmap * sizeof(png_bytep));
@@ -148 +148 @@
                         ctx.cbPNG = 0;
                         ctx.cbAllocated = 0;
-                        ctx.rc = VINF_SUCCESS;
+                        ctx.vrc = VINF_SUCCESS;
 
                         png_set_write_fn(png_ptr,
@@ -177 +177 @@
                         png_write_end(png_ptr, info_ptr);
 
-                        rc = ctx.rc;
-
-                        if (RT_SUCCESS(rc))
+                        vrc = ctx.vrc;
+
+                        if (RT_SUCCESS(vrc))
                         {
                             *ppu8PNG = ctx.pu8PNG;
@@ -190 +190 @@
                     else
                     {
-                        rc = VERR_GENERAL_FAILURE; /* Something within libpng. */
+                        vrc = VERR_GENERAL_FAILURE; /* Something within libpng. */
                     }
                 }
                 else
                 {
-                    rc = VERR_NO_MEMORY;
+                    vrc = VERR_NO_MEMORY;
                 }
 
@@ -203 +203 @@
             else
             {
-                rc = VERR_NO_MEMORY;
+                vrc = VERR_NO_MEMORY;
             }
 
@@ -210 +210 @@
         else
         {
-            rc = VERR_NO_MEMORY;
+            vrc = VERR_NO_MEMORY;
         }
     }
@@ -219 +219 @@
     }
 
-    return rc;
+    return vrc;
 
 }

trunk/src/VBox/Main/src-all/EventImpl.cpp

@@ -107 +107 @@
 HRESULT VBoxEvent::init(IEventSource *aSource, VBoxEventType_T aType, BOOL aWaitable)
 {
-    HRESULT rc = S_OK;
-
     AssertReturn(aSource != NULL, E_INVALIDARG);
 
@@ -137 +135 @@
     autoInitSpan.setSucceeded();
 
-    return rc;
+    return S_OK;
 }
 
@@ -259 +257 @@
 {
     m = new Data;
-    HRESULT rc = m->mEvent.createObject();
+    HRESULT hrc = m->mEvent.createObject();
     BaseFinalConstruct();
-    return rc;
+    return hrc;
 }
 
@@ -279 +277 @@
 HRESULT VBoxVetoEvent::init(IEventSource *aSource, VBoxEventType_T aType)
 {
-    HRESULT rc = S_OK;
     // all veto events are waitable
-    rc = m->mEvent->init(aSource, aType, TRUE);
-    if (FAILED(rc))
-        return rc;
+    HRESULT hrc = m->mEvent->init(aSource, aType, TRUE);
+    if (FAILED(hrc))
+        return hrc;
 
     AutoInitSpan autoInitSpan(this);
@@ -842 +839 @@
          * We release lock here to allow modifying ops on EventSource inside callback.
          */
-        HRESULT rc = S_OK;
+        HRESULT hrc = S_OK;
         if (mListener)
         {
             aAlock.release();
-            rc = mListener->HandleEvent(aEvent);
+            hrc = mListener->HandleEvent(aEvent);
 #ifdef RT_OS_WINDOWS
-            Assert(rc != RPC_E_WRONG_THREAD);
+            Assert(hrc != RPC_E_WRONG_THREAD);
 #endif
             aAlock.acquire();
@@ -854 +851 @@
         if (aWaitable)
             eventProcessed(aEvent, pit);
-        return rc;
+        return hrc;
     }
     return enqueue(aEvent);
@@ -1024 +1021 @@
 HRESULT EventSource::init()
 {
-    HRESULT rc = S_OK;
-
     AutoInitSpan autoInitSpan(this);
     AssertReturn(autoInitSpan.isOk(), E_FAIL);
@@ -1031 +1026 @@
     /* Confirm a successful initialization */
     autoInitSpan.setSucceeded();
-    return rc;
+    return S_OK;
 }
 
@@ -1090 +1085 @@
 HRESULT EventSource::unregisterListener(const ComPtr<IEventListener> &aListener)
 {
-    HRESULT rc = S_OK;;
+    HRESULT hrc = S_OK;;
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -1102 +1097 @@
         // destructor removes refs from the event map
         ::FireEventSourceChangedEvent(this, (IEventListener *)aListener, FALSE /*add*/);
-        rc = S_OK;
+        hrc = S_OK;
     }
     else
-        rc = setError(VBOX_E_OBJECT_NOT_FOUND,
-                      tr("Listener was never registered"));
-
-    return rc;
+        hrc = setError(VBOX_E_OBJECT_NOT_FOUND,
+                       tr("Listener was never registered"));
+
+    return hrc;
 }
 
@@ -1234 +1229 @@
 
     Listeners::iterator it = m->mListeners.find(aListener);
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
 
     if (it != m->mListeners.end())
-        rc = it->second.obj()->dequeue(aEvent.asOutParam(), aTimeout, alock);
+        hrc = it->second.obj()->dequeue(aEvent.asOutParam(), aTimeout, alock);
     else
-        rc = setError(VBOX_E_OBJECT_NOT_FOUND,
-                      tr("Listener was never registered"));
-
-    if (rc == VBOX_E_INVALID_OBJECT_STATE)
-        return setError(rc, tr("Listener must be passive"));
-
-    return rc;
+        hrc = setError(VBOX_E_OBJECT_NOT_FOUND,
+                       tr("Listener was never registered"));
+
+    if (hrc == VBOX_E_INVALID_OBJECT_STATE)
+        return setError(hrc, tr("Listener must be passive"));
+
+    return hrc;
 }
 
@@ -1482 +1477 @@
     ComObjPtr<PassiveEventListener> listener;
 
-    HRESULT rc = listener.createObject();
-    ComAssertMsgRet(SUCCEEDED(rc), (tr("Could not create wrapper object (%Rhrc)"), rc),
+    HRESULT hrc = listener.createObject();
+    ComAssertMsgRet(SUCCEEDED(hrc), (tr("Could not create wrapper object (%Rhrc)"), hrc),
                     E_FAIL);
     listener.queryInterfaceTo(aListener.asOutParam());
@@ -1494 +1489 @@
     ComObjPtr<EventSourceAggregator> agg;
 
-    HRESULT rc = agg.createObject();
-    ComAssertMsgRet(SUCCEEDED(rc), (tr("Could not create aggregator (%Rhrc)"), rc),
+    HRESULT hrc = agg.createObject();
+    ComAssertMsgRet(SUCCEEDED(hrc), (tr("Could not create aggregator (%Rhrc)"), hrc),
                     E_FAIL);
 
-    rc = agg->init(aSubordinates);
-    if (FAILED(rc))
-        return rc;
+    hrc = agg->init(aSubordinates);
+    if (FAILED(hrc))
+        return hrc;
 
     agg.queryInterfaceTo(aResult.asOutParam());
@@ -1508 +1503 @@
 HRESULT EventSourceAggregator::init(const std::vector<ComPtr<IEventSource> >  aSourcesIn)
 {
-    HRESULT rc;
-
     AutoInitSpan autoInitSpan(this);
     AssertReturn(autoInitSpan.isOk(), E_FAIL);
 
-    rc = mSource.createObject();
-    ComAssertMsgRet(SUCCEEDED(rc), (tr("Could not create source (%Rhrc)"), rc),
+    HRESULT hrc = mSource.createObject();
+    ComAssertMsgRet(SUCCEEDED(hrc), (tr("Could not create source (%Rhrc)"), hrc),
                     E_FAIL);
-    rc = mSource->init();
-    ComAssertMsgRet(SUCCEEDED(rc), (tr("Could not init source (%Rhrc)"), rc),
+    hrc = mSource->init();
+    ComAssertMsgRet(SUCCEEDED(hrc), (tr("Could not init source (%Rhrc)"), hrc),
                     E_FAIL);
 
@@ -1529 +1522 @@
     autoInitSpan.setSucceeded();
 
-    return rc;
+    return hrc;
 }
 
@@ -1554 +1547 @@
         return autoCaller.rc();
 
-    HRESULT rc;
-
     ComPtr<IEventListener> proxy;
-    rc = createProxyListener(aListener, proxy.asOutParam());
-    if (FAILED(rc))
-        return rc;
+    HRESULT hrc = createProxyListener(aListener, proxy.asOutParam());
+    if (FAILED(hrc))
+        return hrc;
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -1567 +1558 @@
         ComPtr<IEventSource> es = *it;
         /* Register active proxy listener on real event source */
-        rc = es->RegisterListener(proxy, ComSafeArrayInArg(aInterested), TRUE);
+        hrc = es->RegisterListener(proxy, ComSafeArrayInArg(aInterested), TRUE);
     }
     /* And add real listener on our event source */
-    rc = mSource->RegisterListener(aListener, ComSafeArrayInArg(aInterested), aActive);
-
-    rc = S_OK;
-
-    return rc;
+    hrc = mSource->RegisterListener(aListener, ComSafeArrayInArg(aInterested), aActive);
+
+    return S_OK;
 }
 
@@ -1585 +1574 @@
         return autoCaller.rc();
 
-    HRESULT rc = S_OK;
-
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
     ComPtr<IEventListener> proxy;
-    rc = getProxyListener(aListener, proxy.asOutParam());
-    if (FAILED(rc))
-        return rc;
+    HRESULT hrc = getProxyListener(aListener, proxy.asOutParam());
+    if (FAILED(hrc))
+        return hrc;
 
     for (EventSourceList::const_iterator it = mEventSources.begin(); it != mEventSources.end();
@@ -1598 +1585 @@
     {
         ComPtr<IEventSource> es = *it;
-        rc = es->UnregisterListener(proxy);
-    }
-    rc = mSource->UnregisterListener(aListener);
+        hrc = es->UnregisterListener(proxy);
+    }
+    hrc = mSource->UnregisterListener(aListener);
 
     return removeProxyListener(aListener);
@@ -1617 +1604 @@
         return autoCaller.rc();
 
-    HRESULT rc = S_OK;
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
     /* Aggregator event source shall not have direct event firing, but we may
@@ -1625 +1611 @@
     {
         ComPtr<IEventSource> es = *it;
-        rc = es->FireEvent(aEvent, aTimeout, aProcessed);
+        HRESULT hrc = es->FireEvent(aEvent, aTimeout, aProcessed);
         /* Current behavior is that aggregator's FireEvent() always succeeds,
            so that multiple event sources don't affect each other. */
-        NOREF(rc);
+        NOREF(hrc);
     }
 
@@ -1652 +1638 @@
     ComObjPtr<ProxyEventListener> proxy;
 
-    HRESULT rc = proxy.createObject();
-    ComAssertMsgRet(SUCCEEDED(rc), (tr("Could not create proxy (%Rhrc)"), rc),
+    HRESULT hrc = proxy.createObject();
+    ComAssertMsgRet(SUCCEEDED(hrc), (tr("Could not create proxy (%Rhrc)"), hrc),
                     E_FAIL);
 
-    rc = proxy->init(mSource);
-    if (FAILED(rc))
-        return rc;
+    hrc = proxy->init(mSource);
+    if (FAILED(hrc))
+        return hrc;
 
     ProxyListenerMap::const_iterator it = mListenerProxies.find(aListener);

trunk/src/VBox/Main/src-all/ExtPackManagerImpl.cpp

@@ -815 +815 @@
      * Make sure the SUPR3Hardened API works (ignoring errors for now).
      */
-    int rc = SUPR3HardenedVerifyInit();
-    if (RT_FAILURE(rc))
-        LogRel(("SUPR3HardenedVerifyInit failed: %Rrc\n", rc));
+    int vrc = SUPR3HardenedVerifyInit();
+    if (RT_FAILURE(vrc))
+        LogRel(("SUPR3HardenedVerifyInit failed: %Rrc\n", vrc));
 
     /*
@@ -829 +829 @@
     {
         char szPath[RTPATH_MAX];
-        rc = RTPathJoin(szPath, sizeof(szPath), a_pszDir, "nls");
-        if (RT_SUCCESS(rc))
-        {
-            rc = RTPathAppend(szPath, sizeof(szPath), m->pReg->pszNlsBaseName);
-            if (RT_SUCCESS(rc))
+        vrc = RTPathJoin(szPath, sizeof(szPath), a_pszDir, "nls");
+        if (RT_SUCCESS(vrc))
+        {
+            vrc = RTPathAppend(szPath, sizeof(szPath), m->pReg->pszNlsBaseName);
+            if (RT_SUCCESS(vrc))
             {
-                rc = VirtualBoxTranslator::registerTranslation(szPath, false, &m->pTrComponent);
-                if (RT_FAILURE(rc))
+                vrc = VirtualBoxTranslator::registerTranslation(szPath, false, &m->pTrComponent);
+                if (RT_FAILURE(vrc))
                     m->pTrComponent = NULL;
             }
@@ -2341 +2341 @@
      */
     char szBaseDir[RTPATH_MAX];
-    int rc = RTPathAppPrivateArchTop(szBaseDir, sizeof(szBaseDir));
-    AssertLogRelRCReturn(rc, E_FAIL);
-    rc = RTPathAppend(szBaseDir, sizeof(szBaseDir), VBOX_EXTPACK_INSTALL_DIR);
-    AssertLogRelRCReturn(rc, E_FAIL);
+    int vrc = RTPathAppPrivateArchTop(szBaseDir, sizeof(szBaseDir));
+    AssertLogRelRCReturn(vrc, E_FAIL);
+    vrc = RTPathAppend(szBaseDir, sizeof(szBaseDir), VBOX_EXTPACK_INSTALL_DIR);
+    AssertLogRelRCReturn(vrc, E_FAIL);
 
     char szCertificatDir[RTPATH_MAX];
-    rc = RTPathAppPrivateNoArch(szCertificatDir, sizeof(szCertificatDir));
-    AssertLogRelRCReturn(rc, E_FAIL);
-    rc = RTPathAppend(szCertificatDir, sizeof(szCertificatDir), VBOX_EXTPACK_CERT_DIR);
-    AssertLogRelRCReturn(rc, E_FAIL);
+    vrc = RTPathAppPrivateNoArch(szCertificatDir, sizeof(szCertificatDir));
+    AssertLogRelRCReturn(vrc, E_FAIL);
+    vrc = RTPathAppend(szCertificatDir, sizeof(szCertificatDir), VBOX_EXTPACK_CERT_DIR);
+    AssertLogRelRCReturn(vrc, E_FAIL);
 
     /*
@@ -2374 +2374 @@
     HRESULT hrc = S_OK;
     RTDIR   hDir;
-    int vrc = RTDirOpen(&hDir, szBaseDir);
+    vrc = RTDirOpen(&hDir, szBaseDir);
     if (RT_SUCCESS(vrc))
     {

trunk/src/VBox/Main/src-all/ExtPackUtil.cpp

@@ -341 +341 @@
      */
     RTFSOBJINFO ObjInfo;
-    int rc = RTVfsFileQueryInfo(hVfsFile, &ObjInfo, RTFSOBJATTRADD_UNIX);
-    if (RT_FAILURE(rc))
-        return &(new RTCString)->printf(ExtPackUtil::tr("RTVfsFileQueryInfo failed: %Rrc"), rc);
+    int vrc = RTVfsFileQueryInfo(hVfsFile, &ObjInfo, RTFSOBJATTRADD_UNIX);
+    if (RT_FAILURE(vrc))
+        return &(new RTCString)->printf(ExtPackUtil::tr("RTVfsFileQueryInfo failed: %Rrc"), vrc);
     if (a_pObjInfo)
         *a_pObjInfo = ObjInfo;
@@ -359 +359 @@
 
     /* Rewind to the start of the file. */
-    rc = RTVfsFileSeek(hVfsFile, 0, RTFILE_SEEK_BEGIN, NULL);
-    if (RT_FAILURE(rc))
-        return &(new RTCString)->printf(ExtPackUtil::tr("RTVfsFileSeek(,0,BEGIN) failed: %Rrc"), rc);
+    vrc = RTVfsFileSeek(hVfsFile, 0, RTFILE_SEEK_BEGIN, NULL);
+    if (RT_FAILURE(vrc))
+        return &(new RTCString)->printf(ExtPackUtil::tr("RTVfsFileSeek(,0,BEGIN) failed: %Rrc"), vrc);
 
     /* Allocate memory and read the file content into it. */
@@ -369 +369 @@
 
     RTCString *pstrErr = NULL;
-    rc = RTVfsFileRead(hVfsFile, pvFile, cbFile, NULL);
-    if (RT_FAILURE(rc))
-        pstrErr = &(new RTCString)->printf(ExtPackUtil::tr("RTVfsFileRead failed: %Rrc"), rc);
+    vrc = RTVfsFileRead(hVfsFile, pvFile, cbFile, NULL);
+    if (RT_FAILURE(vrc))
+        pstrErr = &(new RTCString)->printf(ExtPackUtil::tr("RTVfsFileRead failed: %Rrc"), vrc);
 
     /*
@@ -377 +377 @@
      */
     xml::Document Doc;
-    if (RT_SUCCESS(rc))
+    if (RT_SUCCESS(vrc))
     {
         xml::XmlMemParser   Parser;
@@ -388 +388 @@
         {
             pstrErr = new RTCString(rErr.what());
-            rc = VERR_PARSE_ERROR;
+            vrc = VERR_PARSE_ERROR;
         }
     }
@@ -396 +396 @@
      * Hand the xml doc over to the common code.
      */
-    if (RT_SUCCESS(rc))
+    if (RT_SUCCESS(vrc))
         try
         {
@@ -650 +650 @@
     {
         /** @todo Should probably restrict this to known build types (alpha,
-         *        beta, rc, ++). */
+         *        beta, release candidate, ++). */
         do
             pszVersion++;
@@ -708 +708 @@
  * RTStrPrintfv wrapper.
  *
- * @returns @a rc
- * @param   rc                  The status code to return.
+ * @returns @a vrc
+ * @param   vrc                 The status code to return.
  * @param   pszError            The error buffer.
  * @param   cbError             The size of the buffer.
@@ -715 +715 @@
  * @param   ...                 Format arguments.
  */
-static int vboxExtPackReturnError(int rc, char *pszError, size_t cbError, const char *pszFormat, ...)
+static int vboxExtPackReturnError(int vrc, char *pszError, size_t cbError, const char *pszFormat, ...)
 {
     va_list va;
@@ -721 +721 @@
     RTStrPrintfV(pszError, cbError, pszFormat, va);
     va_end(va);
-    return rc;
+    return vrc;
 }
 
@@ -769 +769 @@
     /** @todo drop this restriction after the old install interface is
      *        dropped. */
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
     if (   pszExtPackName
         && !ExtPackDesc.strName.equalsIgnoreCase(pszExtPackName))
-        rc = vboxExtPackReturnError(VERR_NOT_EQUAL, pszError, cbError,
-                                    ExtPackUtil::tr("The name of the downloaded file and the name stored inside the extension pack does not match"
-                                    " (xml='%s' file='%s')"), ExtPackDesc.strName.c_str(), pszExtPackName);
-    return rc;
+        vrc = vboxExtPackReturnError(VERR_NOT_EQUAL, pszError, cbError,
+                                     ExtPackUtil::tr("The name of the downloaded file and the name stored inside the extension pack does not match"
+                                     " (xml='%s' file='%s')"), ExtPackDesc.strName.c_str(), pszExtPackName);
+    return vrc;
 }
 
@@ -794 +794 @@
      * Read the manifest from the extension pack.
      */
-    int rc = RTVfsFileSeek(hManifestFile, 0, RTFILE_SEEK_BEGIN, NULL);
-    if (RT_FAILURE(rc))
-        return vboxExtPackReturnError(rc, pszError, cbError, ExtPackUtil::tr("RTVfsFileSeek failed: %Rrc"), rc);
+    int vrc = RTVfsFileSeek(hManifestFile, 0, RTFILE_SEEK_BEGIN, NULL);
+    if (RT_FAILURE(vrc))
+        return vboxExtPackReturnError(vrc, pszError, cbError, ExtPackUtil::tr("RTVfsFileSeek failed: %Rrc"), vrc);
 
     RTMANIFEST hTheirManifest;
-    rc = RTManifestCreate(0 /*fFlags*/, &hTheirManifest);
-    if (RT_FAILURE(rc))
-        return vboxExtPackReturnError(rc, pszError, cbError, ExtPackUtil::tr("RTManifestCreate failed: %Rrc"), rc);
+    vrc = RTManifestCreate(0 /*fFlags*/, &hTheirManifest);
+    if (RT_FAILURE(vrc))
+        return vboxExtPackReturnError(vrc, pszError, cbError, ExtPackUtil::tr("RTManifestCreate failed: %Rrc"), vrc);
 
     RTVFSIOSTREAM hVfsIos = RTVfsFileToIoStream(hManifestFile);
-    rc = RTManifestReadStandard(hTheirManifest, hVfsIos);
+    vrc = RTManifestReadStandard(hTheirManifest, hVfsIos);
     RTVfsIoStrmRelease(hVfsIos);
-    if (RT_SUCCESS(rc))
+    if (RT_SUCCESS(vrc))
     {
         /*
@@ -820 +820 @@
         };
         char szError[RTPATH_MAX];
-        rc = RTManifestEqualsEx(hOurManifest, hTheirManifest, &s_apszIgnoreEntries[0], NULL,
-                                RTMANIFEST_EQUALS_IGN_MISSING_ATTRS /*fFlags*/,
-                                szError, sizeof(szError));
-        if (RT_SUCCESS(rc))
+        vrc = RTManifestEqualsEx(hOurManifest, hTheirManifest, &s_apszIgnoreEntries[0], NULL,
+                                 RTMANIFEST_EQUALS_IGN_MISSING_ATTRS /*fFlags*/,
+                                 szError, sizeof(szError));
+        if (RT_SUCCESS(vrc))
         {
             /*
@@ -832 +832 @@
 
         }
-        else if (rc == VERR_NOT_EQUAL && szError[0])
+        else if (vrc == VERR_NOT_EQUAL && szError[0])
             vboxExtPackSetError(pszError, cbError, ExtPackUtil::tr("Manifest mismatch: %s"), szError);
         else
-            vboxExtPackSetError(pszError, cbError, ExtPackUtil::tr("RTManifestEqualsEx failed: %Rrc"), rc);
+            vboxExtPackSetError(pszError, cbError, ExtPackUtil::tr("RTManifestEqualsEx failed: %Rrc"), vrc);
 #if 0
         RTVFSIOSTREAM hVfsIosStdOut = NIL_RTVFSIOSTREAM;
@@ -846 +846 @@
     }
     else
-        vboxExtPackSetError(pszError, cbError, ExtPackUtil::tr("Error parsing '%s': %Rrc"), VBOX_EXTPACK_MANIFEST_NAME, rc);
+        vboxExtPackSetError(pszError, cbError, ExtPackUtil::tr("Error parsing '%s': %Rrc"), VBOX_EXTPACK_MANIFEST_NAME, vrc);
 
     RTManifestRelease(hTheirManifest);
-    return rc;
+    return vrc;
 }
 
@@ -871 +871 @@
      */
     char szCalculatedDigest[RTSHA256_DIGEST_LEN + 1];
-    int rc = RTManifestEntryQueryAttr(hFileManifest, "extpack", NULL /*no name*/, RTMANIFEST_ATTR_SHA256,
-                                      szCalculatedDigest, sizeof(szCalculatedDigest), NULL);
-    if (RT_SUCCESS(rc))
+    int vrc = RTManifestEntryQueryAttr(hFileManifest, "extpack", NULL /*no name*/, RTMANIFEST_ATTR_SHA256,
+                                       szCalculatedDigest, sizeof(szCalculatedDigest), NULL);
+    if (RT_SUCCESS(vrc))
     {
         /*
@@ -881 +881 @@
          */
         uint8_t abCalculatedHash[RTSHA256_HASH_SIZE];
-        rc = RTSha256FromString(szCalculatedDigest, abCalculatedHash);
-        if (RT_SUCCESS(rc))
+        vrc = RTSha256FromString(szCalculatedDigest, abCalculatedHash);
+        if (RT_SUCCESS(vrc))
         {
             if (   pszFileDigest
@@ -888 +888 @@
             {
                 uint8_t abFileHash[RTSHA256_HASH_SIZE];
-                rc = RTSha256FromString(pszFileDigest, abFileHash);
-                if (RT_SUCCESS(rc))
+                vrc = RTSha256FromString(pszFileDigest, abFileHash);
+                if (RT_SUCCESS(vrc))
                 {
                     if (memcmp(abFileHash, abCalculatedHash, sizeof(abFileHash)))
@@ -895 +895 @@
                         vboxExtPackSetError(pszError, cbError,
                                             ExtPackUtil::tr("The extension pack file has changed (SHA-256 mismatch)"));
-                        rc = VERR_NOT_EQUAL;
+                        vrc = VERR_NOT_EQUAL;
                     }
                 }
                 else
-                    vboxExtPackSetError(pszError, cbError, ExtPackUtil::tr("Bad SHA-256 '%s': %Rrc"), szCalculatedDigest, rc);
+                    vboxExtPackSetError(pszError, cbError, ExtPackUtil::tr("Bad SHA-256 '%s': %Rrc"), szCalculatedDigest, vrc);
             }
 
@@ -905 +905 @@
              * Set the output hash on success.
              */
-            if (pStrDigest && RT_SUCCESS(rc))
+            if (pStrDigest && RT_SUCCESS(vrc))
             {
                 try
@@ -913 +913 @@
                 catch (std::bad_alloc &)
                 {
-                    rc = VERR_NO_MEMORY;
+                    vrc = VERR_NO_MEMORY;
                 }
             }
         }
         else
-            vboxExtPackSetError(pszError, cbError, ExtPackUtil::tr("Bad SHA-256 '%s': %Rrc"), szCalculatedDigest, rc);
+            vboxExtPackSetError(pszError, cbError, ExtPackUtil::tr("Bad SHA-256 '%s': %Rrc"), szCalculatedDigest, vrc);
     }
     else
-        vboxExtPackSetError(pszError, cbError, "RTManifestEntryGetAttr: %Rrc", rc);
-    return rc;
+        vboxExtPackSetError(pszError, cbError, "RTManifestEntryGetAttr: %Rrc", vrc);
+    return vrc;
 }
 
@@ -945 +945 @@
                                            PRTVFSOBJ phVfsObj, PRTVFSFILE phVfsFile, char *pszError, size_t cbError)
 {
-    int rc;
+    int vrc;
 
     /*
@@ -951 +951 @@
      */
     if (phVfsFile && *phVfsFile != NIL_RTVFSFILE)
-        rc = vboxExtPackReturnError(VERR_DUPLICATE, pszError, cbError,
-                                    ExtPackUtil::tr("There can only be one '%s'"), pszAdjName);
+        vrc = vboxExtPackReturnError(VERR_DUPLICATE, pszError, cbError,
+                                     ExtPackUtil::tr("There can only be one '%s'"), pszAdjName);
     else if (enmType != RTVFSOBJTYPE_IO_STREAM && enmType != RTVFSOBJTYPE_FILE)
-        rc = vboxExtPackReturnError(VERR_NOT_A_FILE, pszError, cbError,
-                                    ExtPackUtil::tr("Standard member '%s' is not a file"), pszAdjName);
+        vrc = vboxExtPackReturnError(VERR_NOT_A_FILE, pszError, cbError,
+                                     ExtPackUtil::tr("Standard member '%s' is not a file"), pszAdjName);
     else
     {
         RTFSOBJINFO ObjInfo;
-        rc = RTVfsObjQueryInfo(*phVfsObj, &ObjInfo, RTFSOBJATTRADD_NOTHING);
-        if (RT_SUCCESS(rc))
+        vrc = RTVfsObjQueryInfo(*phVfsObj, &ObjInfo, RTFSOBJATTRADD_NOTHING);
+        if (RT_SUCCESS(vrc))
         {
             if (!RTFS_IS_FILE(ObjInfo.Attr.fMode))
-                rc = vboxExtPackReturnError(VERR_NOT_A_FILE, pszError, cbError,
-                                            ExtPackUtil::tr("Standard member '%s' is not a file"), pszAdjName);
+                vrc = vboxExtPackReturnError(VERR_NOT_A_FILE, pszError, cbError,
+                                             ExtPackUtil::tr("Standard member '%s' is not a file"), pszAdjName);
             else if (ObjInfo.cbObject >= _1M)
-                rc = vboxExtPackReturnError(VERR_OUT_OF_RANGE, pszError, cbError,
-                                            ExtPackUtil::tr("Standard member '%s' is too large: %'RU64 bytes (max 1 MB)", "",
-                                                            (size_t)ObjInfo.cbObject),
-                                            pszAdjName, (uint64_t)ObjInfo.cbObject);
+                vrc = vboxExtPackReturnError(VERR_OUT_OF_RANGE, pszError, cbError,
+                                             ExtPackUtil::tr("Standard member '%s' is too large: %'RU64 bytes (max 1 MB)", "",
+                                                             (size_t)ObjInfo.cbObject),
+                                             pszAdjName, (uint64_t)ObjInfo.cbObject);
             else
             {
@@ -978 +978 @@
                 RTVFSIOSTREAM hVfsIos = RTVfsObjToIoStream(*phVfsObj);
                 RTVFSFILE     hVfsFile;
-                rc = RTVfsMemorizeIoStreamAsFile(hVfsIos, RTFILE_O_READ, &hVfsFile);
-                if (RT_SUCCESS(rc))
+                vrc = RTVfsMemorizeIoStreamAsFile(hVfsIos, RTFILE_O_READ, &hVfsFile);
+                if (RT_SUCCESS(vrc))
                 {
-                    rc = RTVfsIoStrmValidateUtf8Encoding(hVfsIos,
-                                                         RTVFS_VALIDATE_UTF8_BY_RTC_3629 | RTVFS_VALIDATE_UTF8_NO_NULL,
-                                                         NULL);
-                    if (RT_SUCCESS(rc))
+                    vrc = RTVfsIoStrmValidateUtf8Encoding(hVfsIos,
+                                                          RTVFS_VALIDATE_UTF8_BY_RTC_3629 | RTVFS_VALIDATE_UTF8_NO_NULL,
+                                                          NULL);
+                    if (RT_SUCCESS(vrc))
                     {
                         /*
                          * Replace *phVfsObj with the memorized file.
                          */
-                        rc = RTVfsFileSeek(hVfsFile, 0, RTFILE_SEEK_BEGIN, NULL);
-                        if (RT_SUCCESS(rc))
+                        vrc = RTVfsFileSeek(hVfsFile, 0, RTFILE_SEEK_BEGIN, NULL);
+                        if (RT_SUCCESS(vrc))
                         {
                             RTVfsObjRelease(*phVfsObj);
@@ -997 +997 @@
                         else
                             vboxExtPackSetError(pszError, cbError,
-                                                ExtPackUtil::tr("RTVfsFileSeek failed on '%s': %Rrc"), pszAdjName, rc);
+                                                ExtPackUtil::tr("RTVfsFileSeek failed on '%s': %Rrc"), pszAdjName, vrc);
                     }
 
-                    if (phVfsFile && RT_SUCCESS(rc))
+                    if (phVfsFile && RT_SUCCESS(vrc))
                         *phVfsFile = hVfsFile;
                     else
@@ -1007 +1007 @@
                 else
                     vboxExtPackSetError(pszError, cbError,
-                                        ExtPackUtil::tr("RTVfsMemorizeIoStreamAsFile failed on '%s': %Rrc"), pszAdjName, rc);
+                                        ExtPackUtil::tr("RTVfsMemorizeIoStreamAsFile failed on '%s': %Rrc"), pszAdjName, vrc);
                 RTVfsIoStrmRelease(hVfsIos);
             }
         }
         else
-            vboxExtPackSetError(pszError, cbError, ExtPackUtil::tr("RTVfsObjQueryInfo failed on '%s': %Rrc"), pszAdjName, rc);
-    }
-    return rc;
+            vboxExtPackSetError(pszError, cbError, ExtPackUtil::tr("RTVfsObjQueryInfo failed on '%s': %Rrc"), pszAdjName, vrc);
+    }
+    return vrc;
 }
 
@@ -1100 +1100 @@
 static int vboxExtPackValidateMemberFile(const char *pszName, RTVFSOBJ hVfsObj, char *pszError, size_t cbError)
 {
-    int rc = vboxExtPackValidateMemberName(pszName, pszError, cbError);
-    if (RT_SUCCESS(rc))
+    int vrc = vboxExtPackValidateMemberName(pszName, pszError, cbError);
+    if (RT_SUCCESS(vrc))
     {
         RTFSOBJINFO ObjInfo;
-        rc = RTVfsObjQueryInfo(hVfsObj, &ObjInfo, RTFSOBJATTRADD_NOTHING);
-        if (RT_SUCCESS(rc))
+        vrc = RTVfsObjQueryInfo(hVfsObj, &ObjInfo, RTFSOBJATTRADD_NOTHING);
+        if (RT_SUCCESS(vrc))
         {
             if (ObjInfo.cbObject >= 9*_1G64)
-                rc = vboxExtPackReturnError(VERR_OUT_OF_RANGE, pszError, cbError,
-                                            ExtPackUtil::tr("'%s': too large (%'RU64 bytes)", "", (size_t)ObjInfo.cbObject),
-                                            pszName, (uint64_t)ObjInfo.cbObject);
+                vrc = vboxExtPackReturnError(VERR_OUT_OF_RANGE, pszError, cbError,
+                                             ExtPackUtil::tr("'%s': too large (%'RU64 bytes)", "", (size_t)ObjInfo.cbObject),
+                                             pszName, (uint64_t)ObjInfo.cbObject);
             if (!RTFS_IS_FILE(ObjInfo.Attr.fMode))
-                rc = vboxExtPackReturnError(VERR_NOT_A_FILE, pszError, cbError,
-                                            ExtPackUtil::tr("The alleged file '%s' has a mode mask stating otherwise (%RTfmode)"),
-                                            pszName, ObjInfo.Attr.fMode);
+                vrc = vboxExtPackReturnError(VERR_NOT_A_FILE, pszError, cbError,
+                                             ExtPackUtil::tr("The alleged file '%s' has a mode mask stating otherwise (%RTfmode)"),
+                                             pszName, ObjInfo.Attr.fMode);
         }
         else
-            vboxExtPackSetError(pszError, cbError, ExtPackUtil::tr("RTVfsObjQueryInfo failed on '%s': %Rrc"), pszName, rc);
-    }
-    return rc;
+            vboxExtPackSetError(pszError, cbError, ExtPackUtil::tr("RTVfsObjQueryInfo failed on '%s': %Rrc"), pszName, vrc);
+    }
+    return vrc;
 }
 
@@ -1134 +1134 @@
 static int vboxExtPackValidateMemberDir(const char *pszName, RTVFSOBJ hVfsObj, char *pszError, size_t cbError)
 {
-    int rc = vboxExtPackValidateMemberName(pszName, pszError, cbError);
-    if (RT_SUCCESS(rc))
+    int vrc = vboxExtPackValidateMemberName(pszName, pszError, cbError);
+    if (RT_SUCCESS(vrc))
     {
         RTFSOBJINFO ObjInfo;
-        rc = RTVfsObjQueryInfo(hVfsObj, &ObjInfo, RTFSOBJATTRADD_NOTHING);
-        if (RT_SUCCESS(rc))
+        vrc = RTVfsObjQueryInfo(hVfsObj, &ObjInfo, RTFSOBJATTRADD_NOTHING);
+        if (RT_SUCCESS(vrc))
         {
             if (!RTFS_IS_DIRECTORY(ObjInfo.Attr.fMode))
-                rc = vboxExtPackReturnError(VERR_NOT_A_DIRECTORY, pszError, cbError,
-                                            ExtPackUtil::tr("The alleged directory '%s' has a mode mask saying differently (%RTfmode)"),
-                                            pszName, ObjInfo.Attr.fMode);
+                vrc = vboxExtPackReturnError(VERR_NOT_A_DIRECTORY, pszError, cbError,
+                                             ExtPackUtil::tr("The alleged directory '%s' has a mode mask saying differently (%RTfmode)"),
+                                             pszName, ObjInfo.Attr.fMode);
         }
         else
-            vboxExtPackSetError(pszError, cbError, ExtPackUtil::tr("RTVfsObjQueryInfo failed on '%s': %Rrc"), pszName, rc);
-    }
-    return rc;
+            vboxExtPackSetError(pszError, cbError, ExtPackUtil::tr("RTVfsObjQueryInfo failed on '%s': %Rrc"), pszName, vrc);
+    }
+    return vrc;
 }
 
@@ -1167 +1167 @@
     *pszError = '\0';
 
-    int rc;
+    int vrc;
     if (   enmType == RTVFSOBJTYPE_FILE
         || enmType == RTVFSOBJTYPE_IO_STREAM)
-        rc = vboxExtPackValidateMemberFile(pszName, hVfsObj, pszError, cbError);
+        vrc = vboxExtPackValidateMemberFile(pszName, hVfsObj, pszError, cbError);
     else if (   enmType == RTVFSOBJTYPE_DIR
              || enmType == RTVFSOBJTYPE_BASE)
-        rc = vboxExtPackValidateMemberDir(pszName, hVfsObj, pszError, cbError);
+        vrc = vboxExtPackValidateMemberDir(pszName, hVfsObj, pszError, cbError);
     else
-        rc = vboxExtPackReturnError(VERR_UNEXPECTED_FS_OBJ_TYPE, pszError, cbError,
-                                    ExtPackUtil::tr("'%s' is not a file or directory (enmType=%d)"), pszName, enmType);
-    return rc;
+        vrc = vboxExtPackReturnError(VERR_UNEXPECTED_FS_OBJ_TYPE, pszError, cbError,
+                                     ExtPackUtil::tr("'%s' is not a file or directory (enmType=%d)"), pszName, enmType);
+    return vrc;
 }
 
@@ -1205 +1205 @@
      * Rewind the file and set up a VFS chain for it.
      */
-    int rc = RTFileSeek(hTarballFile, 0, RTFILE_SEEK_BEGIN, NULL);
-    if (RT_FAILURE(rc))
-        return vboxExtPackReturnError(rc, pszError, cbError,
-                                      ExtPackUtil::tr("Failed seeking to the start of the tarball: %Rrc"), rc);
+    int vrc = RTFileSeek(hTarballFile, 0, RTFILE_SEEK_BEGIN, NULL);
+    if (RT_FAILURE(vrc))
+        return vboxExtPackReturnError(vrc, pszError, cbError,
+                                      ExtPackUtil::tr("Failed seeking to the start of the tarball: %Rrc"), vrc);
 
     RTVFSIOSTREAM hTarballIos;
-    rc = RTVfsIoStrmFromRTFile(hTarballFile, RTFILE_O_READ | RTFILE_O_DENY_WRITE | RTFILE_O_OPEN, true /*fLeaveOpen*/,
-                               &hTarballIos);
-    if (RT_FAILURE(rc))
-        return vboxExtPackReturnError(rc, pszError, cbError, ExtPackUtil::tr("RTVfsIoStrmFromRTFile failed: %Rrc"), rc);
+    vrc = RTVfsIoStrmFromRTFile(hTarballFile, RTFILE_O_READ | RTFILE_O_DENY_WRITE | RTFILE_O_OPEN, true /*fLeaveOpen*/,
+                                &hTarballIos);
+    if (RT_FAILURE(vrc))
+        return vboxExtPackReturnError(vrc, pszError, cbError, ExtPackUtil::tr("RTVfsIoStrmFromRTFile failed: %Rrc"), vrc);
 
     RTMANIFEST hFileManifest = NIL_RTMANIFEST;
-    rc = RTManifestCreate(0 /*fFlags*/, &hFileManifest);
-    if (RT_SUCCESS(rc))
+    vrc = RTManifestCreate(0 /*fFlags*/, &hFileManifest);
+    if (RT_SUCCESS(vrc))
     {
         RTVFSIOSTREAM hPtIos;
-        rc = RTManifestEntryAddPassthruIoStream(hFileManifest, hTarballIos, "extpack", RTMANIFEST_ATTR_SHA256,
-                                                true /*read*/, &hPtIos);
-        if (RT_SUCCESS(rc))
+        vrc = RTManifestEntryAddPassthruIoStream(hFileManifest, hTarballIos, "extpack", RTMANIFEST_ATTR_SHA256,
+                                                 true /*read*/, &hPtIos);
+        if (RT_SUCCESS(vrc))
         {
             RTVFSIOSTREAM hGunzipIos;
-            rc = RTZipGzipDecompressIoStream(hPtIos, 0 /*fFlags*/, &hGunzipIos);
-            if (RT_SUCCESS(rc))
+            vrc = RTZipGzipDecompressIoStream(hPtIos, 0 /*fFlags*/, &hGunzipIos);
+            if (RT_SUCCESS(vrc))
             {
                 RTVFSFSSTREAM hTarFss;
-                rc = RTZipTarFsStreamFromIoStream(hGunzipIos, 0 /*fFlags*/, &hTarFss);
-                if (RT_SUCCESS(rc))
+                vrc = RTZipTarFsStreamFromIoStream(hGunzipIos, 0 /*fFlags*/, &hTarFss);
+                if (RT_SUCCESS(vrc))
                 {
                     RTVfsIoStrmRelease(hPtIos);
@@ -1244 +1244 @@
                 }
 
-                vboxExtPackSetError(pszError, cbError, ExtPackUtil::tr("RTZipTarFsStreamFromIoStream failed: %Rrc"), rc);
+                vboxExtPackSetError(pszError, cbError, ExtPackUtil::tr("RTZipTarFsStreamFromIoStream failed: %Rrc"), vrc);
                 RTVfsIoStrmRelease(hGunzipIos);
             }
             else
-                vboxExtPackSetError(pszError, cbError, ExtPackUtil::tr("RTZipGzipDecompressIoStream failed: %Rrc"), rc);
+                vboxExtPackSetError(pszError, cbError, ExtPackUtil::tr("RTZipGzipDecompressIoStream failed: %Rrc"), vrc);
             RTVfsIoStrmRelease(hPtIos);
         }
         else
-            vboxExtPackSetError(pszError, cbError, ExtPackUtil::tr("RTManifestEntryAddPassthruIoStream failed: %Rrc"), rc);
+            vboxExtPackSetError(pszError, cbError, ExtPackUtil::tr("RTManifestEntryAddPassthruIoStream failed: %Rrc"), vrc);
         RTManifestRelease(hFileManifest);
     }
     else
-        vboxExtPackSetError(pszError, cbError, ExtPackUtil::tr("RTManifestCreate failed: %Rrc"), rc);
+        vboxExtPackSetError(pszError, cbError, ExtPackUtil::tr("RTManifestCreate failed: %Rrc"), vrc);
 
     RTVfsIoStrmRelease(hTarballIos);
-    return rc;
+    return vrc;
 }
 
@@ -1311 +1311 @@
     RTMANIFEST      hFileManifest;
     RTVFSFSSTREAM   hTarFss;
-    int rc = VBoxExtPackOpenTarFss(hTarballFile, pszError, cbError, &hTarFss, &hFileManifest);
-    if (RT_FAILURE(rc))
-        return rc;
+    int vrc = VBoxExtPackOpenTarFss(hTarballFile, pszError, cbError, &hTarFss, &hFileManifest);
+    if (RT_FAILURE(vrc))
+        return vrc;
 
     RTMANIFEST hOurManifest;
-    rc = RTManifestCreate(0 /*fFlags*/, &hOurManifest);
-    if (RT_SUCCESS(rc))
+    vrc = RTManifestCreate(0 /*fFlags*/, &hOurManifest);
+    if (RT_SUCCESS(vrc))
     {
         /*
@@ -1333 +1333 @@
             RTVFSOBJ        hVfsObj;
             RTVFSOBJTYPE    enmType;
-            rc = RTVfsFsStrmNext(hTarFss, &pszName, &enmType, &hVfsObj);
-            if (RT_FAILURE(rc))
+            vrc = RTVfsFsStrmNext(hTarFss, &pszName, &enmType, &hVfsObj);
+            if (RT_FAILURE(vrc))
             {
-                if (rc != VERR_EOF)
-                    vboxExtPackSetError(pszError, cbError, ExtPackUtil::tr("RTVfsFsStrmNext failed: %Rrc"), rc);
+                if (vrc != VERR_EOF)
+                    vboxExtPackSetError(pszError, cbError, ExtPackUtil::tr("RTVfsFsStrmNext failed: %Rrc"), vrc);
                 else
-                    rc = VINF_SUCCESS;
+                    vrc = VINF_SUCCESS;
                 break;
             }
@@ -1351 +1351 @@
              *      failure - cleanup reasons.
              */
-            rc = VBoxExtPackValidateMember(pszName, enmType, hVfsObj, pszError, cbError);
-            if (RT_SUCCESS(rc))
+            vrc = VBoxExtPackValidateMember(pszName, enmType, hVfsObj, pszError, cbError);
+            if (RT_SUCCESS(vrc))
             {
                 PRTVFSFILE phVfsFile = NULL;
@@ -1362 +1362 @@
                     phVfsFile = &hSignatureFile;
                 else if (!strncmp(pszAdjName, VBOX_EXTPACK_LICENSE_NAME_PREFIX, sizeof(VBOX_EXTPACK_LICENSE_NAME_PREFIX) - 1))
-                    rc = VBoxExtPackValidateStandardFile(pszAdjName, enmType, &hVfsObj, NULL, pszError, cbError);
+                    vrc = VBoxExtPackValidateStandardFile(pszAdjName, enmType, &hVfsObj, NULL, pszError, cbError);
                 if (phVfsFile)
-                    rc = VBoxExtPackValidateStandardFile(pszAdjName, enmType, &hVfsObj, phVfsFile, pszError, cbError);
+                    vrc = VBoxExtPackValidateStandardFile(pszAdjName, enmType, &hVfsObj, phVfsFile, pszError, cbError);
             }
 
@@ -1370 +1370 @@
              * Add any I/O stream to the manifest
              */
-            if (   RT_SUCCESS(rc)
+            if (   RT_SUCCESS(vrc)
                 && (   enmType == RTVFSOBJTYPE_FILE
                     || enmType == RTVFSOBJTYPE_IO_STREAM))
             {
                 RTVFSIOSTREAM hVfsIos = RTVfsObjToIoStream(hVfsObj);
-                rc = RTManifestEntryAddIoStream(hOurManifest, hVfsIos, pszAdjName, RTMANIFEST_ATTR_SIZE | RTMANIFEST_ATTR_SHA256);
-                if (RT_FAILURE(rc))
+                vrc = RTManifestEntryAddIoStream(hOurManifest, hVfsIos, pszAdjName, RTMANIFEST_ATTR_SIZE | RTMANIFEST_ATTR_SHA256);
+                if (RT_FAILURE(vrc))
                     vboxExtPackSetError(pszError, cbError,
-                                        ExtPackUtil::tr("RTManifestEntryAddIoStream failed on '%s': %Rrc"), pszAdjName, rc);
+                                        ExtPackUtil::tr("RTManifestEntryAddIoStream failed on '%s': %Rrc"), pszAdjName, vrc);
                 RTVfsIoStrmRelease(hVfsIos);
             }
@@ -1387 +1387 @@
             RTVfsObjRelease(hVfsObj);
             RTStrFree(pszName);
-            if (RT_FAILURE(rc))
+            if (RT_FAILURE(vrc))
                 break;
         }
@@ -1394 +1394 @@
          * Check the integrity of the tarball file.
          */
-        if (RT_SUCCESS(rc))
+        if (RT_SUCCESS(vrc))
         {
             RTVfsFsStrmRelease(hTarFss);
             hTarFss = NIL_RTVFSFSSTREAM;
-            rc = vboxExtPackVerifyFileDigest(hFileManifest, pszTarballDigest, pStrDigest, pszError, cbError);
+            vrc = vboxExtPackVerifyFileDigest(hFileManifest, pszTarballDigest, pStrDigest, pszError, cbError);
         }
 
@@ -1405 +1405 @@
          * mandatory files are present.
          */
-        if (RT_SUCCESS(rc))
+        if (RT_SUCCESS(vrc))
         {
             if (hXmlFile == NIL_RTVFSFILE)
-                rc = vboxExtPackReturnError(VERR_MISSING, pszError, cbError, ExtPackUtil::tr("Mandator file '%s' is missing"),
-                                            VBOX_EXTPACK_DESCRIPTION_NAME);
+                vrc = vboxExtPackReturnError(VERR_MISSING, pszError, cbError, ExtPackUtil::tr("Mandator file '%s' is missing"),
+                                             VBOX_EXTPACK_DESCRIPTION_NAME);
             if (hManifestFile == NIL_RTVFSFILE)
-                rc = vboxExtPackReturnError(VERR_MISSING, pszError, cbError, ExtPackUtil::tr("Mandator file '%s' is missing"),
-                                            VBOX_EXTPACK_MANIFEST_NAME);
+                vrc = vboxExtPackReturnError(VERR_MISSING, pszError, cbError, ExtPackUtil::tr("Mandator file '%s' is missing"),
+                                             VBOX_EXTPACK_MANIFEST_NAME);
             if (hSignatureFile == NIL_RTVFSFILE)
-                rc = vboxExtPackReturnError(VERR_MISSING, pszError, cbError, ExtPackUtil::tr("Mandator file '%s' is missing"),
-                                            VBOX_EXTPACK_SIGNATURE_NAME);
+                vrc = vboxExtPackReturnError(VERR_MISSING, pszError, cbError, ExtPackUtil::tr("Mandator file '%s' is missing"),
+                                             VBOX_EXTPACK_SIGNATURE_NAME);
         }
 
@@ -1421 +1421 @@
          * Check the manifest and it's signature.
          */
-        if (RT_SUCCESS(rc))
-            rc = vboxExtPackVerifyManifestAndSignature(hOurManifest, hManifestFile, hSignatureFile, pszError, cbError);
+        if (RT_SUCCESS(vrc))
+            vrc = vboxExtPackVerifyManifestAndSignature(hOurManifest, hManifestFile, hSignatureFile, pszError, cbError);
 
         /*
          * Check the XML.
          */
-        if (RT_SUCCESS(rc))
-            rc = vboxExtPackVerifyXml(hXmlFile, pszExtPackName, pszError, cbError);
+        if (RT_SUCCESS(vrc))
+            vrc = vboxExtPackVerifyXml(hXmlFile, pszExtPackName, pszError, cbError);
 
         /*
          * Returns objects.
          */
-        if (RT_SUCCESS(rc))
+        if (RT_SUCCESS(vrc))
         {
             if (phValidManifest)
@@ -1456 +1456 @@
     }
     else
-        vboxExtPackSetError(pszError, cbError, "RTManifestCreate failed: %Rrc", rc);
+        vboxExtPackSetError(pszError, cbError, "RTManifestCreate failed: %Rrc", vrc);
     RTVfsFsStrmRelease(hTarFss);
     RTManifestRelease(hFileManifest);
 
-    return rc;
-}
-
+    return vrc;
+}
+

trunk/src/VBox/Main/src-all/HashedPw.cpp

@@ -65 +65 @@
     /* hash */
     uint8_t abHash[RTSHA512_HASH_SIZE];
-    int rc = RTSha512FromString(pszSaltEnd + 1, abHash);
-    return RT_SUCCESS(rc);
+    int vrc = RTSha512FromString(pszSaltEnd + 1, abHash);
+    return RT_SUCCESS(vrc);
 }
 
@@ -96 +96 @@
         uint8_t abHash[RTSHA512_HASH_SIZE];
         RTSha512(a_pstrPassword->c_str(), a_pstrPassword->length(), abHash);
-        int rc = RTSha512ToString(abHash, pszHashedPw, sizeof(szHashedPw) - (size_t)(pszHashedPw - &szHashedPw[0]));
-        AssertReleaseRC(rc);
+        int vrc = RTSha512ToString(abHash, pszHashedPw, sizeof(szHashedPw) - (size_t)(pszHashedPw - &szHashedPw[0]));
+        AssertReleaseRC(vrc);
     }
 

trunk/src/VBox/Main/src-all/NvramStoreImpl.cpp

@@ -523 +523 @@
 {
     AutoCaller autoCaller(this);
-    AssertComRCReturn(autoCaller.rc(), Utf8Str::Empty);
+    AssertReturn(autoCaller.isOk(), Utf8Str::Empty);
 
     Utf8Str strTmp;
@@ -539 +539 @@
 int NvramStore::i_loadStoreFromTar(RTVFSFSSTREAM hVfsFssTar)
 {
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
 
     /*
@@ -551 +551 @@
         char       *pszName;
         RTVFSOBJ    hVfsObj;
-        rc = RTVfsFsStrmNext(hVfsFssTar, &pszName, NULL, &hVfsObj);
-        if (RT_FAILURE(rc))
-        {
-            if (rc == VERR_EOF)
-                rc = VINF_SUCCESS;
+        vrc = RTVfsFsStrmNext(hVfsFssTar, &pszName, NULL, &hVfsObj);
+        if (RT_FAILURE(vrc))
+        {
+            if (vrc == VERR_EOF)
+                vrc = VINF_SUCCESS;
             break;
         }
 
         RTFSOBJINFO UnixInfo;
-        rc = RTVfsObjQueryInfo(hVfsObj, &UnixInfo, RTFSOBJATTRADD_UNIX);
-        if (RT_SUCCESS(rc))
+        vrc = RTVfsObjQueryInfo(hVfsObj, &UnixInfo, RTFSOBJATTRADD_UNIX);
+        if (RT_SUCCESS(vrc))
         {
             switch (UnixInfo.Attr.fMode & RTFS_TYPE_MASK)
@@ -572 +572 @@
 
                     RTVFSFILE hVfsFileEntry;
-                    rc = RTVfsMemorizeIoStreamAsFile(hVfsIosEntry, RTFILE_O_READ | RTFILE_O_WRITE, &hVfsFileEntry);
-                    if (RT_FAILURE(rc))
+                    vrc = RTVfsMemorizeIoStreamAsFile(hVfsIosEntry, RTFILE_O_READ | RTFILE_O_WRITE, &hVfsFileEntry);
+                    if (RT_FAILURE(vrc))
                         break;
                     RTVfsIoStrmRelease(hVfsIosEntry);
@@ -583 +583 @@
                     break;
                 default:
-                    rc = VERR_NOT_SUPPORTED;
+                    vrc = VERR_NOT_SUPPORTED;
                     break;
             }
@@ -594 +594 @@
         RTStrFree(pszName);
 
-        if (RT_FAILURE(rc))
+        if (RT_FAILURE(vrc))
             break;
     }
 
-    return rc;
+    return vrc;
 }
 
@@ -619 +619 @@
                                               PRTVFSIOSTREAM phVfsIos)
 {
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
     PCVBOXCRYPTOIF pCryptoIf = NULL;
     SecretKey *pKey = NULL;
     const char *pszPassword = NULL;
 
-    rc = i_retainCryptoIf(&pCryptoIf);
-    if (RT_SUCCESS(rc))
-    {
-        rc = m->mpKeyStore->retainSecretKey(m->bd->strKeyId, &pKey);
-        if (RT_SUCCESS(rc))
+    vrc = i_retainCryptoIf(&pCryptoIf);
+    if (RT_SUCCESS(vrc))
+    {
+        vrc = m->mpKeyStore->retainSecretKey(m->bd->strKeyId, &pKey);
+        if (RT_SUCCESS(vrc))
         {
             pszPassword = (const char *)pKey->getKeyBuffer();
             if (fEncrypt)
-                rc = pCryptoIf->pfnCryptoIoStrmFromVfsIoStrmEncrypt(hVfsIosInOut, m->bd->strKeyStore.c_str(), pszPassword,
-                                                                    phVfsIos);
+                vrc = pCryptoIf->pfnCryptoIoStrmFromVfsIoStrmEncrypt(hVfsIosInOut, m->bd->strKeyStore.c_str(), pszPassword,
+                                                                     phVfsIos);
             else
-                rc = pCryptoIf->pfnCryptoIoStrmFromVfsIoStrmDecrypt(hVfsIosInOut, m->bd->strKeyStore.c_str(), pszPassword,
-                                                                    phVfsIos);
-            if (RT_SUCCESS(rc))
+                vrc = pCryptoIf->pfnCryptoIoStrmFromVfsIoStrmDecrypt(hVfsIosInOut, m->bd->strKeyStore.c_str(), pszPassword,
+                                                                     phVfsIos);
+            if (RT_SUCCESS(vrc))
             {
                 *ppCryptoIf = pCryptoIf;
@@ -645 +645 @@
             else
                 LogRelMax(10, ("Failed to decrypt the NVRAM store using secret key ID '%s' with %Rrc\n",
-                               m->bd->strKeyId.c_str(), rc));
+                               m->bd->strKeyId.c_str(), vrc));
 
             m->mpKeyStore->releaseSecretKey(m->bd->strKeyId);
@@ -651 +651 @@
         else
             LogRelMax(10, ("Failed to retain the secret key ID '%s' with %Rrc\n",
-                           m->bd->strKeyId.c_str(), rc));
+                           m->bd->strKeyId.c_str(), vrc));
 
         i_releaseCryptoIf(pCryptoIf);
     }
     else
-        LogRelMax(10, ("Failed to retain the cryptographic interface with %Rrc\n", rc));
-
-    return rc;
+        LogRelMax(10, ("Failed to retain the cryptographic interface with %Rrc\n", vrc));
+
+    return vrc;
 }
 
@@ -691 +691 @@
 {
     uint64_t cbStore = 0;
-    int rc = RTFileQuerySizeByPath(pszPath, &cbStore);
-    if (RT_SUCCESS(rc))
+    int vrc = RTFileQuerySizeByPath(pszPath, &cbStore);
+    if (RT_SUCCESS(vrc))
     {
         if (cbStore <= _1M) /* Arbitrary limit to fend off bogus files because the file will be read into memory completely. */
@@ -706 +706 @@
              */
             RTVFSIOSTREAM hVfsIosNvram;
-            rc = RTVfsIoStrmOpenNormal(pszPath, RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_NONE,
-                                       &hVfsIosNvram);
-            if (RT_SUCCESS(rc))
+            vrc = RTVfsIoStrmOpenNormal(pszPath, RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_NONE,
+                                        &hVfsIosNvram);
+            if (RT_SUCCESS(vrc))
             {
                 RTVFSIOSTREAM hVfsIosDecrypted = NIL_RTVFSIOSTREAM;
@@ -718 +718 @@
                 if (   m->bd->strKeyId.isNotEmpty()
                     && m->bd->strKeyStore.isNotEmpty())
-                    rc = i_setupEncryptionOrDecryption(hVfsIosNvram, false /*fEncrypt*/,
-                                                       &pCryptoIf, &pKey, &hVfsIosDecrypted);
-#endif
-                if (RT_SUCCESS(rc))
+                    vrc = i_setupEncryptionOrDecryption(hVfsIosNvram, false /*fEncrypt*/,
+                                                        &pCryptoIf, &pKey, &hVfsIosDecrypted);
+#endif
+                if (RT_SUCCESS(vrc))
                 {
                     /* Read the content. */
                     RTVFSFILE hVfsFileNvram;
-                    rc = RTVfsMemorizeIoStreamAsFile(  hVfsIosDecrypted != NIL_RTVFSIOSTREAM
-                                                     ? hVfsIosDecrypted
-                                                     : hVfsIosNvram,
-                                                     RTFILE_O_READ, &hVfsFileNvram);
-                    if (RT_SUCCESS(rc))
+                    vrc = RTVfsMemorizeIoStreamAsFile(  hVfsIosDecrypted != NIL_RTVFSIOSTREAM
+                                                      ? hVfsIosDecrypted
+                                                      : hVfsIosNvram,
+                                                      RTFILE_O_READ, &hVfsFileNvram);
+                    if (RT_SUCCESS(vrc))
                     {
-                        if (RT_SUCCESS(rc))
+                        if (RT_SUCCESS(vrc))
                         {
                             /* Try to parse it as an EFI variable store. */
                             RTVFS hVfsEfiVarStore;
-                            rc = RTEfiVarStoreOpenAsVfs(hVfsFileNvram, RTVFSMNT_F_READ_ONLY, 0 /*fVarStoreFlags*/, &hVfsEfiVarStore,
-                                                        NULL /*pErrInfo*/);
-                            if (RT_SUCCESS(rc))
+                            vrc = RTEfiVarStoreOpenAsVfs(hVfsFileNvram, RTVFSMNT_F_READ_ONLY, 0 /*fVarStoreFlags*/, &hVfsEfiVarStore,
+                                                         NULL /*pErrInfo*/);
+                            if (RT_SUCCESS(vrc))
                             {
-                                rc = RTVfsFileSeek(hVfsFileNvram, 0 /*offSeek*/, RTFILE_SEEK_BEGIN, NULL /*poffActual*/);
-                                AssertRC(rc);
+                                vrc = RTVfsFileSeek(hVfsFileNvram, 0 /*offSeek*/, RTFILE_SEEK_BEGIN, NULL /*poffActual*/);
+                                AssertRC(vrc);
 
                                 RTVfsFileRetain(hVfsFileNvram); /* Retain a new reference for the map. */
@@ -747 +747 @@
                                 RTVfsRelease(hVfsEfiVarStore);
                             }
-                            else if (rc == VERR_VFS_UNKNOWN_FORMAT)
+                            else if (vrc == VERR_VFS_UNKNOWN_FORMAT)
                             {
                                 /* Check for the new style tar archive. */
-                                rc = RTVfsFileSeek(hVfsFileNvram, 0 /*offSeek*/, RTFILE_SEEK_BEGIN, NULL /*poffActual*/);
-                                AssertRC(rc);
+                                vrc = RTVfsFileSeek(hVfsFileNvram, 0 /*offSeek*/, RTFILE_SEEK_BEGIN, NULL /*poffActual*/);
+                                AssertRC(vrc);
 
                                 RTVFSIOSTREAM hVfsIosTar = RTVfsFileToIoStream(hVfsFileNvram);
@@ -757 +757 @@
 
                                 RTVFSFSSTREAM hVfsFssTar;
-                                rc = RTZipTarFsStreamFromIoStream(hVfsIosTar, 0 /*fFlags*/, &hVfsFssTar);
+                                vrc = RTZipTarFsStreamFromIoStream(hVfsIosTar, 0 /*fFlags*/, &hVfsFssTar);
                                 RTVfsIoStrmRelease(hVfsIosTar);
-                                if (RT_SUCCESS(rc))
+                                if (RT_SUCCESS(vrc))
                                 {
-                                    rc = i_loadStoreFromTar(hVfsFssTar);
+                                    vrc = i_loadStoreFromTar(hVfsFssTar);
                                     RTVfsFsStrmRelease(hVfsFssTar);
                                 }
                                 else
-                                    LogRel(("The given NVRAM file is neither a raw UEFI variable store nor a tar archive (opening failed with %Rrc)\n", rc));
+                                    LogRel(("The given NVRAM file is neither a raw UEFI variable store nor a tar archive (opening failed with %Rrc)\n", vrc));
                             }
                             else
-                                LogRel(("Opening the UEFI variable store '%s' failed with %Rrc\n", pszPath, rc));
+                                LogRel(("Opening the UEFI variable store '%s' failed with %Rrc\n", pszPath, vrc));
 
                             RTVfsFileRelease(hVfsFileNvram);
                         }
                         else
-                            LogRel(("Failed to memorize NVRAM store '%s' with %Rrc\n", pszPath, rc));
+                            LogRel(("Failed to memorize NVRAM store '%s' with %Rrc\n", pszPath, vrc));
                     }
                 }
@@ -785 +785 @@
             }
             else
-                LogRelMax(10, ("NVRAM store '%s' couldn't be opened with %Rrc\n", pszPath, rc));
+                LogRelMax(10, ("NVRAM store '%s' couldn't be opened with %Rrc\n", pszPath, vrc));
         }
         else
@@ -791 +791 @@
                            pszPath, _1M, cbStore));
     }
-    else if (rc == VERR_FILE_NOT_FOUND) /* Valid for the first run where no NVRAM file is there. */
-        rc = VINF_SUCCESS;
-
-    return rc;
+    else if (vrc == VERR_FILE_NOT_FOUND) /* Valid for the first run where no NVRAM file is there. */
+        vrc = VINF_SUCCESS;
+
+    return vrc;
 }
 
@@ -807 +807 @@
     RTVFSIOSTREAM   hVfsIos;
 
-    int rc = RTVfsChainOpenIoStream(pszPath, RTFILE_O_WRITE | RTFILE_O_DENY_WRITE | RTFILE_O_CREATE_REPLACE,
-                                    &hVfsIos, &offError, RTErrInfoInitStatic(&ErrInfo));
-    if (RT_SUCCESS(rc))
+    int vrc = RTVfsChainOpenIoStream(pszPath, RTFILE_O_WRITE | RTFILE_O_DENY_WRITE | RTFILE_O_CREATE_REPLACE,
+                                     &hVfsIos, &offError, RTErrInfoInitStatic(&ErrInfo));
+    if (RT_SUCCESS(vrc))
     {
         RTVFSIOSTREAM hVfsIosEncrypted = NIL_RTVFSIOSTREAM;
@@ -819 +819 @@
         if (   m->bd->strKeyId.isNotEmpty()
             && m->bd->strKeyStore.isNotEmpty())
-            rc = i_setupEncryptionOrDecryption(hVfsIos, true /*fEncrypt*/,
-                                               &pCryptoIf, &pKey, &hVfsIosEncrypted);
-#endif
-
-        if (RT_SUCCESS(rc))
+            vrc = i_setupEncryptionOrDecryption(hVfsIos, true /*fEncrypt*/,
+                                                &pCryptoIf, &pKey, &hVfsIosEncrypted);
+#endif
+
+        if (RT_SUCCESS(vrc))
         {
             RTVFSFSSTREAM hVfsFss;
-            rc = RTZipTarFsStreamToIoStream(  hVfsIosEncrypted != NIL_RTVFSIOSTREAM
-                                            ? hVfsIosEncrypted
-                                            : hVfsIos,
-                                            RTZIPTARFORMAT_GNU, 0 /*fFlags*/, &hVfsFss);
-            if (RT_SUCCESS(rc))
+            vrc = RTZipTarFsStreamToIoStream(  hVfsIosEncrypted != NIL_RTVFSIOSTREAM
+                                             ? hVfsIosEncrypted
+                                             : hVfsIos,
+                                             RTZIPTARFORMAT_GNU, 0 /*fFlags*/, &hVfsFss);
+            if (RT_SUCCESS(vrc))
             {
                 NvramStoreIter it = m->bd->mapNvram.begin();
@@ -838 +838 @@
                     RTVFSFILE hVfsFile = it->second;
 
-                    rc = RTVfsFileSeek(hVfsFile, 0 /*offSeek*/, RTFILE_SEEK_BEGIN, NULL /*poffActual*/);
-                    AssertRC(rc);
+                    vrc = RTVfsFileSeek(hVfsFile, 0 /*offSeek*/, RTFILE_SEEK_BEGIN, NULL /*poffActual*/);
+                    AssertRC(vrc);
 
                     RTVFSOBJ hVfsObj = RTVfsObjFromFile(hVfsFile);
-                    rc = RTVfsFsStrmAdd(hVfsFss, it->first.c_str(), hVfsObj, 0 /*fFlags*/);
+                    vrc = RTVfsFsStrmAdd(hVfsFss, it->first.c_str(), hVfsObj, 0 /*fFlags*/);
                     RTVfsObjRelease(hVfsObj);
-                    if (RT_FAILURE(rc))
+                    if (RT_FAILURE(vrc))
                         break;
 
@@ -862 +862 @@
     }
 
-    return rc;
+    return vrc;
 }
 
@@ -901 +901 @@
 int NvramStore::i_saveStore(void)
 {
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
 
     Utf8Str strTmp;
@@ -924 +924 @@
             RTVFSFILE hVfsFileNvram = m->bd->mapNvram[Utf8Str("efi/nvram")];
 
-            rc = RTVfsFileSeek(hVfsFileNvram, 0 /*offSeek*/, RTFILE_SEEK_BEGIN, NULL /*poffActual*/);
-            AssertRC(rc); RT_NOREF(rc);
+            vrc = RTVfsFileSeek(hVfsFileNvram, 0 /*offSeek*/, RTFILE_SEEK_BEGIN, NULL /*poffActual*/);
+            AssertRC(vrc); RT_NOREF(vrc);
 
             RTVFSIOSTREAM hVfsIosDst;
-            rc = RTVfsIoStrmOpenNormal(strTmp.c_str(), RTFILE_O_CREATE_REPLACE | RTFILE_O_WRITE | RTFILE_O_DENY_NONE,
-                                       &hVfsIosDst);
-            if (RT_SUCCESS(rc))
+            vrc = RTVfsIoStrmOpenNormal(strTmp.c_str(), RTFILE_O_CREATE_REPLACE | RTFILE_O_WRITE | RTFILE_O_DENY_NONE,
+                                        &hVfsIosDst);
+            if (RT_SUCCESS(vrc))
             {
                 RTVFSIOSTREAM hVfsIosSrc = RTVfsFileToIoStream(hVfsFileNvram);
@@ -943 +943 @@
                 if (   m->bd->strKeyId.isNotEmpty()
                     && m->bd->strKeyStore.isNotEmpty())
-                    rc = i_setupEncryptionOrDecryption(hVfsIosDst, true /*fEncrypt*/,
-                                                       &pCryptoIf, &pKey, &hVfsIosEncrypted);
-#endif
-
-                rc = RTVfsUtilPumpIoStreams(hVfsIosSrc,
-                                              hVfsIosEncrypted != NIL_RTVFSIOSTREAM
-                                            ? hVfsIosEncrypted
-                                            : hVfsIosDst
-                                            , 0 /*cbBufHint*/);
+                    vrc = i_setupEncryptionOrDecryption(hVfsIosDst, true /*fEncrypt*/,
+                                                        &pCryptoIf, &pKey, &hVfsIosEncrypted);
+#endif
+
+                vrc = RTVfsUtilPumpIoStreams(hVfsIosSrc,
+                                               hVfsIosEncrypted != NIL_RTVFSIOSTREAM
+                                             ? hVfsIosEncrypted
+                                             : hVfsIosDst
+                                             , 0 /*cbBufHint*/);
 
 #ifdef VBOX_WITH_FULL_VM_ENCRYPTION
@@ -963 +963 @@
         }
         else if (m->bd->mapNvram.size())
-            rc = i_saveStoreAsTar(strTmp.c_str());
+            vrc = i_saveStoreAsTar(strTmp.c_str());
         /* else: No NVRAM content to store so we are done here. */
     }
 
-    return rc;
+    return vrc;
 }
 
@@ -1159 +1159 @@
     /* sanity */
     AutoCaller autoCaller(this);
-    AssertComRCReturnVoid(autoCaller.rc());
+    AssertReturnVoid(autoCaller.isOk());
 
     /* sanity too */
     AutoCaller peerCaller(m->pPeer);
-    AssertComRCReturnVoid(peerCaller.rc());
+    AssertReturnVoid(peerCaller.isOk());
 
     /* lock both for writing since we modify both (mPeer is "master" so locked
@@ -1187 +1187 @@
     /* sanity */
     AutoCaller autoCaller(this);
-    AssertComRCReturnVoid(autoCaller.rc());
+    AssertReturnVoid(autoCaller.isOk());
 
     /* sanity too */
     AutoCaller thatCaller(aThat);
-    AssertComRCReturnVoid(thatCaller.rc());
+    AssertReturnVoid(thatCaller.isOk());
 
     /* peer is not modified, lock it for reading (aThat is "master" so locked
@@ -1285 +1285 @@
         RTVFSFILE hVfsFile = it->second;
 
-        int rc = RTVfsFileSeek(hVfsFile, 0 /*offSeek*/, RTFILE_SEEK_BEGIN, NULL /*poffActual*/);
-        AssertRC(rc); RT_NOREF(rc);
+        int vrc = RTVfsFileSeek(hVfsFile, 0 /*offSeek*/, RTFILE_SEEK_BEGIN, NULL /*poffActual*/);
+        AssertRC(vrc); RT_NOREF(vrc);
 
         return RTVfsFileRead(hVfsFile, pvBuf, cbRead, NULL /*pcbRead*/);
@@ -1303 +1303 @@
     AutoWriteLock wlock(pThis->pNvramStore COMMA_LOCKVAL_SRC_POS);
 
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
     NvramStoreIter it = pThis->pNvramStore->m->bd->mapNvram.find(Utf8StrFmt("%s/%s", pszNamespace, pszPath));
     if (it != pThis->pNvramStore->m->bd->mapNvram.end())
@@ -1309 +1309 @@
         RTVFSFILE hVfsFile = it->second;
 
-        rc = RTVfsFileSeek(hVfsFile, 0 /*offSeek*/, RTFILE_SEEK_BEGIN, NULL /*poffActual*/);
-        AssertRC(rc);
-        rc = RTVfsFileSetSize(hVfsFile, cbWrite, RTVFSFILE_SIZE_F_NORMAL);
-        if (RT_SUCCESS(rc))
-            rc = RTVfsFileWrite(hVfsFile, pvBuf, cbWrite, NULL /*pcbWritten*/);
+        vrc = RTVfsFileSeek(hVfsFile, 0 /*offSeek*/, RTFILE_SEEK_BEGIN, NULL /*poffActual*/);
+        AssertRC(vrc);
+        vrc = RTVfsFileSetSize(hVfsFile, cbWrite, RTVFSFILE_SIZE_F_NORMAL);
+        if (RT_SUCCESS(vrc))
+            vrc = RTVfsFileWrite(hVfsFile, pvBuf, cbWrite, NULL /*pcbWritten*/);
     }
     else
@@ -1319 +1319 @@
         /* Create a new entry. */
         RTVFSFILE hVfsFile = NIL_RTVFSFILE;
-        rc = RTVfsFileFromBuffer(RTFILE_O_READ | RTFILE_O_WRITE, pvBuf, cbWrite, &hVfsFile);
-        if (RT_SUCCESS(rc))
+        vrc = RTVfsFileFromBuffer(RTFILE_O_READ | RTFILE_O_WRITE, pvBuf, cbWrite, &hVfsFile);
+        if (RT_SUCCESS(vrc))
             pThis->pNvramStore->m->bd->mapNvram[Utf8StrFmt("%s/%s", pszNamespace, pszPath)] = hVfsFile;
     }
 
-    return rc;
+    return vrc;
 }
 
@@ -1369 +1369 @@
         uint64_t cbFile;
 
-        int rc = RTVfsFileQuerySize(hVfsFile, &cbFile);
-        AssertRCReturn(rc, rc);
+        int vrc = RTVfsFileQuerySize(hVfsFile, &cbFile);
+        AssertRCReturn(vrc, vrc);
         AssertReturn(cbFile < _1M, VERR_OUT_OF_RANGE);
 
@@ -1380 +1380 @@
         }
 
-        rc = RTVfsFileReadAt(hVfsFile, 0 /*off*/, pvData, cbFile, NULL /*pcbRead*/);
-        AssertRCReturn(rc, rc);
+        vrc = RTVfsFileReadAt(hVfsFile, 0 /*off*/, pvData, cbFile, NULL /*pcbRead*/);
+        AssertRCReturn(vrc, vrc);
 
         pHlp->pfnSSMPutStrZ(pSSM, it->first.c_str());
@@ -1422 +1422 @@
 
         uint32_t cEntries = 0;
-        int rc = pHlp->pfnSSMGetU32(pSSM, &cEntries);
-        AssertRCReturn(rc, rc);
+        int vrc = pHlp->pfnSSMGetU32(pSSM, &cEntries);
+        AssertRCReturn(vrc, vrc);
         AssertReturn(cEntries < 32, VERR_OUT_OF_RANGE);
 
@@ -1433 +1433 @@
             uint64_t cbFile = 0;
 
-            rc = pHlp->pfnSSMGetStrZ(pSSM, &szId[0], sizeof(szId));
-            AssertRCReturn(rc, rc);
-
-            rc = pHlp->pfnSSMGetU64(pSSM, &cbFile);
-            AssertRCReturn(rc, rc);
+            vrc = pHlp->pfnSSMGetStrZ(pSSM, &szId[0], sizeof(szId));
+            AssertRCReturn(vrc, vrc);
+
+            vrc = pHlp->pfnSSMGetU64(pSSM, &cbFile);
+            AssertRCReturn(vrc, vrc);
             AssertReturn(cbFile < _1M, VERR_OUT_OF_RANGE);
 
@@ -1447 +1447 @@
             }
 
-            rc = pHlp->pfnSSMGetMem(pSSM, pvData, cbFile);
-            AssertRCReturn(rc, rc);
+            vrc = pHlp->pfnSSMGetMem(pSSM, pvData, cbFile);
+            AssertRCReturn(vrc, vrc);
 
             RTVFSFILE hVfsFile;
-            rc = RTVfsFileFromBuffer(RTFILE_O_READWRITE, pvData, cbFile, &hVfsFile);
-            AssertRCReturn(rc, rc);
+            vrc = RTVfsFileFromBuffer(RTFILE_O_READWRITE, pvData, cbFile, &hVfsFile);
+            AssertRCReturn(vrc, vrc);
 
             pThis->pNvramStore->m->bd->mapNvram[Utf8Str(szId)] = hVfsFile;
@@ -1462 +1462 @@
         /* The marker. */
         uint32_t u32;
-        rc = pHlp->pfnSSMGetU32(pSSM, &u32);
-        AssertRCReturn(rc, rc);
+        vrc = pHlp->pfnSSMGetU32(pSSM, &u32);
+        AssertRCReturn(vrc, vrc);
         AssertMsgReturn(u32 == UINT32_MAX, ("%#x\n", u32), VERR_SSM_DATA_UNIT_FORMAT_CHANGED);
     }
@@ -1503 +1503 @@
             && !pThis->pNvramStore->m->fSsmSaved)
         {
-            int rc = pThis->pNvramStore->i_saveStore();
-            AssertRC(rc); /** @todo Disk full error? */
+            int vrc = pThis->pNvramStore->i_saveStore();
+            AssertRC(vrc); /** @todo Disk full error? */
         }
     }
@@ -1557 +1557 @@
     if (pDrvIns->iInstance == 0)
     {
-        int rc = PDMDrvHlpSSMRegister(pDrvIns, NVRAM_STORE_SAVED_STATE_VERSION, 0 /*cbGuess*/,
-                                      NvramStore::i_SsmSaveExec, NvramStore::i_SsmLoadExec);
-        if (RT_FAILURE(rc))
-            return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
+        int vrc = PDMDrvHlpSSMRegister(pDrvIns, NVRAM_STORE_SAVED_STATE_VERSION, 0 /*cbGuess*/,
+                                       NvramStore::i_SsmSaveExec, NvramStore::i_SsmLoadExec);
+        if (RT_FAILURE(vrc))
+            return PDMDrvHlpVMSetError(pDrvIns, vrc, RT_SRC_POS,
                                        N_("Failed to register the saved state unit for the NVRAM store"));
     }
@@ -1567 +1567 @@
     if (cRefs == 1)
     {
-        int rc = pThis->pNvramStore->i_loadStore(pThis->pNvramStore->m->bd->strNvramPath.c_str());
-        if (RT_FAILURE(rc))
+        int vrc = pThis->pNvramStore->i_loadStore(pThis->pNvramStore->m->bd->strNvramPath.c_str());
+        if (RT_FAILURE(vrc))
         {
             ASMAtomicDecU32(&pThis->pNvramStore->m->cRefs);
-            return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
+            return PDMDrvHlpVMSetError(pDrvIns, vrc, RT_SRC_POS,
                                        N_("Failed to load the NVRAM store from the file"));
         }

trunk/src/VBox/Main/src-all/QMTranslatorImpl.cpp

@@ -98 +98 @@
         result.reserve(size * 2 + 1);
         char *pszStr = result.mutableRaw();
-        int rc = RTUtf16BigToUtf8Ex((PCRTUTF16)m_iter, size >> 1, &pszStr, result.capacity(), NULL);
-        if (RT_SUCCESS(rc))
+        int vrc = RTUtf16BigToUtf8Ex((PCRTUTF16)m_iter, size >> 1, &pszStr, result.capacity(), NULL);
+        if (RT_SUCCESS(vrc))
             result.jolt();
         else
@@ -625 +625 @@
         uint8_t *data;
         size_t cbSize;
-        int rc;
+        int vrc;
         FileLoader(const char *pszFname)
         {
-            rc = RTFileReadAll(pszFname, (void**) &data, &cbSize);
+            vrc = RTFileReadAll(pszFname, (void**) &data, &cbSize);
         }
 
@@ -636 +636 @@
                 RTFileReadAllFree(data, cbSize);
         }
-        bool isSuccess() { return RT_SUCCESS(rc); }
+        bool isSuccess() { return RT_SUCCESS(vrc); }
     };
 
@@ -647 +647 @@
             m_impl->load(stream, hStrCache);
         }
-        return loader.rc;
+        return loader.vrc;
     }
     catch(std::exception &e)

trunk/src/VBox/Main/src-all/SecretKeyStore.cpp

@@ -31 +31 @@
     m_cbKey            = cbKey;
 
-    int rc = RTMemSaferAllocZEx((void **)&this->m_pbKey, cbKey,
-                                fKeyBufNonPageable ? RTMEMSAFER_F_REQUIRE_NOT_PAGABLE : 0);
-    if (RT_SUCCESS(rc))
+    int vrc = RTMemSaferAllocZEx((void **)&this->m_pbKey, cbKey,
+                                 fKeyBufNonPageable ? RTMEMSAFER_F_REQUIRE_NOT_PAGABLE : 0);
+    if (RT_SUCCESS(vrc))
     {
         memcpy(this->m_pbKey, pbKey, cbKey);
 
         /* Scramble content to make retrieving the key more difficult. */
-        rc = RTMemSaferScramble(this->m_pbKey, cbKey);
+        vrc = RTMemSaferScramble(this->m_pbKey, cbKey);
     }
     else
-        throw rc;
+        throw vrc;
 }
 
@@ -61 +61 @@
     if (cRefs == 1)
     {
-        int rc = RTMemSaferUnscramble(m_pbKey, m_cbKey);
-        AssertRC(rc);
+        int vrc = RTMemSaferUnscramble(m_pbKey, m_cbKey);
+        AssertRC(vrc);
     }
 
@@ -73 +73 @@
     if (!cRefs)
     {
-        int rc = RTMemSaferScramble(m_pbKey, m_cbKey);
-        AssertRC(rc);
+        int vrc = RTMemSaferScramble(m_pbKey, m_cbKey);
+        AssertRC(vrc);
     }
 
@@ -125 +125 @@
 SecretKeyStore::~SecretKeyStore()
 {
-    int rc = deleteAllSecretKeys(false /* fSuspend */, true /* fForce */);
-    AssertRC(rc);
+    int vrc = deleteAllSecretKeys(false /* fSuspend */, true /* fForce */);
+    AssertRC(vrc);
 }
 
@@ -143 +143 @@
         m_mapSecretKeys.insert(std::make_pair(strKeyId, pKey));
     }
-    catch (int rc)
-    {
-        return rc;
+    catch (int vrc)
+    {
+        return vrc;
     }
     catch (std::bad_alloc &)

trunk/src/VBox/Main/src-all/SharedFolderImpl.cpp

@@ -114 +114 @@
     unconst(mMachine) = aMachine;
 
-    HRESULT rc = i_protectedInit(aMachine, aName, aHostPath, aWritable, aAutoMount, aAutoMountPoint, fFailOnError);
+    HRESULT hrc = i_protectedInit(aMachine, aName, aHostPath, aWritable, aAutoMount, aAutoMountPoint, fFailOnError);
 
     /* Confirm a successful initialization when it's the case */
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
         autoInitSpan.setSucceeded();
 
-    return rc;
+    return hrc;
 }
 
@@ -143 +143 @@
     unconst(mMachine) = aMachine;
 
-    HRESULT rc = i_protectedInit(aMachine,
-                                 aThat->m->strName,
-                                 aThat->m->strHostPath,
-                                 aThat->m->fWritable,
-                                 aThat->m->fAutoMount,
-                                 aThat->m->strAutoMountPoint,
-                                 false /* fFailOnError */ );
+    HRESULT hrc = i_protectedInit(aMachine,
+                                  aThat->m->strName,
+                                  aThat->m->strHostPath,
+                                  aThat->m->fWritable,
+                                  aThat->m->fAutoMount,
+                                  aThat->m->strAutoMountPoint,
+                                  false /* fFailOnError */ );
 
     /* Confirm a successful initialization when it's the case */
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
         autoInitSpan.setSucceeded();
 
-    return rc;
+    return hrc;
 }
 
@@ -188 +188 @@
     unconst(mVirtualBox) = aVirtualBox;
 
-    HRESULT rc = protectedInit(aVirtualBox, aName, aHostPath, aWritable, aAutoMount, aAutoMountPoint, fFailOnError);
+    HRESULT hrc = protectedInit(aVirtualBox, aName, aHostPath, aWritable, aAutoMount, aAutoMountPoint, fFailOnError);
 
     /* Confirm a successful initialization when it's the case */
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
         autoInitSpan.setSucceeded();
 
-    return rc;
+    return hrc;
 }
 
@@ -229 +229 @@
     unconst(mConsole) = aConsole;
 
-    HRESULT rc = i_protectedInit(aConsole, aName, aHostPath, aWritable, aAutoMount, aAutoMountPoint, fFailOnError);
+    HRESULT hrc = i_protectedInit(aConsole, aName, aHostPath, aWritable, aAutoMount, aAutoMountPoint, fFailOnError);
 
     /* Confirm a successful initialization when it's the case */
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
         autoInitSpan.setSucceeded();
 
-    return rc;
+    return hrc;
 }
 #endif

trunk/src/VBox/Main/src-all/VirtualBoxBase.cpp

@@ -210 +210 @@
         catch (...)
         {
-            rc = VirtualBox::handleUnexpectedExceptions(this, RT_SRC_POS);
+            hrc = VirtualBox::handleUnexpectedExceptions(this, RT_SRC_POS);
         }
  * @endcode
@@ -339 +339 @@
         aResultCode &= ~0x80000000;
 
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
 
     if (aText == NULL || aText[0] == '\0')
@@ -382 +382 @@
     {
         ComObjPtr<VirtualBoxErrorInfo> info;
-        rc = info.createObject();
-        if (FAILED(rc)) break;
+        hrc = info.createObject();
+        if (FAILED(hrc)) break;
 
 #if !defined(VBOX_WITH_XPCOM)
@@ -392 +392 @@
             /* get the current error info if any */
             ComPtr<IErrorInfo> err;
-            rc = ::GetErrorInfo(0, err.asOutParam());
-            if (FAILED(rc)) break;
-            rc = err.queryInterfaceTo(curInfo.asOutParam());
-            if (FAILED(rc))
+            hrc = ::GetErrorInfo(0, err.asOutParam());
+            if (FAILED(hrc)) break;
+            hrc = err.queryInterfaceTo(curInfo.asOutParam());
+            if (FAILED(hrc))
             {
                 /* create a IVirtualBoxErrorInfo wrapper for the native
                  * IErrorInfo object */
                 ComObjPtr<VirtualBoxErrorInfo> wrapper;
-                rc = wrapper.createObject();
-                if (SUCCEEDED(rc))
+                hrc = wrapper.createObject();
+                if (SUCCEEDED(hrc))
                 {
-                    rc = wrapper->init(err);
-                    if (SUCCEEDED(rc))
+                    hrc = wrapper->init(err);
+                    if (SUCCEEDED(hrc))
                         curInfo = wrapper;
                 }
@@ -410 +410 @@
         }
         /* On failure, curInfo will stay null */
-        Assert(SUCCEEDED(rc) || curInfo.isNull());
+        Assert(SUCCEEDED(hrc) || curInfo.isNull());
 
         /* set the current error info and preserve the previous one if any */
-        rc = info->initEx(aResultCode, aResultDetail, aIID, aComponent, strText, curInfo);
-        if (FAILED(rc)) break;
+        hrc = info->initEx(aResultCode, aResultDetail, aIID, aComponent, strText, curInfo);
+        if (FAILED(hrc)) break;
 
         ComPtr<IErrorInfo> err;
-        rc = info.queryInterfaceTo(err.asOutParam());
-        if (SUCCEEDED(rc))
-            rc = ::SetErrorInfo(0, err);
+        hrc = info.queryInterfaceTo(err.asOutParam());
+        if (SUCCEEDED(hrc))
+            hrc = ::SetErrorInfo(0, err);
 
 #else // !defined(VBOX_WITH_XPCOM)
 
         nsCOMPtr <nsIExceptionService> es;
-        es = do_GetService(NS_EXCEPTIONSERVICE_CONTRACTID, &rc);
-        if (NS_SUCCEEDED(rc))
+        es = do_GetService(NS_EXCEPTIONSERVICE_CONTRACTID, &hrc);
+        if (NS_SUCCEEDED(hrc))
         {
             nsCOMPtr <nsIExceptionManager> em;
-            rc = es->GetCurrentExceptionManager(getter_AddRefs(em));
-            if (FAILED(rc)) break;
+            hrc = es->GetCurrentExceptionManager(getter_AddRefs(em));
+            if (FAILED(hrc)) break;
 
             ComPtr<IVirtualBoxErrorInfo> curInfo;
@@ -436 +436 @@
                 /* get the current error info if any */
                 ComPtr<nsIException> ex;
-                rc = em->GetCurrentException(ex.asOutParam());
-                if (FAILED(rc)) break;
-                rc = ex.queryInterfaceTo(curInfo.asOutParam());
-                if (FAILED(rc))
+                hrc = em->GetCurrentException(ex.asOutParam());
+                if (FAILED(hrc)) break;
+                hrc = ex.queryInterfaceTo(curInfo.asOutParam());
+                if (FAILED(hrc))
                 {
                     /* create a IVirtualBoxErrorInfo wrapper for the native
                      * nsIException object */
                     ComObjPtr<VirtualBoxErrorInfo> wrapper;
-                    rc = wrapper.createObject();
-                    if (SUCCEEDED(rc))
+                    hrc = wrapper.createObject();
+                    if (SUCCEEDED(hrc))
                     {
-                        rc = wrapper->init(ex);
-                        if (SUCCEEDED(rc))
+                        hrc = wrapper->init(ex);
+                        if (SUCCEEDED(hrc))
                             curInfo = wrapper;
                     }
@@ -454 +454 @@
             }
             /* On failure, curInfo will stay null */
-            Assert(SUCCEEDED(rc) || curInfo.isNull());
+            Assert(SUCCEEDED(hrc) || curInfo.isNull());
 
             /* set the current error info and preserve the previous one if any */
-            rc = info->initEx(aResultCode, aResultDetail, aIID, aComponent, Bstr(strText), curInfo);
-            if (FAILED(rc)) break;
+            hrc = info->initEx(aResultCode, aResultDetail, aIID, aComponent, Bstr(strText), curInfo);
+            if (FAILED(hrc)) break;
 
             ComPtr<nsIException> ex;
-            rc = info.queryInterfaceTo(ex.asOutParam());
-            if (SUCCEEDED(rc))
-                rc = em->SetCurrentException(ex);
-        }
-        else if (rc == NS_ERROR_UNEXPECTED)
+            hrc = info.queryInterfaceTo(ex.asOutParam());
+            if (SUCCEEDED(hrc))
+                hrc = em->SetCurrentException(ex);
+        }
+        else if (hrc == NS_ERROR_UNEXPECTED)
         {
             /*
@@ -477 +477 @@
              */
             Log1WarningFunc(("Will not set an exception because nsIExceptionService is not available (NS_ERROR_UNEXPECTED). XPCOM is being shutdown?\n"));
-            rc = NS_OK;
+            hrc = NS_OK;
         }
 
@@ -484 +484 @@
     while (0);
 
-    AssertComRC(rc);
-
-    return SUCCEEDED(rc) ? aResultCode : rc;
+    AssertComRC(hrc);
+
+    return SUCCEEDED(hrc) ? aResultCode : hrc;
 }
 
@@ -521 +521 @@
     va_list args;
     va_start(args, pcsz);
-    HRESULT rc = setErrorInternalV(aResultCode,
-                                   this->getClassIID(),
-                                   this->getComponentName(),
-                                   pcsz, args,
-                                   false /* aWarning */,
-                                   true /* aLogIt */);
+    HRESULT hrc = setErrorInternalV(aResultCode,
+                                    this->getClassIID(),
+                                    this->getComponentName(),
+                                    pcsz, args,
+                                    false /* aWarning */,
+                                    true /* aLogIt */);
     va_end(args);
-    return rc;
+    return hrc;
 }
 
@@ -544 +544 @@
     bool preserve = MultiResult::isMultiEnabled();
 
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
 
     do
     {
         ComObjPtr<VirtualBoxErrorInfo> info;
-        rc = info.createObject();
-        if (FAILED(rc)) break;
+        hrc = info.createObject();
+        if (FAILED(hrc)) break;
 
 #if !defined(VBOX_WITH_XPCOM)
@@ -559 +559 @@
             /* get the current error info if any */
             ComPtr<IErrorInfo> err;
-            rc = ::GetErrorInfo(0, err.asOutParam());
-            if (FAILED(rc)) break;
-            rc = err.queryInterfaceTo(curInfo.asOutParam());
-            if (FAILED(rc))
+            hrc = ::GetErrorInfo(0, err.asOutParam());
+            if (FAILED(hrc)) break;
+            hrc = err.queryInterfaceTo(curInfo.asOutParam());
+            if (FAILED(hrc))
             {
                 /* create a IVirtualBoxErrorInfo wrapper for the native
                  * IErrorInfo object */
                 ComObjPtr<VirtualBoxErrorInfo> wrapper;
-                rc = wrapper.createObject();
-                if (SUCCEEDED(rc))
+                hrc = wrapper.createObject();
+                if (SUCCEEDED(hrc))
                 {
-                    rc = wrapper->init(err);
-                    if (SUCCEEDED(rc))
+                    hrc = wrapper->init(err);
+                    if (SUCCEEDED(hrc))
                         curInfo = wrapper;
                 }
@@ -577 +577 @@
         }
         /* On failure, curInfo will stay null */
-        Assert(SUCCEEDED(rc) || curInfo.isNull());
+        Assert(SUCCEEDED(hrc) || curInfo.isNull());
 
         /* set the current error info and preserve the previous one if any */
-        rc = info->init(ei, curInfo);
-        if (FAILED(rc)) break;
+        hrc = info->init(ei, curInfo);
+        if (FAILED(hrc)) break;
 
         ComPtr<IErrorInfo> err;
-        rc = info.queryInterfaceTo(err.asOutParam());
-        if (SUCCEEDED(rc))
-            rc = ::SetErrorInfo(0, err);
+        hrc = info.queryInterfaceTo(err.asOutParam());
+        if (SUCCEEDED(hrc))
+            hrc = ::SetErrorInfo(0, err);
 
 #else // !defined(VBOX_WITH_XPCOM)
 
         nsCOMPtr <nsIExceptionService> es;
-        es = do_GetService(NS_EXCEPTIONSERVICE_CONTRACTID, &rc);
-        if (NS_SUCCEEDED(rc))
+        es = do_GetService(NS_EXCEPTIONSERVICE_CONTRACTID, &hrc);
+        if (NS_SUCCEEDED(hrc))
         {
             nsCOMPtr <nsIExceptionManager> em;
-            rc = es->GetCurrentExceptionManager(getter_AddRefs(em));
-            if (FAILED(rc)) break;
+            hrc = es->GetCurrentExceptionManager(getter_AddRefs(em));
+            if (FAILED(hrc)) break;
 
             ComPtr<IVirtualBoxErrorInfo> curInfo;
@@ -603 +603 @@
                 /* get the current error info if any */
                 ComPtr<nsIException> ex;
-                rc = em->GetCurrentException(ex.asOutParam());
-                if (FAILED(rc)) break;
-                rc = ex.queryInterfaceTo(curInfo.asOutParam());
-                if (FAILED(rc))
+                hrc = em->GetCurrentException(ex.asOutParam());
+                if (FAILED(hrc)) break;
+                hrc = ex.queryInterfaceTo(curInfo.asOutParam());
+                if (FAILED(hrc))
                 {
                     /* create a IVirtualBoxErrorInfo wrapper for the native
                      * nsIException object */
                     ComObjPtr<VirtualBoxErrorInfo> wrapper;
-                    rc = wrapper.createObject();
-                    if (SUCCEEDED(rc))
+                    hrc = wrapper.createObject();
+                    if (SUCCEEDED(hrc))
                     {
-                        rc = wrapper->init(ex);
-                        if (SUCCEEDED(rc))
+                        hrc = wrapper->init(ex);
+                        if (SUCCEEDED(hrc))
                             curInfo = wrapper;
                     }
@@ -621 +621 @@
             }
             /* On failure, curInfo will stay null */
-            Assert(SUCCEEDED(rc) || curInfo.isNull());
+            Assert(SUCCEEDED(hrc) || curInfo.isNull());
 
             /* set the current error info and preserve the previous one if any */
-            rc = info->init(ei, curInfo);
-            if (FAILED(rc)) break;
+            hrc = info->init(ei, curInfo);
+            if (FAILED(hrc)) break;
 
             ComPtr<nsIException> ex;
-            rc = info.queryInterfaceTo(ex.asOutParam());
-            if (SUCCEEDED(rc))
-                rc = em->SetCurrentException(ex);
-        }
-        else if (rc == NS_ERROR_UNEXPECTED)
+            hrc = info.queryInterfaceTo(ex.asOutParam());
+            if (SUCCEEDED(hrc))
+                hrc = em->SetCurrentException(ex);
+        }
+        else if (hrc == NS_ERROR_UNEXPECTED)
         {
             /*
@@ -644 +644 @@
              */
             Log1WarningFunc(("Will not set an exception because nsIExceptionService is not available (NS_ERROR_UNEXPECTED). XPCOM is being shutdown?\n"));
-            rc = NS_OK;
+            hrc = NS_OK;
         }
 
@@ -651 +651 @@
     while (0);
 
-    AssertComRC(rc);
-
-    return SUCCEEDED(rc) ? ei.getResultCode() : rc;
+    AssertComRC(hrc);
+
+    return SUCCEEDED(hrc) ? ei.getResultCode() : hrc;
 }
 
@@ -780 +780 @@
     va_list args;
     va_start(args, pcsz);
-    HRESULT rc = setErrorInternalV(aResultCode,
-                                   this->getClassIID(),
-                                   this->getComponentName(),
-                                   pcsz, args,
-                                   true /* aWarning */,
-                                   true /* aLogIt */);
+    HRESULT hrc = setErrorInternalV(aResultCode,
+                                    this->getClassIID(),
+                                    this->getComponentName(),
+                                    pcsz, args,
+                                    true /* aWarning */,
+                                    true /* aLogIt */);
     va_end(args);
-    return rc;
+    return hrc;
 }
 
@@ -800 +800 @@
     va_list args;
     va_start(args, pcsz);
-    HRESULT rc = setErrorInternalV(aResultCode,
-                                   this->getClassIID(),
-                                   this->getComponentName(),
-                                   pcsz, args,
-                                   false /* aWarning */,
-                                   false /* aLogIt */);
+    HRESULT hrc = setErrorInternalV(aResultCode,
+                                    this->getClassIID(),
+                                    this->getComponentName(),
+                                    pcsz, args,
+                                    false /* aWarning */,
+                                    false /* aLogIt */);
     va_end(args);
-    return rc;
+    return hrc;
 }
 
@@ -819 +819 @@
     ::SetErrorInfo(0, NULL);
 #else
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
     nsCOMPtr <nsIExceptionService> es;
-    es = do_GetService(NS_EXCEPTIONSERVICE_CONTRACTID, &rc);
-    if (NS_SUCCEEDED(rc))
+    es = do_GetService(NS_EXCEPTIONSERVICE_CONTRACTID, &hrc);
+    if (NS_SUCCEEDED(hrc))
     {
         nsCOMPtr <nsIExceptionManager> em;
-        rc = es->GetCurrentExceptionManager(getter_AddRefs(em));
-        if (SUCCEEDED(rc))
+        hrc = es->GetCurrentExceptionManager(getter_AddRefs(em));
+        if (SUCCEEDED(hrc))
             em->SetCurrentException(NULL);
     }

trunk/src/VBox/Main/src-all/VirtualBoxErrorInfoImpl.cpp

@@ -47 +47 @@
                                     IVirtualBoxErrorInfo *aNext)
 {
-    HRESULT hr = init(aResultCode, aIID, pcszComponent, strText, aNext);
+    HRESULT hrc = init(aResultCode, aIID, pcszComponent, strText, aNext);
     m_resultDetail = aResultDetail;
 
-    return hr;
+    return hrc;
 }
 
@@ -67 +67 @@
     {
         ComObjPtr<VirtualBoxErrorInfo> nextEI;
-        HRESULT rc = nextEI.createObject();
-        if (FAILED(rc)) return rc;
-        rc = nextEI->init(*pInfo, aNext);
-        if (FAILED(rc)) return rc;
+        HRESULT hrc = nextEI.createObject();
+        if (FAILED(hrc)) return hrc;
+        hrc = nextEI->init(*pInfo, aNext);
+        if (FAILED(hrc)) return hrc;
         mNext = nextEI;
     }
@@ -140 +140 @@
     AssertReturn(aInfo, E_FAIL);
 
-    HRESULT rc = S_OK;
-
     /* We don't return a failure if talking to IErrorInfo fails below to
      * protect ourselves from bad IErrorInfo implementations (the
@@ -148 +146 @@
     m_resultCode = S_OK;
     m_resultDetail = 0;
-    rc = aInfo->GetGUID(m_IID.asOutParam());
-    AssertComRC(rc);
+    HRESULT hrc = aInfo->GetGUID(m_IID.asOutParam());
+    AssertComRC(hrc);
     Bstr bstrComponent;
-    rc = aInfo->GetSource(bstrComponent.asOutParam());
-    AssertComRC(rc);
+    hrc = aInfo->GetSource(bstrComponent.asOutParam());
+    AssertComRC(hrc);
     m_strComponent = bstrComponent;
     Bstr bstrText;
-    rc = aInfo->GetDescription(bstrText.asOutParam());
-    AssertComRC(rc);
+    hrc = aInfo->GetDescription(bstrText.asOutParam());
+    AssertComRC(hrc);
     m_strText = bstrText;
 
@@ -173 +171 @@
 {
     Bstr iid;
-    HRESULT rc = COMGETTER(InterfaceID)(iid.asOutParam());
-    if (SUCCEEDED(rc))
+    HRESULT hrc = COMGETTER(InterfaceID)(iid.asOutParam());
+    if (SUCCEEDED(hrc))
         *guid = Guid(iid).ref();
-    return rc;
+    return hrc;
 }
 
@@ -206 +204 @@
     AssertReturn(aInfo, E_FAIL);
 
-    HRESULT rc = S_OK;
-
     /* We don't return a failure if talking to nsIException fails below to
      * protect ourselves from bad nsIException implementations (the
      * corresponding fields will simply remain null in this case). */
 
-    rc = aInfo->GetResult(&m_resultCode);
-    AssertComRC(rc);
+    HRESULT hrc = aInfo->GetResult(&m_resultCode);
+    AssertComRC(hrc);
     m_resultDetail = 0; /* Not being used. */
 
     char *pszMsg;             /* No Utf8Str.asOutParam, different allocator! */
-    rc = aInfo->GetMessage(&pszMsg);
-    AssertComRC(rc);
-    if (NS_SUCCEEDED(rc))
+    hrc = aInfo->GetMessage(&pszMsg);
+    AssertComRC(hrc);
+    if (NS_SUCCEEDED(hrc))
     {
         m_strText = pszMsg;
@@ -248 +244 @@
 
     PRInt32 lrc;
-    nsresult rc = COMGETTER(ResultCode)(&lrc);
-    if (SUCCEEDED(rc))
+    nsresult hrc = COMGETTER(ResultCode)(&lrc);
+    if (SUCCEEDED(hrc))
       *aResult = (nsresult)lrc;
-    return rc;
+    return hrc;
 }
 

trunk/src/VBox/Main/src-all/VirtualBoxTranslator.cpp

@@ -145 +145 @@
     g_idxTlsTr  = RTTlsAlloc();
     g_idxTlsSrc = RTTlsAlloc();
-    int rc = RTStrCacheCreate(&m_hStrCache, "API Translation");
-    m_rcCache = rc;
-    if (RT_FAILURE(rc))
+    int vrc = RTStrCacheCreate(&m_hStrCache, "API Translation");
+    m_rcCache = vrc;
+    if (RT_FAILURE(vrc))
         m_hStrCache = NIL_RTSTRCACHE; /* (loadLanguage will fail) */
     LogFlowFunc(("m_rcCache=%Rrc g_idxTlsTr=%#x g_idxTlsSrc=%#x\n", m_rcCache, g_idxTlsTr, g_idxTlsSrc));
@@ -195 +195 @@
 VirtualBoxTranslator *VirtualBoxTranslator::instance()
 {
-    int rc = RTOnce(&g_Once, initLock, NULL);
-    if (RT_SUCCESS(rc))
+    int vrc = RTOnce(&g_Once, initLock, NULL);
+    if (RT_SUCCESS(vrc))
     {
         RTCritSectRwEnterShared(&s_instanceRwLock);
@@ -225 +225 @@
 VirtualBoxTranslator *VirtualBoxTranslator::tryInstance() RT_NOEXCEPT
 {
-    int rc = RTOnce(&g_Once, initLock, NULL);
-    if (RT_SUCCESS(rc))
+    int vrc = RTOnce(&g_Once, initLock, NULL);
+    if (RT_SUCCESS(vrc))
     {
         RTCritSectRwEnterShared(&s_instanceRwLock);
@@ -304 +304 @@
 {
     LogFlowFunc(("pszLang=%s\n", pszLang));
-    int  rc = VINF_SUCCESS;
+    int  vrc = VINF_SUCCESS;
     char szLocale[256];
     if (pszLang == NULL || *pszLang == '\0')
     {
-        rc = vboxGetDefaultUserLanguage(szLocale, sizeof(szLocale));
-        if (RT_SUCCESS(rc))
+        vrc = vboxGetDefaultUserLanguage(szLocale, sizeof(szLocale));
+        if (RT_SUCCESS(vrc))
             pszLang = szLocale;
     }
@@ -319 +319 @@
             && !(cbLang == 2 && RT_C_IS_LOWER(pszLang[0]) && RT_C_IS_LOWER(pszLang[1]))
             && !(cbLang == 5 && RTLOCALE_IS_LANGUAGE2_UNDERSCORE_COUNTRY2(pszLang)))
-            rc = VERR_INVALID_PARAMETER;
-    }
-    if (RT_SUCCESS(rc))
+            vrc = VERR_INVALID_PARAMETER;
+    }
+    if (RT_SUCCESS(vrc))
     {
         AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -335 +335 @@
         }
     }
-    return rc;
+    return vrc;
 }
 
@@ -344 +344 @@
     LogFlow(("aComponent=%s aLang=%s\n", aComponent->strPath.c_str(), aLang));
 
-    int rc;
+    int vrc;
     if (strcmp(aLang, "C") != 0)
     {
@@ -354 +354 @@
                                        aComponent->strPath.c_str(), aLang);
         if (cchOkay > 0)
-            rc = i_setLanguageFile(aComponent, szNlsPath);
+            vrc = i_setLanguageFile(aComponent, szNlsPath);
         else
-            rc = VERR_FILENAME_TOO_LONG;
-        if (RT_FAILURE(rc))
+            vrc = VERR_FILENAME_TOO_LONG;
+        if (RT_FAILURE(vrc))
         {
             /* No luck, drop the country part, i.e. 'VirtualBoxAPI_de.qm' or 'VirtualBoxAPI_en.qm': */
@@ -366 +366 @@
                                        aComponent->strPath.c_str(), pszDash - aLang, aLang);
                 if (cchOkay > 0)
-                    rc = i_setLanguageFile(aComponent, szNlsPath);
+                    vrc = i_setLanguageFile(aComponent, szNlsPath);
             }
         }
@@ -375 +375 @@
         delete aComponent->pTranslator;
         aComponent->pTranslator = NULL;
-        rc = VINF_SUCCESS;
-    }
-    return rc;
+        vrc = VINF_SUCCESS;
+    }
+    return vrc;
 }
 
@@ -385 +385 @@
     AssertReturn(aComponent, VERR_INVALID_PARAMETER);
 
-    int rc = m_rcCache;
+    int vrc = m_rcCache;
     if (m_hStrCache != NIL_RTSTRCACHE)
     {
@@ -393 +393 @@
         if (pNewTranslator)
         {
-            rc = pNewTranslator->load(aFileName, m_hStrCache);
-            if (RT_SUCCESS(rc))
+            vrc = pNewTranslator->load(aFileName, m_hStrCache);
+            if (RT_SUCCESS(vrc))
             {
                 if (aComponent->pTranslator)
@@ -404 +404 @@
         }
         else
-            rc = VERR_NO_MEMORY;
+            vrc = VERR_NO_MEMORY;
     }
     else
-        Assert(RT_FAILURE_NP(rc));
-    return rc;
+        Assert(RT_FAILURE_NP(vrc));
+    return vrc;
 }
 
@@ -417 +417 @@
 {
     VirtualBoxTranslator *pCurrInstance = VirtualBoxTranslator::tryInstance();
-    int rc = VERR_GENERAL_FAILURE;
+    int vrc = VERR_GENERAL_FAILURE;
     if (pCurrInstance != NULL)
     {
-        rc = pCurrInstance->i_registerTranslation(aTranslationPath, aDefault, aComponent);
+        vrc = pCurrInstance->i_registerTranslation(aTranslationPath, aDefault, aComponent);
         pCurrInstance->release();
     }
-    return rc;
+    return vrc;
 }
 
@@ -470 +470 @@
 int VirtualBoxTranslator::unregisterTranslation(PTRCOMPONENT aComponent)
 {
-    int rc;
+    int vrc;
     if (aComponent != NULL)
     {
@@ -476 +476 @@
         if (pCurrInstance != NULL)
         {
-            rc = pCurrInstance->i_unregisterTranslation(aComponent);
+            vrc = pCurrInstance->i_unregisterTranslation(aComponent);
             pCurrInstance->release();
         }
         else
-            rc = VERR_GENERAL_FAILURE;
+            vrc = VERR_GENERAL_FAILURE;
     }
     else
-        rc = VWRN_NOT_FOUND;
-    return rc;
+        vrc = VWRN_NOT_FOUND;
+    return vrc;
 }