Changeset 94926 in vbox for trunk/src/VBox/Main/src-client/VirtualBoxClientImpl.cpp

Timestamp:

May 8, 2022 7:57:08 PM (3 years ago)

Author:

vboxsync

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

151334

Message:

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

File:

• trunk/src/VBox/Main/src-client/VirtualBoxClientImpl.cpp (modified) (16 diffs)

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

@@ -141 +141 @@
 HRESULT VirtualBoxClient::FinalConstruct()
 {
-    HRESULT rc = init();
+    HRESULT hrc = init();
     BaseFinalConstruct();
-    return rc;
+    return hrc;
 }
 
@@ -177 +177 @@
      * unhelpful ones which cause us a lot of grief with troubleshooting. */
 
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
     try
     {
@@ -186 +186 @@
         mData.m_SemEvWatcher = NIL_RTSEMEVENT;
 
-        rc = mData.m_pVirtualBox.createLocalObject(CLSID_VirtualBox);
-        if (FAILED(rc))
+        hrc = mData.m_pVirtualBox.createLocalObject(CLSID_VirtualBox);
+        if (FAILED(hrc))
 #ifdef RT_OS_WINDOWS
-            throw i_investigateVirtualBoxObjectCreationFailure(rc);
+            throw i_investigateVirtualBoxObjectCreationFailure(hrc);
 #else
-            throw rc;
+            throw hrc;
 #endif
 
         /* VirtualBox error return is postponed to method calls, fetch it. */
         ULONG rev;
-        rc = mData.m_pVirtualBox->COMGETTER(Revision)(&rev);
-        if (FAILED(rc))
-            throw rc;
-
-        rc = unconst(mData.m_pEventSource).createObject();
-        AssertComRCThrow(rc, setError(rc, "Could not create EventSource for VirtualBoxClient"));
-        rc = mData.m_pEventSource->init();
-        AssertComRCThrow(rc, setError(rc, "Could not initialize EventSource for VirtualBoxClient"));
+        hrc = mData.m_pVirtualBox->COMGETTER(Revision)(&rev);
+        if (FAILED(hrc))
+            throw hrc;
+
+        hrc = unconst(mData.m_pEventSource).createObject();
+        AssertComRCThrow(hrc, setError(hrc, "Could not create EventSource for VirtualBoxClient"));
+        hrc = mData.m_pEventSource->init();
+        AssertComRCThrow(hrc, setError(hrc, "Could not initialize EventSource for VirtualBoxClient"));
 
         /* HACK ALERT! This is for DllCanUnloadNow(). */
@@ -226 +226 @@
             if (RT_SUCCESS(vrc))
             {
-                rc = i_reloadApiLanguage();
-                if (SUCCEEDED(rc))
+                hrc = i_reloadApiLanguage();
+                if (SUCCEEDED(hrc))
                     i_registerEventListener(); /* for updates */
                 else
-                    LogRelFunc(("i_reloadApiLanguage failed: %Rhrc\n", rc));
+                    LogRelFunc(("i_reloadApiLanguage failed: %Rhrc\n", hrc));
             }
             else
@@ -245 +245 @@
         {
             mData.m_SemEvWatcher = NIL_RTSEMEVENT;
-            AssertRCStmt(vrc, throw setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Failed to create semaphore (rc=%Rrc)"), vrc));
+            AssertRCStmt(vrc, throw setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Failed to create semaphore (vrc=%Rrc)"), vrc));
         }
 
@@ -254 +254 @@
             RTSemEventDestroy(mData.m_SemEvWatcher);
             mData.m_SemEvWatcher = NIL_RTSEMEVENT;
-            AssertRCStmt(vrc, throw setErrorBoth(VBOX_E_IPRT_ERROR, vrc,  tr("Failed to create watcher thread (rc=%Rrc)"), vrc));
+            AssertRCStmt(vrc, throw setErrorBoth(VBOX_E_IPRT_ERROR, vrc,  tr("Failed to create watcher thread (vrc=%Rrc)"), vrc));
         }
     }
@@ -260 +260 @@
     {
         /* we assume that error info is set by the thrower */
-        rc = err;
+        hrc = err;
     }
     catch (...)
     {
-        rc = VirtualBoxBase::handleUnexpectedExceptions(this, RT_SRC_POS);
+        hrc = VirtualBoxBase::handleUnexpectedExceptions(this, RT_SRC_POS);
     }
 
     /* Confirm a successful initialization when it's the case. Must be last,
      * as on failure it will uninitialize the object. */
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
         autoInitSpan.setSucceeded();
     else
-        autoInitSpan.setFailed(rc);
-
-    LogFlowThisFunc(("rc=%Rhrc\n", rc));
+        autoInitSpan.setFailed(hrc);
+
+    LogFlowThisFunc(("hrc=%Rhrc\n", hrc));
     LogFlowThisFuncLeave();
     /* Unconditionally return success, because the error return is delayed to
@@ -641 +641 @@
     /* this is not stored in this object, no need to lock */
     ComPtr<ISession> pSession;
-    HRESULT rc = pSession.createInprocObject(CLSID_Session);
-    if (SUCCEEDED(rc))
+    HRESULT hrc = pSession.createInprocObject(CLSID_Session);
+    if (SUCCEEDED(hrc))
         aSession = pSession;
-    return rc;
+    return hrc;
 }
 
