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

Timestamp:

Aug 9, 2012 5:28:36 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

79930

Message:

Main/GuestProcess: fix lots of warninga about variables shadowing the rc method

File:

• trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp (modified) (57 diffs)

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

@@ -340 +340 @@
 
     /* Create a new context ID and assign it. */
-    int rc = VERR_NOT_FOUND;
+    int vrc = VERR_NOT_FOUND;
 
     ULONG uCount = mData.mNextContextID++;
@@ -360 +360 @@
              * we can use this context ID for our new callback we want
              * to add below. */
-            rc = VINF_SUCCESS;
+            vrc = VINF_SUCCESS;
             break;
         }
@@ -369 +369 @@
     }
 
-    if (RT_SUCCESS(rc))
+    if (RT_SUCCESS(vrc))
     {
         /* Add callback with new context ID to our callback map.
@@ -386 +386 @@
     }
 
-    return rc;
+    return vrc;
 }
 
@@ -401 +401 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    int rc;
+    int vrc;
 
     /* Get the optional callback associated to this context ID.
@@ -427 +427 @@
             AssertReturn(CALLBACKDATAMAGIC_CLIENT_DISCONNECTED == pCallbackData->hdr.u32Magic, VERR_INVALID_PARAMETER);
 
-            rc = onGuestDisconnected(pCallback, pCallbackData); /* Affects all callbacks. */
+            vrc = onGuestDisconnected(pCallback, pCallbackData); /* Affects all callbacks. */
             break;
         }
@@ -438 +438 @@
             AssertReturn(CALLBACKDATAMAGIC_EXEC_STATUS == pCallbackData->hdr.u32Magic, VERR_INVALID_PARAMETER);
 
-            rc = onProcessStatusChange(pCallback, pCallbackData);
+            vrc = onProcessStatusChange(pCallback, pCallbackData);
             break;
         }
@@ -449 +449 @@
             AssertReturn(CALLBACKDATAMAGIC_EXEC_OUT == pCallbackData->hdr.u32Magic, VERR_INVALID_PARAMETER);
 
-            rc = onProcessOutput(pCallback, pCallbackData);
+            vrc = onProcessOutput(pCallback, pCallbackData);
             break;
         }
@@ -460 +460 @@
             AssertReturn(CALLBACKDATAMAGIC_EXEC_IN_STATUS == pCallbackData->hdr.u32Magic, VERR_INVALID_PARAMETER);
 
-            rc = onProcessInputStatus(pCallback, pCallbackData);
+            vrc = onProcessInputStatus(pCallback, pCallbackData);
             break;
         }
@@ -466 +466 @@
         default:
             /* Silently ignore not implemented functions. */
-            rc = VERR_NOT_IMPLEMENTED;
+            vrc = VERR_NOT_IMPLEMENTED;
             break;
     }
 
 #ifdef DEBUG
-    LogFlowFuncLeaveRC(rc);
+    LogFlowFuncLeaveRC(vrc);
 #endif
-    return rc;
+    return vrc;
 }
 
@@ -585 +585 @@
 
     /* Signal in any case. */
-    int rc = signalWaiters(waitRes);
-    AssertRC(rc);
-
-    LogFlowFuncLeaveRC(rc);
-    return rc;
+    int vrc = signalWaiters(waitRes);
+    AssertRC(vrc);
+
+    LogFlowFuncLeaveRC(vrc);
+    return vrc;
 }
 
@@ -600 +600 @@
                      mData.mPID, pData->u32Status, pData->u32Flags, pData->cbProcessed, pCallback, pData));
 
-    int rc = checkPID(pData->u32PID);
-    if (RT_FAILURE(rc))
-        return rc;
+    int vrc = checkPID(pData->u32PID);
+    if (RT_FAILURE(vrc))
+        return vrc;
 
     /* First, signal callback in every case (if available). */
     if (pCallback)
     {
-        rc = pCallback->SetData(pData, sizeof(CALLBACKDATAEXECINSTATUS));
+        vrc = pCallback->SetData(pData, sizeof(CALLBACKDATAEXECINSTATUS));
 
         int rc2 = pCallback->Signal();
-        if (RT_SUCCESS(rc))
-            rc = rc2;
+        if (RT_SUCCESS(vrc))
+            vrc = rc2;
     }
 
