Changeset 98278 in vbox for trunk/src/VBox/Main

Timestamp:

Jan 24, 2023 11:55:00 AM (2 years ago)

Author:

vboxsync

Message:

Main/src-client: Some more rc -> hrc/vrc stuff found by grep. A build fix. bugref:10223

Location:

trunk/src/VBox/Main

Files:

• include/GuestFileImpl.h (modified) (1 diff)
• include/HGCMThread.h (modified) (1 diff)
• include/Recording.h (modified) (1 diff)
• src-client/AudioDriver.cpp (modified) (1 diff)
• src-client/ConsoleImplTeleporter.cpp (modified) (1 diff)
• src-client/ConsoleVRDPServer.cpp (modified) (4 diffs)
• src-client/DisplayImpl.cpp (modified) (1 diff)
• src-client/EmulatedUSBImpl.cpp (modified) (1 diff)
• src-client/GuestCtrlImpl.cpp (modified) (3 diffs)
• src-client/GuestCtrlPrivate.cpp (modified) (1 diff)
• src-client/GuestDnDTargetImpl.cpp (modified) (3 diffs)
• src-client/GuestFileImpl.cpp (modified) (12 diffs)
• src-client/HGCM.cpp (modified) (18 diffs)
• src-client/HGCMThread.cpp (modified) (6 diffs)
• src-client/MachineDebuggerImpl.cpp (modified) (2 diffs)
• src-client/Recording.cpp (modified) (4 diffs)
• src-client/RecordingCodec.cpp (modified) (1 diff)
• src-client/RecordingStream.cpp (modified) (3 diffs)
• src-client/RemoteUSBBackend.cpp (modified) (1 diff)

trunk/src/VBox/Main/include/GuestFileImpl.h

@@ -79 +79 @@
                                  void* pvData, size_t cbData, size_t* pcbRead);
     int             i_seekAt(int64_t iOffset, GUEST_FILE_SEEKTYPE eSeekType, uint32_t uTimeoutMS, uint64_t *puOffset);
-    int             i_setFileStatus(FileStatus_T fileStatus, int fileRc);
+    int             i_setFileStatus(FileStatus_T fileStatus, int vrcFile);
     int             i_waitForOffsetChange(GuestWaitEvent *pEvent, uint32_t uTimeoutMS, uint64_t *puOffset);
     int             i_waitForRead(GuestWaitEvent *pEvent, uint32_t uTimeoutMS, void *pvData, size_t cbData, uint32_t *pcbRead);

trunk/src/VBox/Main/include/HGCMThread.h

@@ -98 +98 @@
 
         /** Result code for a Send */
-        int32_t m_rcSend;
+        int32_t m_vrcSend;
 
     protected:

trunk/src/VBox/Main/include/Recording.h

@@ -80 +80 @@
     bool IsLimitReached(void);
     bool IsLimitReached(uint32_t uScreen, uint64_t msTimestamp);
-    bool NeedsUpdate( uint32_t uScreen, uint64_t msTimestamp);
+    bool NeedsUpdate(uint32_t uScreen, uint64_t msTimestamp);
 
-    DECLCALLBACK(int) OnLimitReached(uint32_t uScreen, int rc);
+    DECLCALLBACK(int) OnLimitReached(uint32_t uScreen, int vrc);
 
 protected:

trunk/src/VBox/Main/src-client/AudioDriver.cpp

@@ -165 +165 @@
     }
     else
-        LogRel(("%s: Failed to attach audio driver, rc=%Rrc\n", pCfg->strName.c_str(), vrc));
+        LogRel(("%s: Failed to attach audio driver, vrc=%Rrc\n", pCfg->strName.c_str(), vrc));
 
     LogFunc(("Returning %Rrc\n", vrc));

trunk/src/VBox/Main/src-client/ConsoleImplTeleporter.cpp

@@ -1176 +1176 @@
                     {
                         hrc = setErrorBoth(E_FAIL, vrc, tr("Unexpected RTTcpServerListen status code %Rrc"), vrc);
-                        LogRel(("Teleporter: Unexpected RTTcpServerListen rc: %Rrc\n", vrc));
+                        LogRel(("Teleporter: Unexpected RTTcpServerListen vrc: %Rrc\n", vrc));
                     }
                 }

trunk/src/VBox/Main/src-client/ConsoleVRDPServer.cpp

