Changeset 94949 in vbox

Timestamp:

May 9, 2022 11:45:03 AM (3 years ago)

Author:

vboxsync

Message:

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

File:

• trunk/src/VBox/Main/src-client/SessionImpl.cpp (modified) (18 diffs)

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

@@ -58 +58 @@
     LogFlowThisFunc(("\n"));
 
-    HRESULT rc = init();
+    HRESULT hrc = init();
 
     BaseFinalConstruct();
 
-    return rc;
+    return hrc;
 }
 
@@ -127 +127 @@
                mState == SessionState_Spawning);
 
-        HRESULT rc = i_unlockMachine(true /* aFinalRelease */, false /* aFromServer */, alock);
-        AssertComRC(rc);
+        HRESULT hrc = i_unlockMachine(true /* aFinalRelease */, false /* aFromServer */, alock);
+        AssertComRC(hrc);
     }
 
@@ -181 +181 @@
     CHECK_OPEN();
 
-    HRESULT rc;
+    HRESULT hrc;
 #ifndef VBOX_COM_INPROC_API_CLIENT
     if (mConsole)
-        rc = mConsole->i_machine().queryInterfaceTo(aMachine.asOutParam());
+        hrc = mConsole->i_machine().queryInterfaceTo(aMachine.asOutParam());
     else
 #endif
-        rc = mRemoteMachine.queryInterfaceTo(aMachine.asOutParam());
-    if (FAILED(rc))
+        hrc = mRemoteMachine.queryInterfaceTo(aMachine.asOutParam());
+    if (FAILED(hrc))
     {
 #ifndef VBOX_COM_INPROC_API_CLIENT
         if (mConsole)
-            setError(rc, tr("Failed to query the session machine"));
+            setError(hrc, tr("Failed to query the session machine"));
         else
 #endif
-        if (FAILED_DEAD_INTERFACE(rc))
-            setError(rc, tr("Peer process crashed"));
+        if (FAILED_DEAD_INTERFACE(hrc))
+            setError(hrc, tr("Peer process crashed"));
         else
-            setError(rc, tr("Failed to query the remote session machine"));
-    }
-
-    return rc;
+            setError(hrc, tr("Failed to query the remote session machine"));
+    }
+
+    return hrc;
 }
 
@@ -210 +210 @@
     CHECK_OPEN();
 
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
 #ifndef VBOX_COM_INPROC_API_CLIENT
     if (mConsole)
-        rc = mConsole.queryInterfaceTo(aConsole.asOutParam());
+        hrc = mConsole.queryInterfaceTo(aConsole.asOutParam());
     else
 #endif
-        rc = mRemoteConsole.queryInterfaceTo(aConsole.asOutParam());
-
-    if (FAILED(rc))
+        hrc = mRemoteConsole.queryInterfaceTo(aConsole.asOutParam());
+
+    if (FAILED(hrc))
     {
 #ifndef VBOX_COM_INPROC_API_CLIENT
         if (mConsole)
-            setError(rc, tr("Failed to query the console"));
+            setError(hrc, tr("Failed to query the console"));
         else
 #endif
-        if (FAILED_DEAD_INTERFACE(rc))
-            setError(rc, tr("Peer process crashed"));
+        if (FAILED_DEAD_INTERFACE(hrc))
+            setError(hrc, tr("Peer process crashed"));
         else
-            setError(rc, tr("Failed to query the remote console"));
-    }
-
-    return rc;
+            setError(hrc, tr("Failed to query the remote console"));
+    }
+
+    return hrc;
 }
 
@@ -336 +336 @@
     AssertReturn(!!mControl, E_FAIL);
 
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
 #ifndef VBOX_COM_INPROC_API_CLIENT
     if (aLockType == LockType_VM)
@@ -342 +342 @@
         /* This is what is special about VM processes: they have a Console
          * object which is the root of all VM related activity. */
-        rc = mConsole.createObject();
-        AssertComRCReturn(rc, rc);
-
-        rc = mConsole->initWithMachine(aMachine, mControl, aLockType);
-        AssertComRCReturn(rc, rc);
+        hrc = mConsole.createObject();
+        AssertComRCReturn(hrc, hrc);
+
+        hrc = mConsole->initWithMachine(aMachine, mControl, aLockType);
+        AssertComRCReturn(hrc, hrc);
     }
     else
@@ -373 +373 @@
             delete mClientTokenHolder;
             mClientTokenHolder = NULL;