@@ -620 +620 @@
     {
         int rc2 = signalWaiters(ProcessWaitResult_StdIn);
-        if (RT_SUCCESS(rc))
-            rc = rc2;
-    }
-
-    LogFlowFuncLeaveRC(rc);
-    return rc;
+        if (RT_SUCCESS(vrc))
+            vrc = rc2;
+    }
+
+    LogFlowFuncLeaveRC(vrc);
+    return vrc;
 }
 
@@ -644 +644 @@
                      pData->u32PID, pData->u32Status, pData->u32Flags, pCallback, pData));
 
-    int rc = checkPID(pData->u32PID);
-    if (RT_FAILURE(rc))
-        return rc;
+    int vrc = checkPID(pData->u32PID);
+    if (RT_FAILURE(vrc))
+        return vrc;
 
     BOOL fSignal = FALSE;
@@ -733 +733 @@
             if (mData.mPID)
             {
-                strError += Utf8StrFmt(tr("Error rc=%Rrc occured (PID %RU32)"), rc, mData.mPID);
+                strError += Utf8StrFmt(tr("Error vrc=%Rrc occured (PID %RU32)"), vrc, mData.mPID);
             }
             else
@@ -782 +782 @@
             }
 
-            rc = setErrorInternal(pData->u32Flags, strError);
-            AssertRC(rc);
+            vrc = setErrorInternal(pData->u32Flags, strError);
+            AssertRC(vrc);
             break;
         }
@@ -799 +799 @@
     }
 
-    LogFlowThisFunc(("Got rc=%Rrc, waitResult=%d\n", rc, waitRes));
+    LogFlowThisFunc(("Got vrc=%Rrc, waitResult=%d\n", vrc, waitRes));
 
     /*
@@ -805 +805 @@
      */
     if (pCallback)
-        rc = pCallback->Signal();
+        vrc = pCallback->Signal();
 
     if (fSignal)
     {
         int rc2 = signalWaiters(waitRes);
-        if (RT_SUCCESS(rc))
-            rc = rc2;
-    }
-
-    LogFlowFuncLeaveRC(rc);
-    return rc;
+        if (RT_SUCCESS(vrc))
+            vrc = rc2;
+    }
+
+    LogFlowFuncLeaveRC(vrc);
+    return vrc;
 }
 
@@ -826 +826 @@
                      mData.mPID, pData->u32HandleId, pData->u32Flags, pData->pvData, pData->cbData, pCallback, pData));
 
-    int rc = checkPID(pData->u32PID);
-    if (RT_FAILURE(rc))
-        return rc;
+    int vrc = checkPID(pData->u32PID);
+    if (RT_FAILURE(vrc))
+        return vrc;
 
     /* First, signal callback in every case (if available). */
     if (pCallback)
     {
-        rc = pCallback->SetData(pData, sizeof(CALLBACKDATAEXECOUT));
+        vrc = pCallback->SetData(pData, sizeof(CALLBACKDATAEXECOUT));
 
         int rc2 = pCallback->Signal();
-        if (RT_SUCCESS(rc))
-            rc = rc2;
+        if (RT_SUCCESS(vrc))
+            vrc = rc2;
     }
 
@@ -865 +865 @@
         int rc2 = signalWaiters(  pData->u32HandleId == OUTPUT_HANDLE_ID_STDOUT
                                 ? ProcessWaitResult_StdOut : ProcessWaitResult_StdErr);
-        if (RT_SUCCESS(rc))
-            rc = rc2;
-    }
-
-    LogFlowFuncLeaveRC(rc);
-    return rc;
+        if (RT_SUCCESS(vrc))
+            vrc = rc2;
+    }
+
+    LogFlowFuncLeaveRC(vrc);
+    return vrc;
 }
 
@@ -894 +894 @@
 
     /* Create callback and add it to the map. */