@@ -1773 +1773 @@
             {
                 if (vrc != VERR_NET_ADDRESS_IN_USE)
-                    LogRel(("VRDE: Could not start the server rc = %Rrc\n", vrc));
+                    LogRel(("VRDE: Could not start the server vrc = %Rrc\n", vrc));
                 /* Don't unload the lib, because it prevents us trying again or
                    because there may be other users? */
@@ -1902 +1902 @@
         else
         {
-            int vrc = p->fFallback?
-                         VERR_NOT_SUPPORTED: /* Try to go out of fallback mode. */
-                         p->pThis->m_interfaceImage.VRDEImageGeometrySet(p->hImageBitmap, &rect);
-            if (RT_SUCCESS(rc))
+            int vrc = p->fFallback
+                    ? VERR_NOT_SUPPORTED /* Try to go out of fallback mode. */
+                    : p->pThis->m_interfaceImage.VRDEImageGeometrySet(p->hImageBitmap, &rect);
+            if (RT_SUCCESS(vrc))
             {
                 p->x = x;
@@ -1945 +1945 @@
                                                                    0,
                                                                    &fu32CompletionFlags);
-        if (RT_FAILURE(rc))
+        if (RT_FAILURE(vrc))
         {
             /* No support for a 3D + WINDOW. Try bitmap updates. */
@@ -1963 +1963 @@
         }
 
-        H3DORLOG(("H3DORGeometry: Image handle create %Rrc, flags 0x%RX32\n", rc, fu32CompletionFlags));
+        H3DORLOG(("H3DORGeometry: Image handle create %Rrc, flags 0x%RX32\n", vrc, fu32CompletionFlags));
 
         if (RT_SUCCESS(vrc))

trunk/src/VBox/Main/src-client/DisplayImpl.cpp

@@ -292 +292 @@
     }
 
-    /* Regardless of rc, save what is available:
+    /* Regardless of vrc, save what is available:
      * Data format:
      *    uint32_t cBlocks;

trunk/src/VBox/Main/src-client/EmulatedUSBImpl.cpp

@@ -571 +571 @@
     RTMemFree(pvData);
 
-    LogRelFlowFunc(("rc %Rrc\n", vrc));
+    LogRelFlowFunc(("vrc %Rrc\n", vrc));
     return vrc;
 }

trunk/src/VBox/Main/src-client/GuestCtrlImpl.cpp

@@ -443 +443 @@
         vrc = pSession->i_startSessionAsync();
 
-    HRESULT hr = S_OK;
-
+    HRESULT hrc = S_OK;
     if (RT_FAILURE(vrc))
     {
@@ -450 +449 @@
         {
             case VERR_MAX_PROCS_REACHED:
-                hr = setErrorBoth(VBOX_E_MAXIMUM_REACHED, vrc, tr("Maximum number of concurrent guest sessions (%d) reached"),
-                                  VBOX_GUESTCTRL_MAX_SESSIONS);
+                hrc = setErrorBoth(VBOX_E_MAXIMUM_REACHED, vrc, tr("Maximum number of concurrent guest sessions (%d) reached"),
+                                   VBOX_GUESTCTRL_MAX_SESSIONS);
                 break;
 
@@ -457 +456 @@
 
             default:
-                hr = setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Could not create guest session: %Rrc"), vrc);
+                hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Could not create guest session: %Rrc"), vrc);
                 break;
         }
     }
 
-    LogFlowThisFunc(("Returning rc=%Rhrc\n", hr));
-    return hr;
+    LogFlowThisFunc(("Returning hrc=%Rhrc\n", hrc));
+    return hrc;
 #endif /* VBOX_WITH_GUEST_CONTROL */
 }

trunk/src/VBox/Main/src-client/GuestCtrlPrivate.cpp

@@ -899 +899 @@
         vrc = VERR_NO_MEMORY;
     }
-    catch (int vrc)
-    {
-        vrc = vrc;
+    catch (int vrcCatch)
+    {
+        vrc = vrcCatch;
     }
 

trunk/src/VBox/Main/src-client/GuestDnDTargetImpl.cpp

@@ -107 +107 @@
             return;
 
-        /* ignore rc */ pThis->i_sendData(mpCtx, RT_INDEFINITE_WAIT /* msTimeout */);
+        pThis->i_sendData(mpCtx, RT_INDEFINITE_WAIT /* msTimeout */); /* ignore return code */
     }
 