-            rc = E_FAIL;
+            hrc = E_FAIL;
         }
     }
     catch (std::bad_alloc &)
     {
-        rc = E_OUTOFMEMORY;
+        hrc = E_OUTOFMEMORY;
     }
 
@@ -385 +385 @@
      *  until the session is closed
      */
-    if (SUCCEEDED(rc))
-       rc = aMachine->COMGETTER(Parent)(mVirtualBox.asOutParam());
-
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
+       hrc = aMachine->COMGETTER(Parent)(mVirtualBox.asOutParam());
+
+    if (SUCCEEDED(hrc))
     {
         mType = SessionType_WriteLock;
@@ -406 +406 @@
     }
 
-    return rc;
+    return hrc;
 }
 
@@ -420 +420 @@
                  mState == SessionState_Spawning, VBOX_E_INVALID_VM_STATE);
 
-    HRESULT rc = E_FAIL;
+    HRESULT hrc = E_FAIL;
 
     /* query IInternalMachineControl interface */
@@ -449 +449 @@
      *  until the session is closed
      */
-    rc = aMachine->COMGETTER(Parent)(mVirtualBox.asOutParam());
-
-    if (SUCCEEDED(rc))
+    hrc = aMachine->COMGETTER(Parent)(mVirtualBox.asOutParam());
+
+    if (SUCCEEDED(hrc))
     {
         /*
@@ -472 +472 @@
     }
 
-    LogFlowThisFunc(("rc=%08X\n", rc));
+    LogFlowThisFunc(("hrc=%08X\n", hrc));
     LogFlowThisFuncLeave();
 
-    return rc;
+    return hrc;
 }
 
@@ -519 +519 @@
     AutoCaller autoCaller(this);
 
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
 
     if (getObjectState().getState() == ObjectState::Ready)
@@ -547 +547 @@
 
         /* close ourselves */
-        rc = i_unlockMachine(false /* aFinalRelease */, true /* aFromServer */, alock);
+        hrc = i_unlockMachine(false /* aFinalRelease */, true /* aFromServer */, alock);
     }
     else if (getObjectState().getState() == ObjectState::InUninit)
@@ -560 +560 @@
     {
         Log1WarningThisFunc(("UNEXPECTED uninitialization!\n"));
-        rc = autoCaller.rc();
-    }
-
-    LogFlowThisFunc(("rc=%08X\n", rc));
+        hrc = autoCaller.rc();
+    }
+
+    LogFlowThisFunc(("hrc=%08X\n", hrc));
     LogFlowThisFuncLeave();
 
-    return rc;
+    return hrc;
 }
 
@@ -1117 +1117 @@
 
     bool fLeftPaused = false;
-    HRESULT rc = mConsole->i_saveState(aReason, aProgress, aSnapshot, aStateFilePath, !!aPauseVM, fLeftPaused);
+    HRESULT hrc = mConsole->i_saveState(aReason, aProgress, aSnapshot, aStateFilePath, !!aPauseVM, fLeftPaused);
     if (aLeftPaused)
         *aLeftPaused = fLeftPaused;
-    return rc;
+    return hrc;
 #else
     RT_NOREF(aReason, aProgress, aSnapshot, aStateFilePath, aPauseVM, aLeftPaused);
@@ -1238 +1238 @@
 
         LogFlowThisFunc(("Calling mControl->OnSessionEnd()...\n"));
-        HRESULT rc = mControl->OnSessionEnd(this, progress.asOutParam());
-        LogFlowThisFunc(("mControl->OnSessionEnd()=%08X\n", rc));
+        HRESULT hrc = mControl->OnSessionEnd(this, progress.asOutParam());
+        LogFlowThisFunc(("mControl->OnSessionEnd()=%08X\n", hrc));
 
         aLockW.acquire();
@@ -1250 +1250 @@
          *        ObjectState::addCaller.
          */
-        if (mType != SessionType_WriteLock && (rc == E_UNEXPECTED || rc == E_ACCESSDENIED))
-            rc = S_OK;
+        if (mType != SessionType_WriteLock && (hrc == E_UNEXPECTED || hrc == E_ACCESSDENIED))
+            hrc = S_OK;
 
 #if !defined(DEBUG_bird) && !defined(DEBUG_andy) /* I don't want clients crashing on me just because VBoxSVC went belly up. */
-        AssertComRC(rc);
+        AssertComRC(hrc);
 #endif
     }