-    int rc = pCallbackRead->Init(VBOXGUESTCTRLCALLBACKTYPE_EXEC_OUTPUT);
-    if (RT_SUCCESS(rc))
-        rc = callbackAdd(pCallbackRead, &uContextID);
+    int vrc = pCallbackRead->Init(VBOXGUESTCTRLCALLBACKTYPE_EXEC_OUTPUT);
+    if (RT_SUCCESS(vrc))
+        vrc = callbackAdd(pCallbackRead, &uContextID);
 
     alock.release(); /* Drop the write lock again. */
 
-    if (RT_SUCCESS(rc))
+    if (RT_SUCCESS(vrc))
     {
         VBOXHGCMSVCPARM paParms[5];
@@ -910 +910 @@
         paParms[i++].setUInt32(0 /* Flags, none set yet. */);
 
-        rc = sendCommand(HOST_EXEC_GET_OUTPUT, i, paParms);
-    }
-
-    if (RT_SUCCESS(rc))
+        vrc = sendCommand(HOST_EXEC_GET_OUTPUT, i, paParms);
+    }
+
+    if (RT_SUCCESS(vrc))
     {
         /*
@@ -920 +920 @@
          */
         LogFlowThisFunc(("Waiting for callback (%RU32ms) ...\n", uTimeoutMS));
-        rc = pCallbackRead->Wait(uTimeoutMS);
-        if (RT_SUCCESS(rc)) /* Wait was successful, check for supplied information. */
-        {
-            rc = pCallbackRead->GetResultCode();
-            LogFlowThisFunc(("Callback returned rc=%Rrc, cbData=%RU32\n", rc, pCallbackRead->GetDataSize()));
-
-            if (RT_SUCCESS(rc))
+        vrc = pCallbackRead->Wait(uTimeoutMS);
+        if (RT_SUCCESS(vrc)) /* Wait was successful, check for supplied information. */
+        {
+            vrc = pCallbackRead->GetResultCode();
+            LogFlowThisFunc(("Callback returned vrc=%Rrc, cbData=%RU32\n", vrc, pCallbackRead->GetDataSize()));
+
+            if (RT_SUCCESS(vrc))
             {
                 Assert(pCallbackRead->GetDataSize() == sizeof(CALLBACKDATAEXECOUT));
@@ -946 +946 @@
         }
         else
-            rc = VERR_TIMEOUT;
+            vrc = VERR_TIMEOUT;
     }
 
@@ -953 +953 @@
     AssertPtr(pCallbackRead);
     int rc2 = callbackRemove(uContextID);
-    if (RT_SUCCESS(rc))
-        rc = rc2;
-
-    LogFlowFuncLeaveRC(rc);
-    return rc;
+    if (RT_SUCCESS(vrc))
+        vrc = rc2;
+
+    LogFlowFuncLeaveRC(vrc);
+    return vrc;
 }
 
@@ -973 +973 @@
 
     LogFlowThisFunc(("uFunction=%RU32, uParms=%RU32\n", uFunction, uParms));
-    int rc = pVMMDev->hgcmHostCall("VBoxGuestControlSvc", uFunction, uParms, paParms);
-    if (RT_FAILURE(rc))
+    int vrc = pVMMDev->hgcmHostCall("VBoxGuestControlSvc", uFunction, uParms, paParms);
+    if (RT_FAILURE(vrc))
     {
         int rc2;
-        if (rc == VERR_INVALID_VM_HANDLE)
-            rc2 = setErrorInternal(rc, tr("VMM device is not available (is the VM running?)"));
-        else if (rc == VERR_NOT_FOUND)
-            rc2 = setErrorInternal(rc, tr("The guest execution service is not ready (yet)"));
-        else if (rc == VERR_HGCM_SERVICE_NOT_FOUND)
-            rc2 = setErrorInternal(rc, tr("The guest execution service is not available"));
+        if (vrc == VERR_INVALID_VM_HANDLE)
+            rc2 = setErrorInternal(vrc, tr("VMM device is not available (is the VM running?)"));
+        else if (vrc == VERR_NOT_FOUND)
+            rc2 = setErrorInternal(vrc, tr("The guest execution service is not ready (yet)"));
+        else if (vrc == VERR_HGCM_SERVICE_NOT_FOUND)
+            rc2 = setErrorInternal(vrc, tr("The guest execution service is not available"));
         else
-            rc2 = setErrorInternal(rc, Utf8StrFmt(tr("The HGCM call failed with error %Rrc"), rc));
+            rc2 = setErrorInternal(vrc, Utf8StrFmt(tr("The HGCM call failed with error %Rrc"), vrc));
         AssertRC(rc2);
     }
 
-    LogFlowFuncLeaveRC(rc);
-    return rc;
+    LogFlowFuncLeaveRC(vrc);
+    return vrc;
 }
 
 /* Does not do locking; caller is responsible for that! */