@@ -1119 +1119 @@
                                     DNDTRANSFEROBJECT_FLAGS_NONE);
         if (RT_FAILURE(vrc))
-            LogRel(("DnD: Opening host file '%s' failed, rc=%Rrc\n", pcszSrcPath, vrc));
+            LogRel(("DnD: Opening host file '%s' failed, vrc=%Rrc\n", pcszSrcPath, vrc));
     }
 
@@ -1177 +1177 @@
 
     if (RT_FAILURE(vrc))
-        LogRel(("DnD: Sending host file '%s' to guest failed, rc=%Rrc\n", pcszSrcPath, vrc));
+        LogRel(("DnD: Sending host file '%s' to guest failed, vrc=%Rrc\n", pcszSrcPath, vrc));
 
     LogFlowFuncLeaveRC(vrc);

trunk/src/VBox/Main/src-client/GuestFileImpl.cpp

@@ -499 +499 @@
         AssertRC(vrc2);
 
-        /* Ignore rc, as the event to signal might not be there (anymore). */
+        /* Ignore return code, as the event to signal might not be there (anymore). */
         signalWaitEventInternal(pCbCtx, vrcGuest, NULL /* pPayload */);
         return VINF_SUCCESS; /* Report to the guest. */
@@ -699 +699 @@
             GuestWaitEventPayload payload(dataCb.uType, &dataCb, sizeof(dataCb));
 
-            /* Ignore rc, as the event to signal might not be there (anymore). */
+            /* Ignore return code, as the event to signal might not be there (anymore). */
             signalWaitEventInternal(pCbCtx, vrcGuest, &payload);
         }
         else /* OOM situation, wrong HGCM parameters or smth. not expected. */
         {
-            /* Ignore rc, as the event to signal might not be there (anymore). */
+            /* Ignore return code, as the event to signal might not be there (anymore). */
             signalWaitEventInternalEx(pCbCtx, vrc, 0 /* guestRc */, NULL /* pPayload */);
         }
@@ -711 +711 @@
     {
         /* Also try to signal the waiter, to let it know of the OOM situation.
-         * Ignore rc, as the event to signal might not be there (anymore). */
+         * Ignore return code, as the event to signal might not be there (anymore). */
         signalWaitEventInternalEx(pCbCtx, vrcEx, 0 /* guestRc */, NULL /* pPayload */);
         vrc = vrcEx;
     }
 
-    LogFlowThisFunc(("uType=%RU32, rcGuest=%Rrc, rc=%Rrc\n", dataCb.uType, vrcGuest, vrc));
+    LogFlowThisFunc(("uType=%RU32, rcGuest=%Rrc, vrc=%Rrc\n", dataCb.uType, vrcGuest, vrc));
     return vrc;
 }
@@ -966 +966 @@
                 *pcbRead = cbRead;
         }
-        else if (pEvent->HasGuestError()) /* Return guest rc if available. */
-        {
+        else if (pEvent->HasGuestError()) /* Return guest vrc if available. */
             vrc = pEvent->GetGuestError();
-        }
     }
 
@@ -1040 +1038 @@
                 *pcbRead = cbRead;
         }
-        else if (pEvent->HasGuestError()) /* Return guest rc if available. */
-        {
+        else if (pEvent->HasGuestError()) /* Return guest vrc if available. */
             vrc = pEvent->GetGuestError();
-        }
     }
 
@@ -1112 +1108 @@
                 *puOffset = uOffset;
         }
-        else if (pEvent->HasGuestError()) /* Return guest rc if available. */
-        {
+        else if (pEvent->HasGuestError()) /* Return guest vrc if available. */
             vrc = pEvent->GetGuestError();
-        }
     }
 
@@ -1129 +1123 @@
  * @returns VBox status code.
  * @param   fileStatus          New file status to set.
- * @param   fileRc              New result code to set.
+ * @param   vrcFile             New result code to set.
  *
  * @note    Takes the write lock.
  */
