Changeset 94906 in vbox for trunk/src/VBox/Main/src-all

Timestamp:

May 7, 2022 4:21:06 PM (3 years ago)

Author:

vboxsync

Message:

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

File:

• trunk/src/VBox/Main/src-all/ProgressImpl.cpp (modified) (14 diffs)

trunk/src/VBox/Main/src-all/ProgressImpl.cpp

@@ -167 +167 @@
     AssertReturn(autoInitSpan.isOk(), E_FAIL);
 
-    HRESULT rc = unconst(pEventSource).createObject();
-    if (FAILED(rc))
-        return rc;
-
-    rc = pEventSource->init();
-    if (FAILED(rc))
-        return rc;
+    HRESULT hrc = unconst(pEventSource).createObject();
+    if (FAILED(hrc))
+        return hrc;
+
+    hrc = pEventSource->init();
+    if (FAILED(hrc))
+        return hrc;
 
 #if !defined(VBOX_COM_INPROC)
@@ -341 +341 @@
 HRESULT Progress::i_notifyComplete(HRESULT aResultCode)
 {
-    HRESULT rc;
+    HRESULT hrc;
     ComPtr<IVirtualBoxErrorInfo> errorInfo;
     if (FAILED(aResultCode))
@@ -348 +348 @@
 #if !defined(VBOX_WITH_XPCOM)
         ComPtr<IErrorInfo> err;
-        rc = ::GetErrorInfo(0, err.asOutParam());
-        if (rc == S_OK && err)
-            rc = err.queryInterfaceTo(errorInfo.asOutParam());
+        hrc = ::GetErrorInfo(0, err.asOutParam());
+        if (hrc == S_OK && err)
+            hrc = err.queryInterfaceTo(errorInfo.asOutParam());
 #else /* !defined(VBOX_WITH_XPCOM) */
         nsCOMPtr<nsIExceptionService> es;
-        es = do_GetService(NS_EXCEPTIONSERVICE_CONTRACTID, &rc);
-        if (NS_SUCCEEDED(rc))
+        es = do_GetService(NS_EXCEPTIONSERVICE_CONTRACTID, &hrc);
+        if (NS_SUCCEEDED(hrc))
         {
             nsCOMPtr <nsIExceptionManager> em;
-            rc = es->GetCurrentExceptionManager(getter_AddRefs(em));
-            if (NS_SUCCEEDED(rc))
+            hrc = es->GetCurrentExceptionManager(getter_AddRefs(em));
+            if (NS_SUCCEEDED(hrc))
             {
                 ComPtr<nsIException> ex;
-                rc = em->GetCurrentException(ex.asOutParam());
-                if (NS_SUCCEEDED(rc) && ex)
-                    rc = ex.queryInterfaceTo(errorInfo.asOutParam());
+                hrc = em->GetCurrentException(ex.asOutParam());
+                if (NS_SUCCEEDED(hrc) && ex)
+                    hrc = ex.queryInterfaceTo(errorInfo.asOutParam());
             }
         }
@@ -409 +409 @@
     Utf8Str text(aText, va);
     ComObjPtr<VirtualBoxErrorInfo> errorInfo;
-    HRESULT rc = errorInfo.createObject();
-    AssertComRCReturnRC(rc);
+    HRESULT hrc = errorInfo.createObject();
+    AssertComRCReturnRC(hrc);
     errorInfo->init(aResultCode, aIID, pcszComponent, text);
 
@@ -456 +456 @@
     Utf8Str text(pszFormat, va);
     ComObjPtr<VirtualBoxErrorInfo> errorInfo;
-    HRESULT rc = errorInfo.createObject();
-    AssertComRCReturnRC(rc);
+    HRESULT hrc = errorInfo.createObject();
+    AssertComRCReturnRC(hrc);
     errorInfo->initEx(aResultCode, vrc, aIID, pszComponent, text);
 
@@ -477 +477 @@
 {
     AutoCaller autoCaller(this);
-    AssertComRCReturn(autoCaller.rc(), false);
+    AssertReturn(autoCaller.isOk(), false);
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -924 +924 @@
     /* Note: no locking needed, because we just use public methods. */
 
-    HRESULT rc           = S_OK;
     BOOL fCancelable     = FALSE;
     BOOL fCompleted      = FALSE;
@@ -932 +931 @@
     ULONG cOp            = 0;
     /* Is the async process cancelable? */
-    rc = aProgressOther->COMGETTER(Cancelable)(&fCancelable);
-    if (FAILED(rc)) return rc;
+    HRESULT hrc = aProgressOther->COMGETTER(Cancelable)(&fCancelable);
+    if (FAILED(hrc)) return hrc;
 
     uint64_t u64StopTime = UINT64_MAX;
@@ -945 +944 @@
         if (fCancelable)
         {
-            rc = COMGETTER(Canceled)(&fCanceled);
-            if (FAILED(rc)) return rc;
+            hrc = COMGETTER(Canceled)(&fCanceled);
+            if (FAILED(hrc)) return hrc;
             if (fCanceled)
             {
-                rc = aProgressOther->Cancel();
-                if (FAILED(rc)) return rc;
+                hrc = aProgressOther->Cancel();
+                if (FAILED(hrc)) return hrc;
             }
         }
@@ -966 +965 @@
             for (;;)
             {
-                rc = aProgressOther->COMGETTER(Operation(&curOp));
-                if (FAILED(rc)) return rc;
+                hrc = aProgressOther->COMGETTER(Operation(&curOp));
+                if (FAILED(hrc)) return hrc;
                 if (cOp != curOp)
                 {
                     Bstr bstr;
                     ULONG currentWeight;
-                    rc = aProgressOther->COMGETTER(OperationDescription(bstr.asOutParam()));
-                    if (FAILED(rc)) return rc;
-                    rc = aProgressOther->COMGETTER(OperationWeight(&currentWeight));
-                    if (FAILED(rc)) return rc;
-                    rc = SetNextOperation(bstr.raw(), currentWeight);
-                    if (FAILED(rc)) return rc;
+                    hrc = aProgressOther->COMGETTER(OperationDescription(bstr.asOutParam()));
+                    if (FAILED(hrc)) return hrc;
+                    hrc = aProgressOther->COMGETTER(OperationWeight(&currentWeight));
+                    if (FAILED(hrc)) return hrc;
+                    hrc = SetNextOperation(bstr.raw(), currentWeight);
+                    if (FAILED(hrc)) return hrc;
                     ++cOp;
                 }
@@ -984 +983 @@
             }
 
-            rc = aProgressOther->COMGETTER(OperationPercent(&currentPercent));
-            if (FAILED(rc)) return rc;
+            hrc = aProgressOther->COMGETTER(OperationPercent(&currentPercent));
+            if (FAILED(hrc)) return hrc;
             if (currentPercent != prevPercent)
             {
                 prevPercent = currentPercent;
-                rc = SetCurrentOperationProgress(currentPercent);
-                if (FAILED(rc)) return rc;
+                hrc = SetCurrentOperationProgress(currentPercent);
+                if (FAILED(hrc)) return hrc;
             }
         }
@@ -1005 +1004 @@
             else if (u64RemainingMS > 200)
                 u64RemainingMS = 200;
-            rc = aProgressOther->WaitForCompletion((LONG)u64RemainingMS);
-            if (FAILED(rc)) return rc;
+            hrc = aProgressOther->WaitForCompletion((LONG)u64RemainingMS);
+            if (FAILED(hrc)) return hrc;
 
             if (RTTimeMilliTS() >= u64StopTime)
@@ -1014 +1013 @@
         {
             /* Make sure the loop is not too tight */
-            rc = aProgressOther->WaitForCompletion(200);
-            if (FAILED(rc)) return rc;
+            hrc = aProgressOther->WaitForCompletion(200);
+            if (FAILED(hrc)) return hrc;
         }
     }
@@ -1022 +1021 @@
      * back to the caller to make this as easy as possible. */
     LONG iRc;
-    rc = aProgressOther->COMGETTER(ResultCode)(&iRc);
-    if (FAILED(rc)) return rc;
+    hrc = aProgressOther->COMGETTER(ResultCode)(&iRc);
+    if (FAILED(hrc)) return hrc;
     if (FAILED((HRESULT)iRc))
     {
         setError(ProgressErrorInfo(aProgressOther));
-        rc = (HRESULT)iRc;
+        hrc = (HRESULT)iRc;
     }
 
     LogFlowThisFuncLeave();
-    return rc;
+    return hrc;
 }