-int GuestProcess::setErrorInternal(int rc, const Utf8Str &strMessage)
-{
-    LogFlowThisFunc(("rc=%Rrc, strMsg=%s\n", rc, strMessage.c_str()));
-
-    Assert(RT_FAILURE(rc));
+int GuestProcess::setErrorInternal(int vrc, const Utf8Str &strMessage)
+{
+    LogFlowThisFunc(("vrc=%Rrc, strMsg=%s\n", vrc, strMessage.c_str()));
+
+    Assert(RT_FAILURE(vrc));
     Assert(!strMessage.isEmpty());
 
@@ -1008 +1008 @@
 
     mData.mStatus = ProcessStatus_Error;
-    mData.mRC = rc;
+    mData.mRC = vrc;
     mData.mErrorMsg = strMessage;
 
@@ -1029 +1029 @@
     /* Note: No write locking here -- already done in the caller. */
 
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
     if (mData.mWaitEvent)
-        rc = mData.mWaitEvent->Signal(enmWaitResult);
-    LogFlowFuncLeaveRC(rc);
-    return rc;
+        vrc = mData.mWaitEvent->Signal(enmWaitResult);
+    LogFlowFuncLeaveRC(vrc);
+    return vrc;
 }
 
@@ -1045 +1045 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    int rc;
+    int vrc;
     uint32_t uContextID = 0;
     GuestCtrlCallback *pCallbackStart = new GuestCtrlCallback();
@@ -1054 +1054 @@
 
     /* Create callback and add it to the map. */
-    rc = pCallbackStart->Init(VBOXGUESTCTRLCALLBACKTYPE_EXEC_START);
-    if (RT_SUCCESS(rc))
-        rc = callbackAdd(pCallbackStart, &uContextID);
-
-    if (RT_SUCCESS(rc))
+    vrc = pCallbackStart->Init(VBOXGUESTCTRLCALLBACKTYPE_EXEC_START);
+    if (RT_SUCCESS(vrc))
+        vrc = callbackAdd(pCallbackStart, &uContextID);
+
+    if (RT_SUCCESS(vrc))
     {
         GuestSession *pSession = mData.mParent;
@@ -1072 +1072 @@
             char **papszArgv = (char**)RTMemAlloc(sizeof(char*) * (cArgs + 1));
             AssertReturn(papszArgv, VERR_NO_MEMORY);
-            for (size_t i = 0; RT_SUCCESS(rc) && i < cArgs; i++)
-                rc = RTStrDupEx(&papszArgv[i], mData.mProcess.mArguments[i].c_str());
+            for (size_t i = 0; RT_SUCCESS(vrc) && i < cArgs; i++)
+                vrc = RTStrDupEx(&papszArgv[i], mData.mProcess.mArguments[i].c_str());
             papszArgv[cArgs] = NULL;
 
-            if (RT_SUCCESS(rc))
-                rc = RTGetOptArgvToString(&pszArgs, papszArgv, RTGETOPTARGV_CNV_QUOTE_MS_CRT);
+            if (RT_SUCCESS(vrc))
+                vrc = RTGetOptArgvToString(&pszArgs, papszArgv, RTGETOPTARGV_CNV_QUOTE_MS_CRT);
         }
         size_t cbArgs = pszArgs ? strlen(pszArgs) + 1 : 0; /* Include terminating zero. */
@@ -1084 +1084 @@
         void *pvEnv = NULL;
         size_t cbEnv = 0;
-        rc = mData.mProcess.mEnvironment.BuildEnvironmentBlock(&pvEnv, &cbEnv, NULL /* cEnv */);
-
-        if (RT_SUCCESS(rc))
+        vrc = mData.mProcess.mEnvironment.BuildEnvironmentBlock(&pvEnv, &cbEnv, NULL /* cEnv */);
+
+        if (RT_SUCCESS(vrc))
         {
             /* Prepare HGCM call. */
@@ -1116 +1116 @@
 
             /* Note: Don't hold the write lock in here, because setErrorInternal */
-            rc = sendCommand(HOST_EXEC_CMD, i, paParms);
+            vrc = sendCommand(HOST_EXEC_CMD, i, paParms);
         }
 
@@ -1128 +1128 @@
         alock.release();
 
-        if (RT_SUCCESS(rc))
+        if (RT_SUCCESS(vrc))
         {
             /*
@@ -1135 +1135 @@
              */
             LogFlowThisFunc(("Waiting for callback (%RU32ms) ...\n", uTimeoutMS));
-            rc = pCallbackStart->Wait(uTimeoutMS);
-            if (RT_SUCCESS(rc)) /* Wait was successful, check for supplied information. */
+            vrc = pCallbackStart->Wait(uTimeoutMS);
+            if (RT_SUCCESS(vrc)) /* Wait was successful, check for supplied information. */
             {
-                rc = pCallbackStart->GetResultCode();
-                LogFlowThisFunc(("Callback returned rc=%Rrc\n", rc));
+                vrc = pCallbackStart->GetResultCode();
+                LogFlowThisFunc(("Callback returned vrc=%Rrc\n", vrc));
             }
             else
-                rc = VERR_TIMEOUT;
+                vrc = VERR_TIMEOUT;
         }
 
@@ -1149 +1149 @@
         AssertPtr(pCallbackStart);
         int rc2 = callbackRemove(uContextID);
-        if (RT_SUCCESS(rc))
-            rc = rc2;
-    }
-
-    LogFlowFuncLeaveRC(rc);
-    return rc;
+        if (RT_SUCCESS(vrc))
+            vrc = rc2;
+    }
+
+    LogFlowFuncLeaveRC(vrc);
+    return vrc;
 }
 