-int GuestFile::i_setFileStatus(FileStatus_T fileStatus, int fileRc)
+int GuestFile::i_setFileStatus(FileStatus_T fileStatus, int vrcFile)
 {
     LogFlowThisFuncEnter();
@@ -1139 +1133 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    LogFlowThisFunc(("oldStatus=%RU32, newStatus=%RU32, fileRc=%Rrc\n",
-                     mData.mStatus, fileStatus, fileRc));
+    LogFlowThisFunc(("oldStatus=%RU32, newStatus=%RU32, vrcFile=%Rrc\n", mData.mStatus, fileStatus, vrcFile));
 
 #ifdef VBOX_STRICT
     if (fileStatus == FileStatus_Error)
-    {
-        AssertMsg(RT_FAILURE(fileRc), ("Guest rc must be an error (%Rrc)\n", fileRc));
-    }
+        AssertMsg(RT_FAILURE(vrcFile), ("Guest vrc must be an error (%Rrc)\n", vrcFile));
     else
-        AssertMsg(RT_SUCCESS(fileRc), ("Guest rc must not be an error (%Rrc)\n", fileRc));
+        AssertMsg(RT_SUCCESS(vrcFile), ("Guest vrc must not be an error (%Rrc)\n", vrcFile));
 #endif
 
@@ -1154 +1145 @@
     {
         mData.mStatus    = fileStatus;
-        mData.mLastError = fileRc;
+        mData.mLastError = vrcFile;
 
         ComObjPtr<VirtualBoxErrorInfo> errorInfo;
-        HRESULT hr = errorInfo.createObject();
-        ComAssertComRC(hr);
-        if (RT_FAILURE(fileRc))
-        {
-            hr = errorInfo->initEx(VBOX_E_IPRT_ERROR, fileRc,
-                                   COM_IIDOF(IGuestFile), getComponentName(),
-                                   i_guestErrorToString(fileRc, mData.mOpenInfo.mFilename.c_str()));
-            ComAssertComRC(hr);
+        HRESULT hrc = errorInfo.createObject();
+        ComAssertComRC(hrc);
+        /** @todo r=bird: this aint making any sense, creating the object and using it
+         *        w/o checking the status code, but discarding it unused based on
+         *        an function input. */
+        if (RT_FAILURE(vrcFile))
+        {
+            hrc = errorInfo->initEx(VBOX_E_IPRT_ERROR, vrcFile,
+                                    COM_IIDOF(IGuestFile), getComponentName(),
+                                    i_guestErrorToString(vrcFile, mData.mOpenInfo.mFilename.c_str()));
+            ComAssertComRC(hrc);
         }
 
@@ -1440 +1434 @@
                 *pcbWritten = cbWritten;
         }
-        else if (pEvent->HasGuestError()) /* Return guest rc if available. */
-        {
+        else if (pEvent->HasGuestError()) /* Return guest vrc if available. */
             vrc = pEvent->GetGuestError();
-        }
     }
 
@@ -1517 +1509 @@
                 *pcbWritten = cbWritten;
         }
-        else if (pEvent->HasGuestError()) /* Return guest rc if available. */
-        {
+        else if (pEvent->HasGuestError()) /* Return guest vrc if available. */
             vrc = pEvent->GetGuestError();
-        }
     }
 
@@ -1834 +1824 @@
                     vrc = VWRN_GSTCTL_OBJECTSTATE_CHANGED;
             }
-            if (RT_FAILURE(vrc) && pWaitEvent->HasGuestError()) /* Return guest rc if available. */
+            if (RT_FAILURE(vrc) && pWaitEvent->HasGuestError()) /* Return guest vrc if available. */
                 vrc = pWaitEvent->GetGuestError();
         }

trunk/src/VBox/Main/src-client/HGCM.cpp

@@ -162 +162 @@
         ~HGCMService() {};
 
-        static DECLCALLBACK(int)  svcHlpCallComplete(VBOXHGCMCALLHANDLE callHandle, int32_t rc);
+        static DECLCALLBACK(int)  svcHlpCallComplete(VBOXHGCMCALLHANDLE callHandle, int32_t vrc);
         static DECLCALLBACK(int)  svcHlpDisconnectClient(void *pvInstance, uint32_t idClient);
         static DECLCALLBACK(bool) svcHlpIsCallRestored(VBOXHGCMCALLHANDLE callHandle);
@@ -959 +959 @@
  * @interface_method_impl{VBOXHGCMSVCHELPERS,pfnCallComplete}
  */
