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

Timestamp:

May 8, 2022 7:43:06 PM (3 years ago)

Author:

vboxsync

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

151326

Message:

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

File:

• trunk/src/VBox/Main/src-client/GuestCtrlImpl.cpp (modified) (19 diffs)

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

@@ -128 +128 @@
 
     VBOXGUESTCTRLHOSTCBCTX CtxCb = { idMessage, idContext };
-    int rc = pGuest->i_dispatchToSession(&CtxCb, pSvcCb);
-
-    Log2Func(("CID=%#x, idSession=%RU32, uObject=%RU32, uCount=%RU32, rc=%Rrc\n",
+    int vrc = pGuest->i_dispatchToSession(&CtxCb, pSvcCb);
+
+    Log2Func(("CID=%#x, idSession=%RU32, uObject=%RU32, uCount=%RU32, vrc=%Rrc\n",
               idContext, VBOX_GUESTCTRL_CONTEXTID_GET_SESSION(idContext), VBOX_GUESTCTRL_CONTEXTID_GET_OBJECT(idContext),
-              VBOX_GUESTCTRL_CONTEXTID_GET_COUNT(idContext), rc));
-    return rc;
+              VBOX_GUESTCTRL_CONTEXTID_GET_COUNT(idContext), vrc));
+    return vrc;
 }
 
@@ -163 +163 @@
     GuestSessions::const_iterator itSession = mData.mGuestSessions.find(uSessionID);
 
-    int rc;
+    int vrc;
     if (itSession != mData.mGuestSessions.end())
     {
@@ -180 +180 @@
          */
         bool fDispatch = true;
-        rc = VERR_INVALID_FUNCTION;
+        vrc = VERR_INVALID_FUNCTION;
         if (   pCtxCb->uMessage == GUEST_MSG_EXEC_STATUS
             && pSvcCb->mParms    >= 5)
@@ -205 +205 @@
             {
                 case GUEST_MSG_DISCONNECTED:
-                    rc = pSession->i_dispatchToThis(pCtxCb, pSvcCb);
+                    vrc = pSession->i_dispatchToThis(pCtxCb, pSvcCb);
                     break;
 
@@ -213 +213 @@
                 case GUEST_MSG_EXEC_INPUT_STATUS:
                 case GUEST_MSG_EXEC_IO_NOTIFY:
-                    rc = pSession->i_dispatchToObject(pCtxCb, pSvcCb);
+                    vrc = pSession->i_dispatchToObject(pCtxCb, pSvcCb);
                     break;
 
                 /* File stuff. */
                 case GUEST_MSG_FILE_NOTIFY:
-                    rc = pSession->i_dispatchToObject(pCtxCb, pSvcCb);
+                    vrc = pSession->i_dispatchToObject(pCtxCb, pSvcCb);
                     break;
 
                 /* Session stuff. */
                 case GUEST_MSG_SESSION_NOTIFY:
-                    rc = pSession->i_dispatchToThis(pCtxCb, pSvcCb);
+                    vrc = pSession->i_dispatchToThis(pCtxCb, pSvcCb);
                     break;
 
                 default:
-                    rc = pSession->i_dispatchToObject(pCtxCb, pSvcCb);
+                    vrc = pSession->i_dispatchToObject(pCtxCb, pSvcCb);
                     break;
             }
@@ -233 +233 @@
     }
     else
-        rc = VERR_INVALID_SESSION_ID;
-
-    LogFlowFuncLeaveRC(rc);
-    return rc;
+        vrc = VERR_INVALID_SESSION_ID;
+
+    LogFlowFuncLeaveRC(vrc);
+    return vrc;
 }
 
@@ -258 +258 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    int rc = VERR_MAX_PROCS_REACHED;
+    int vrc = VERR_MAX_PROCS_REACHED;
     if (mData.mGuestSessions.size() >= VBOX_GUESTCTRL_MAX_SESSIONS)
-        return rc;
+        return vrc;
 
     try