@@ -1166 +1166 @@
     AssertReturn(pTask->isOk(), pTask->rc());
 
-    int rc = RTThreadCreate(NULL, GuestProcess::startProcessThread,
+    int vrc = RTThreadCreate(NULL, GuestProcess::startProcessThread,
                             (void *)pTask.get(), 0,
                             RTTHREADTYPE_MAIN_WORKER, 0,
                             "gctlPrcStart");
-    if (RT_SUCCESS(rc))
+    if (RT_SUCCESS(vrc))
     {
         /* pTask is now owned by startProcessThread(), so release it. */
@@ -1176 +1176 @@
     }
 
-    LogFlowFuncLeaveRC(rc);
-    return rc;
+    LogFlowFuncLeaveRC(vrc);
+    return vrc;
 }
 
@@ -1193 +1193 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    int rc = pProcess->startProcess();
-    if (RT_FAILURE(rc))
+    int vrc = pProcess->startProcess();
+    if (RT_FAILURE(vrc))
     {
         /** @todo What now? */
     }
 
-    LogFlowFuncLeaveRC(rc);
-    return rc;
+    LogFlowFuncLeaveRC(vrc);
+    return vrc;
 }
 
@@ -1344 +1344 @@
     alock.release(); /* Release lock before waiting. */
 
-    int rc = mData.mWaitEvent->Wait(uTimeoutMS);
-    if (RT_SUCCESS(rc))
+    int vrc = mData.mWaitEvent->Wait(uTimeoutMS);
+    if (RT_SUCCESS(vrc))
         waitRes = mData.mWaitEvent->GetResult();
 
@@ -1357 +1357 @@
     mData.mWaitCount--;
 
-    LogFlowFuncLeaveRC(rc);
-    return rc;
+    LogFlowFuncLeaveRC(vrc);
+    return vrc;
 }
 