-/* static */ DECLCALLBACK(int) HGCMService::svcHlpCallComplete(VBOXHGCMCALLHANDLE callHandle, int32_t rc)
+/* static */ DECLCALLBACK(int) HGCMService::svcHlpCallComplete(VBOXHGCMCALLHANDLE callHandle, int32_t vrc)
 {
    HGCMMsgCore *pMsgCore = (HGCMMsgCore *)callHandle;
@@ -968 +968 @@
     */
    AssertMsgReturn(pMsgCore->MsgId() == SVC_MSG_GUESTCALL, ("%d\n", pMsgCore->MsgId()), VERR_WRONG_TYPE);
-   return hgcmMsgComplete(pMsgCore, rc);
+   return hgcmMsgComplete(pMsgCore, vrc);
 }
 
@@ -1334 +1334 @@
  * @param   pHgcmPort          The VMMDev HGCM port interface.
  *
- * @return  VBox rc.
+ * @return  VBox status code.
  * @thread  main HGCM
  */
@@ -1455 +1455 @@
  * @param ppSvc          Where to store the pointer to the service.
  * @param pszServiceName The name of the service.
- * @return VBox rc.
+ * @return VBox status code.
  * @thread main HGCM
  */
@@ -1917 +1917 @@
     }
 
-    LogFunc(("idClient=%u m_cClients=%u m_acClients[%u]=%u %s (cPendingCalls=%u) rc=%Rrc\n", u32ClientId, m_cClients,
+    LogFunc(("idClient=%u m_cClients=%u m_acClients[%u]=%u %s (cPendingCalls=%u) vrc=%Rrc\n", u32ClientId, m_cClients,
              pClient->idxCategory, m_acClients[pClient->idxCategory], m_pszSvcName, pClient->cPendingCalls, vrc));
 
@@ -2032 +2032 @@
  * @param paParms        Pointer to array of parameters.
  * @param tsArrival      The STAM_GET_TS() value when the request arrived.
- * @return VBox rc.
+ * @return VBox status code.
  * @retval VINF_HGCM_ASYNC_EXECUTE on success.
  */
@@ -2099 +2099 @@
  * @param   pCmd           The VBox HGCM context.
  * @param   idClient       The client handle to be disconnected and deleted.
- * @return  VBox rc.
+ * @return  VBox status code.
  */
 void HGCMService::GuestCancelled(PPDMIHGCMPORT pHGCMPort, PVBOXHGCMCMD pCmd, uint32_t idClient)
@@ -2128 +2128 @@
  * @param cParms         Number of parameters.
  * @param paParms        Pointer to array of parameters.
- * @return VBox rc.
+ * @return VBox status code.
  */
 int HGCMService::HostCall(uint32_t u32Function, uint32_t cParms, VBOXHGCMSVCPARM *paParms)
@@ -2574 +2574 @@
  * @param pVMM               The VMM vtable (for statistics and such).
  * @param pHgcmPort          The HGCM port on the VMMDev device (for session ID and such).
- * @return VBox rc.
+ * @return VBox status code.
  */
 int HGCMHostLoad(const char *pszServiceLibrary,
@@ -2614 +2614 @@
  * @param pfnExtension       The extension entry point (callback).
  * @param pvExtension        The extension pointer.
- * @return VBox rc.
+ * @return VBox status code.
  */
 int HGCMHostRegisterServiceExtension(HGCMSVCEXTHANDLE *pHandle,
@@ -2677 +2677 @@
  * @param pszServiceName The name of the service to be connected to.
  * @param pu32ClientId   Where the store the created client handle.
- * @return VBox rc.
+ * @return VBox status code.
  */
 int HGCMGuestConnect(PPDMIHGCMPORT pHGCMPort,
@@ -2712 +2712 @@
     }
 
-    LogFlowFunc(("rc = %Rrc\n", vrc));
+    LogFlowFunc(("vrc = %Rrc\n", vrc));
     return vrc;
 }
@@ -2721 +2721 @@
  * @param pCmd           The VBox HGCM context.
  * @param u32ClientId    The client handle to be disconnected and deleted.
- * @return VBox rc.
+ * @return VBox status code.
  */
 int HGCMGuestDisconnect(PPDMIHGCMPORT pHGCMPort,
@@ -2761 +2761 @@
  * @param idMsg    The message to be sent: HGCM_MSG_SAVESTATE or HGCM_MSG_LOADSTATE.
  * @param uVersion The state version being loaded.
- * @return VBox rc.
+ * @return VBox status code.
  */
 static int hgcmHostLoadSaveState(PSSMHANDLE pSSM, PCVMMR3VTABLE pVMM, uint32_t idMsg, uint32_t uVersion)
@@ -2817 +2817 @@
  * @param paParms        Pointer to array of parameters.
  * @param tsArrival      The STAM_GET_TS() value when the request arrived.
- * @return VBox rc.
+ * @return VBox status code.
  */
 int HGCMGuestCall(PPDMIHGCMPORT pHGCMPort,
@@ -2889 +2889 @@
  * @param cParms         Number of parameters.
  * @param paParms        Pointer to array of parameters.
- * @return VBox rc.
+ * @return VBox status code.
  */
 int HGCMHostCall(const char *pszServiceName,
@@ -2932 +2932 @@
  *
  * @param   enmEvent    The notification event.
- * @return  VBox rc.
+ * @return  VBox status code.
  */
 int HGCMBroadcastEvent(HGCMNOTIFYEVENT enmEvent)

trunk/src/VBox/Main/src-client/HGCMThread.cpp

@@ -179 +179 @@
     m_pPrev       = NULL;
     m_fu32Flags   = 0;
-    m_rcSend      = VINF_SUCCESS;
+    m_vrcSend     = VINF_SUCCESS;
     m_pThread     = pThread;
     pThread->Reference();
@@ -488 +488 @@
                 RTSemEventMultiReset(m_eventSend);
 
-            vrc = pMsg->m_rcSend;
+            vrc = pMsg->m_vrcSend;
         }
     }
@@ -572 +572 @@
 }
 
-int HGCMThread::MsgComplete(HGCMMsgCore *pMsg, int32_t result)
-{
-    LogFlow(("HGCMThread::MsgComplete: thread = %p, pMsg = %p, result = %Rrc (%d)\n", this, pMsg, result, result));
+int HGCMThread::MsgComplete(HGCMMsgCore *pMsg, int32_t vrcResult)
+{
+    LogFlow(("HGCMThread::MsgComplete: thread = %p, pMsg = %p, vrcResult = %Rrc (%d)\n", this, pMsg, vrcResult, vrcResult));
 
     AssertRelease(pMsg->m_pThread == this);
@@ -584 +584 @@
         /** @todo call callback with error code in MsgPost in case of errors */
 
-        vrcRet = pMsg->m_pfnCallback(result, pMsg);
+        vrcRet = pMsg->m_pfnCallback(vrcResult, pMsg);
 
         LogFlow(("HGCMThread::MsgComplete: callback executed. pMsg = %p, thread = %p, rcRet = %Rrc\n", pMsg, this, vrcRet));
@@ -617 +617 @@
 
             /* This should be done before setting the HGCM_MSG_F_PROCESSED flag. */
-            pMsg->m_rcSend = result;
+            pMsg->m_vrcSend = vrcResult;
         }
 
@@ -758 +758 @@
 }
 
-int hgcmMsgComplete(HGCMMsgCore *pMsg, int32_t rcMsg)
-{
-    LogFlow(("MAIN::hgcmMsgComplete: pMsg = %p, rcMsg = %Rrc (%d)\n", pMsg, rcMsg, rcMsg));
+int hgcmMsgComplete(HGCMMsgCore *pMsg, int32_t vrcMsg)
+{
+    LogFlow(("MAIN::hgcmMsgComplete: pMsg = %p, vrcMsg = %Rrc (%d)\n", pMsg, vrcMsg, vrcMsg));
 
     int vrc;
     if (pMsg)
-        vrc = pMsg->Thread()->MsgComplete(pMsg, rcMsg);
+        vrc = pMsg->Thread()->MsgComplete(pMsg, vrcMsg);
     else
         vrc = VINF_SUCCESS;
 
-    LogFlow(("MAIN::hgcmMsgComplete: pMsg = %p, rcMsg =%Rrc (%d), returns vrc = %Rrc\n", pMsg, rcMsg, rcMsg, vrc));
+    LogFlow(("MAIN::hgcmMsgComplete: pMsg = %p, vrcMsg =%Rrc (%d), returns vrc = %Rrc\n", pMsg, vrcMsg, vrcMsg, vrc));
     return vrc;
 }

trunk/src/VBox/Main/src-client/MachineDebuggerImpl.cpp

@@ -611 +611 @@
             int vrc = ptrVM.vtable()->pfnTMR3SetWarpDrive(ptrVM.rawUVM(), aVirtualTimeRate);
             if (RT_FAILURE(vrc))
-                hrc = setErrorBoth(VBOX_E_VM_ERROR, vrc, tr("TMR3SetWarpDrive(, %u) failed with rc=%Rrc"), aVirtualTimeRate, vrc);
+                hrc = setErrorBoth(VBOX_E_VM_ERROR, vrc, tr("TMR3SetWarpDrive(, %u) failed with vrc=%Rrc"), aVirtualTimeRate, vrc);
         }
     }
@@ -1078 +1078 @@
         else
             hrc = setErrorBoth(VBOX_E_VM_ERROR, vrc,
-                               tr("DBGFR3RegNmQuery failed with rc=%Rrc querying register '%s' with default cpu set to %u"),
+                               tr("DBGFR3RegNmQuery failed with vrc=%Rrc querying register '%s' with default cpu set to %u"),
                                vrc, aName.c_str(), aCpuId);
     }

trunk/src/VBox/Main/src-client/Recording.cpp

@@ -71 +71 @@
  * Recording context constructor.
  *
- * @note    Will throw rc when unable to create.
+ * @note    Will throw vrc when unable to create.
  */
 RecordingContext::RecordingContext(void)
@@ -89 +89 @@
  * @param   Settings            Reference to recording settings to use for creation.
  *
- * @note    Will throw rc when unable to create.
+ * @note    Will throw vrc when unable to create.
  */
 RecordingContext::RecordingContext(Console *ptrConsole, const settings::RecordingSettings &Settings)
@@ -437 +437 @@
             break;
         }