@@ -273 +273 @@
             if (!i_sessionExists(uNewSessionID))
             {
-                rc = VINF_SUCCESS;
+                vrc = VINF_SUCCESS;
                 break;
             }
@@ -283 +283 @@
                 break; /* Don't try too hard. */
         }
-        if (RT_FAILURE(rc)) throw rc;
+        if (RT_FAILURE(vrc)) throw vrc;
 
         /* Create the session object. */
-        HRESULT hr = pGuestSession.createObject();
-        if (FAILED(hr)) throw VERR_COM_UNEXPECTED;
+        HRESULT hrc = pGuestSession.createObject();
+        if (FAILED(hrc)) throw VERR_COM_UNEXPECTED;
 
         /** @todo Use an overloaded copy operator. Later. */
@@ -310 +310 @@
         }
 
-        rc = pGuestSession->init(this, startupInfo, guestCredentials);
-        if (RT_FAILURE(rc)) throw rc;
+        vrc = pGuestSession->init(this, startupInfo, guestCredentials);
+        if (RT_FAILURE(vrc)) throw vrc;
 
         /*
@@ -324 +324 @@
         ::FireGuestSessionRegisteredEvent(mEventSource, pGuestSession, true /* Registered */);
     }
-    catch (int rc2)
-    {
-        rc = rc2;
-    }
-
-    LogFlowFuncLeaveRC(rc);
-    return rc;
+    catch (int vrc2)
+    {
+        vrc = vrc2;
+    }
+
+    LogFlowFuncLeaveRC(vrc);
+    return vrc;
 }
 
@@ -347 +347 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    int rc = VERR_NOT_FOUND;
+    int vrc = VERR_NOT_FOUND;
 
     LogFlowThisFunc(("Destroying session (ID=%RU32) ...\n", uSessionID));
@@ -362 +362 @@
                      uSessionID, mData.mGuestSessions.size() ? mData.mGuestSessions.size() - 1 : 0));
 
-    rc = pSession->i_onRemove();
+    vrc = pSession->i_onRemove();
     mData.mGuestSessions.erase(itSessions);
 
@@ -370 +370 @@
     pSession.setNull();
 
-    LogFlowFuncLeaveRC(rc);
-    return rc;
+    LogFlowFuncLeaveRC(vrc);
+    return vrc;
 }
 
@@ -538 +538 @@
         Assert(!pSession.isNull());
 
-        int rcGuest = VERR_GSTCTL_GUEST_ERROR;
-        vrc = pSession->i_startSession(&rcGuest);
+        int vrcGuest = VERR_GSTCTL_GUEST_ERROR;
+        vrc = pSession->i_startSession(&vrcGuest);
         if (RT_SUCCESS(vrc))
         {
-            vrc = pSession->i_shutdown(fFlags, &rcGuest);
+            vrc = pSession->i_shutdown(fFlags, &vrcGuest);
             if (RT_FAILURE(vrc))
             {
@@ -555 +555 @@
                     {
                         if (vrc == VERR_GSTCTL_GUEST_ERROR)
-                            vrc = rcGuest;
+                            vrc = vrcGuest;
                         hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Error %s guest: %Rrc"), strAction.c_str(), vrc);
                         break;
@@ -565 +565 @@
         {
             if (vrc == VERR_GSTCTL_GUEST_ERROR)
-                vrc = rcGuest;
+                vrc = vrcGuest;
             hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Could not open guest session: %Rrc"), vrc);
         }
@@ -638 +638 @@
         Assert(!pSession.isNull());
 
-        int rcGuest = VERR_GSTCTL_GUEST_ERROR;
-        vrc = pSession->i_startSession(&rcGuest);
+        int vrcGuest = VERR_GSTCTL_GUEST_ERROR;
+        vrc = pSession->i_startSession(&vrcGuest);
         if (RT_SUCCESS(vrc))
         {
@@ -689 +689 @@
         {
             if (vrc == VERR_GSTCTL_GUEST_ERROR)
-                vrc = rcGuest;
+                vrc = vrcGuest;
             hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Could not open guest session: %Rrc"), vrc);
         }