@@ -1365 +1365 @@
     LogFlowThisFunc(("uTimeoutMS=%RU32\n", uTimeoutMS));
 
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
 
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -1373 +1373 @@
 
         GuestProcessWaitResult waitRes;
-        rc = waitFor(ProcessWaitForFlag_Start, uTimeoutMS, waitRes);
-        if (   RT_FAILURE(rc)
+        vrc = waitFor(ProcessWaitForFlag_Start, uTimeoutMS, waitRes);
+        if (   RT_FAILURE(vrc)
             || (    waitRes.mResult == ProcessWaitResult_Start
                 &&  waitRes.mResult == ProcessWaitResult_Any
@@ -1380 +1380 @@
            )
         {
-            if (RT_SUCCESS(rc))
-                rc = waitRes.mRC;
-        }
-    }
-
-    LogFlowFuncLeaveRC(rc);
-    return rc;
+            if (RT_SUCCESS(vrc))
+                vrc = waitRes.mRC;
+        }
+    }
+
+    LogFlowFuncLeaveRC(vrc);
+    return vrc;
 }
 
@@ -1407 +1407 @@
 
     /* Create callback and add it to the map. */
-    int rc = pCallbackWrite->Init(VBOXGUESTCTRLCALLBACKTYPE_EXEC_INPUT_STATUS);
-    if (RT_SUCCESS(rc))
-        rc = callbackAdd(pCallbackWrite, &uContextID);
+    int vrc = pCallbackWrite->Init(VBOXGUESTCTRLCALLBACKTYPE_EXEC_INPUT_STATUS);
+    if (RT_SUCCESS(vrc))
+        vrc = callbackAdd(pCallbackWrite, &uContextID);
 
     alock.release(); /* Drop the write lock again. */
 