@@ -672 +672 @@
 {
     BOOL fAccessible = FALSE;
-    HRESULT rc = aMachine->COMGETTER(Accessible)(&fAccessible);
-    if (FAILED(rc))
-        return setError(rc, tr("Could not check the accessibility status of the VM"));
+    HRESULT hrc = aMachine->COMGETTER(Accessible)(&fAccessible);
+    if (FAILED(hrc))
+        return setError(hrc, tr("Could not check the accessibility status of the VM"));
     else if (!fAccessible)
     {
         ComPtr<IVirtualBoxErrorInfo> pAccessError;
-        rc = aMachine->COMGETTER(AccessError)(pAccessError.asOutParam());
-        if (FAILED(rc))
-            return setError(rc, tr("Could not get the access error message of the VM"));
+        hrc = aMachine->COMGETTER(AccessError)(pAccessError.asOutParam());
+        if (FAILED(hrc))
+            return setError(hrc, tr("Could not get the access error message of the VM"));
         else
         {
@@ -705 +705 @@
     RTSEMEVENT sem = pThis->mData.m_SemEvWatcher;
     RTMSINTERVAL cMillies = VBOXCLIENT_DEFAULT_INTERVAL;
-    int vrc;
 
     /* The likelihood of early crashes are high, so start with a short wait. */
-    vrc = RTSemEventWait(sem, cMillies / 2);
+    int vrc = RTSemEventWait(sem, cMillies / 2);
 
     /* As long as the waiting times out keep retrying the wait. */
@@ -714 +713 @@
     {
         {
-            HRESULT rc = S_OK;
+            HRESULT hrc = S_OK;
             ComPtr<IVirtualBox> pV;
             {
@@ -723 +722 @@
             {
                 ULONG rev;
-                rc = pV->COMGETTER(Revision)(&rev);
-                if (FAILED_DEAD_INTERFACE(rc))
+                hrc = pV->COMGETTER(Revision)(&rev);
+                if (FAILED_DEAD_INTERFACE(hrc))
                 {
-                    LogRel(("VirtualBoxClient: detected unresponsive VBoxSVC (rc=%Rhrc)\n", rc));
+                    LogRel(("VirtualBoxClient: detected unresponsive VBoxSVC (hrc=%Rhrc)\n", hrc));
                     {
                         AutoWriteLock alock(pThis COMMA_LOCKVAL_SRC_POS);
@@ -744 +743 @@
                 ComPtr<IVirtualBox> pVirtualBox;
                 ComPtr<IToken> pToken;
-                rc = pVirtualBox.createLocalObject(CLSID_VirtualBox);
-                if (FAILED(rc))
+                hrc = pVirtualBox.createLocalObject(CLSID_VirtualBox);
+                if (FAILED(hrc))
                     cMillies = 3 * VBOXCLIENT_DEFAULT_INTERVAL;
                 else
                 {
-                    LogRel(("VirtualBoxClient: detected working VBoxSVC (rc=%Rhrc)\n", rc));
+                    LogRel(("VirtualBoxClient: detected working VBoxSVC (hrc=%Rhrc)\n", hrc));
                     {
                         AutoWriteLock alock(pThis COMMA_LOCKVAL_SRC_POS);
@@ -779 +778 @@
         return S_OK;
 
-    HRESULT rc = mData.m_pVBoxTranslator->loadLanguage(mData.m_pVirtualBox);
-    if (FAILED(rc))
-        setError(rc, tr("Failed to load user language instance"));
-    return rc;
+    HRESULT hrc = mData.m_pVBoxTranslator->loadLanguage(mData.m_pVirtualBox);
+    if (FAILED(hrc))
+        setError(hrc, tr("Failed to load user language instance"));
+    return hrc;
 }
 
 HRESULT VirtualBoxClient::i_registerEventListener()
 {
-    HRESULT rc = mData.m_pVirtualBox->COMGETTER(EventSource)(mData.m_pVBoxEventSource.asOutParam());
-    if (SUCCEEDED(rc))
+    HRESULT hrc = mData.m_pVirtualBox->COMGETTER(EventSource)(mData.m_pVBoxEventSource.asOutParam());
+    if (SUCCEEDED(hrc))
     {
         ComObjPtr<VBoxEventListenerImpl> pVBoxListener;
@@ -796 +795 @@
         com::SafeArray<VBoxEventType_T> eventTypes;
         eventTypes.push_back(VBoxEventType_OnLanguageChanged);
-        rc = mData.m_pVBoxEventSource->RegisterListener(pVBoxListener, ComSafeArrayAsInParam(eventTypes), true);
-        if (FAILED(rc))
-        {
-            rc = setError(rc, tr("Failed to register listener"));
+        hrc = mData.m_pVBoxEventSource->RegisterListener(pVBoxListener, ComSafeArrayAsInParam(eventTypes), true);
+        if (FAILED(hrc))
+        {
+            hrc = setError(hrc, tr("Failed to register listener"));
             mData.m_pVBoxEventListener.setNull();
             mData.m_pVBoxEventSource.setNull();
@@ -805 +804 @@
     }
     else
-        rc = setError(rc, tr("Failed to get event source from VirtualBox"));
-    return rc;
+        hrc = setError(hrc, tr("Failed to get event source from VirtualBox"));
+    return hrc;
 }