-        catch (int vrc_thrown) /* Catch rc thrown by constructor. */
+        catch (int vrc_thrown) /* Catch vrc thrown by constructor. */
         {
             vrc = vrc_thrown;
@@ -858 +858 @@
 }
 
-DECLCALLBACK(int) RecordingContext::OnLimitReached(uint32_t uScreen, int rc)
-{
-    RT_NOREF(uScreen, rc);
-    LogFlowThisFunc(("Stream %RU32 has reached its limit (%Rrc)\n", uScreen, rc));
+DECLCALLBACK(int) RecordingContext::OnLimitReached(uint32_t uScreen, int vrc)
+{
+    RT_NOREF(uScreen, vrc);
+    LogFlowThisFunc(("Stream %RU32 has reached its limit (%Rrc)\n", uScreen, vrc));
 
     lock();

trunk/src/VBox/Main/src-client/RecordingCodec.cpp

@@ -444 +444 @@
 
     if (RT_FAILURE(vrc))
-        LogRel(("Recording: Encoding Vorbis audio data failed, rc=%Rrc\n", vrc));
+        LogRel(("Recording: Encoding Vorbis audio data failed, vrc=%Rrc\n", vrc));
 
     Log3Func(("cbSrc=%zu, cbDst=%zu, cEncoded=%zu, cbEncoded=%zu, vrc=%Rrc\n",

trunk/src/VBox/Main/src-client/RecordingStream.cpp

@@ -209 +209 @@
             m_fEnabled = false;
 
-            int vrc2 = m_pCtx->OnLimitReached(m_uScreenID, VINF_SUCCESS /* rc */);
+            int vrc2 = m_pCtx->OnLimitReached(m_uScreenID, VINF_SUCCESS /* vrc */);
             AssertRC(vrc2);
             break;
@@ -853 +853 @@
                 else
                 {
-                    LogRel(("Recording: Error closing file '%s', rc=%Rrc\n", m_ScreenSettings.File.strName.c_str(), vrc));
+                    LogRel(("Recording: Error closing file '%s', vrc=%Rrc\n", m_ScreenSettings.File.strName.c_str(), vrc));
                     break;
                 }
@@ -867 +867 @@
                 {
                     int vrc2 = RTFileDelete(m_ScreenSettings.File.strName.c_str());
-                    AssertRC(vrc2); /* Ignore rc on non-debug builds. */
+                    AssertRC(vrc2); /* Ignore vrc on non-debug builds. */
                 }
 

trunk/src/VBox/Main/src-client/RemoteUSBBackend.cpp

@@ -203 +203 @@
             vrc = pThis->reapURB(pvRet, cbRet);
 
-            LogFlow(("USBClientResponseCallback: reap URB, rc = %Rrc.\n", vrc));
+            LogFlow(("USBClientResponseCallback: reap URB, vrc = %Rrc.\n", vrc));
         } break;