-    if (RT_SUCCESS(rc))
+    if (RT_SUCCESS(vrc))
     {
         VBOXHGCMSVCPARM paParms[5];
@@ -1424 +1424 @@
         paParms[i++].setUInt32(cbData);
 
-        rc = sendCommand(HOST_EXEC_SET_INPUT, i, paParms);
-    }
-
-    if (RT_SUCCESS(rc))
+        vrc = sendCommand(HOST_EXEC_SET_INPUT, i, paParms);
+    }
+
+    if (RT_SUCCESS(vrc))
     {
         /*
@@ -1434 +1434 @@
          */
         LogFlowThisFunc(("Waiting for callback (%RU32ms) ...\n", uTimeoutMS));
-        rc = pCallbackWrite->Wait(uTimeoutMS);
-        if (RT_SUCCESS(rc)) /* Wait was successful, check for supplied information. */
-        {
-            rc = pCallbackWrite->GetResultCode();
-            LogFlowThisFunc(("Callback returned rc=%Rrc, cbData=%RU32\n", rc, pCallbackWrite->GetDataSize()));
-
-            if (RT_SUCCESS(rc))
+        vrc = pCallbackWrite->Wait(uTimeoutMS);
+        if (RT_SUCCESS(vrc)) /* Wait was successful, check for supplied information. */
+        {
+            vrc = pCallbackWrite->GetResultCode();
+            LogFlowThisFunc(("Callback returned vrc=%Rrc, cbData=%RU32\n", vrc, pCallbackWrite->GetDataSize()));
+
+            if (RT_SUCCESS(vrc))
             {
                 Assert(pCallbackWrite->GetDataSize() == sizeof(CALLBACKDATAEXECINSTATUS));
@@ -1454 +1454 @@
 
                     case INPUT_STS_ERROR:
-                        rc = pData->u32Flags; /** @todo Fix int vs. uint32_t! */
+                        vrc = pData->u32Flags; /** @todo Fix int vs. uint32_t! */
                         break;
 
                     case INPUT_STS_TERMINATED:
-                        rc = VERR_CANCELLED;
+                        vrc = VERR_CANCELLED;
                         break;
 
                     case INPUT_STS_OVERFLOW:
-                        rc = VERR_BUFFER_OVERFLOW;
+                        vrc = VERR_BUFFER_OVERFLOW;
                         break;
 
@@ -1477 +1477 @@
         }
         else
-            rc = VERR_TIMEOUT;
+            vrc = VERR_TIMEOUT;
     }
 
@@ -1484 +1484 @@
     AssertPtr(pCallbackWrite);
     int rc2 = callbackRemove(uContextID);
-    if (RT_SUCCESS(rc))
-        rc = rc2;
-
-    LogFlowFuncLeaveRC(rc);
-    return rc;
+    if (RT_SUCCESS(vrc))
+        vrc = rc2;
+
+    LogFlowFuncLeaveRC(vrc);
+    return vrc;
 }
 
@@ -1510 +1510 @@
 
     size_t cbRead;
-    int rc = readData(aHandle, aSize, aTimeoutMS, data.raw(), aSize, &cbRead);
-    if (RT_SUCCESS(rc))
+    int vrc = readData(aHandle, aSize, aTimeoutMS, data.raw(), aSize, &cbRead);
+    if (RT_SUCCESS(vrc))
     {
         if (data.size() != cbRead)
@@ -1519 +1519 @@
 
     /** @todo Do setError() here. */
-    HRESULT hr = RT_SUCCESS(rc) ? S_OK : VBOX_E_IPRT_ERROR;
-    LogFlowFuncLeaveRC(rc);
+    HRESULT hr = RT_SUCCESS(vrc) ? S_OK : VBOX_E_IPRT_ERROR;
+    LogFlowFuncLeaveRC(vrc);
 
     return hr;
@@ -1536 +1536 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    int rc = terminateProcess();
+    int vrc = terminateProcess();
     /** @todo Do setError() here. */
-    HRESULT hr = RT_SUCCESS(rc) ? S_OK : VBOX_E_IPRT_ERROR;
-    LogFlowFuncLeaveRC(rc);
+    HRESULT hr = RT_SUCCESS(vrc) ? S_OK : VBOX_E_IPRT_ERROR;
+    LogFlowFuncLeaveRC(vrc);
 
     return hr;
@@ -1563 +1563 @@
 
     GuestProcessWaitResult waitRes;
-    int rc = waitFor(aWaitFlags, aTimeoutMS, waitRes);
-    if (RT_SUCCESS(rc))
+    int vrc = waitFor(aWaitFlags, aTimeoutMS, waitRes);
+    if (RT_SUCCESS(vrc))
     {
         *aReason = waitRes.mResult;
@@ -1571 +1571 @@
     else
     {
-        if (rc == VERR_TIMEOUT)
+        if (vrc == VERR_TIMEOUT)
             hr = setError(VBOX_E_IPRT_ERROR,
                           tr("Process \"%s\" (PID %RU32) did not respond within time (%RU32ms)"),
@@ -1577 +1577 @@
         else
             hr = setError(VBOX_E_IPRT_ERROR,
-                          tr("Waiting for process \"%s\" (PID %RU32) failed with rc=%Rrc"),
-                          mData.mProcess.mCommand.c_str(), mData.mPID, rc);
-    }
-    LogFlowFuncLeaveRC(rc);
+                          tr("Waiting for process \"%s\" (PID %RU32) failed with vrc=%Rrc"),
+                          mData.mProcess.mCommand.c_str(), mData.mPID, vrc);
+    }
+    LogFlowFuncLeaveRC(vrc);
     return hr;
 #endif /* VBOX_WITH_GUEST_CONTROL */
@@ -1625 +1625 @@
 
     com::SafeArray<BYTE> data(ComSafeArrayInArg(aData));
-    int rc = writeData(aHandle, aFlags, data.raw(), data.size(), aTimeoutMS, (uint32_t*)aWritten);
+    int vrc = writeData(aHandle, aFlags, data.raw(), data.size(), aTimeoutMS, (uint32_t*)aWritten);
     /** @todo Do setError() here. */
-    HRESULT hr = RT_SUCCESS(rc) ? S_OK : VBOX_E_IPRT_ERROR;
-    LogFlowFuncLeaveRC(rc);
+    HRESULT hr = RT_SUCCESS(vrc) ? S_OK : VBOX_E_IPRT_ERROR;
+    LogFlowFuncLeaveRC(vrc);
 
     return hr;