Changeset 94954 in vbox

Timestamp:

May 9, 2022 12:03:01 PM (3 years ago)

Author:

vboxsync

Message:

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

File:

• trunk/src/VBox/Main/src-client/GuestImpl.cpp (modified) (9 diffs)

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

@@ -247 +247 @@
 
     uint8_t uInstance;
-    int rc = RTStrToUInt8Ex(pszLastSlash, NULL, 10, &uInstance);
-    AssertLogRelMsgReturn(RT_SUCCESS(rc) && rc != VWRN_NUMBER_TOO_BIG && rc != VWRN_NEGATIVE_UNSIGNED,
-                          ("%Rrc '%s'\n", rc, pszName), VINF_SUCCESS)
+    int vrc = RTStrToUInt8Ex(pszLastSlash, NULL, 10, &uInstance);
+    AssertLogRelMsgReturn(RT_SUCCESS(vrc) && vrc != VWRN_NUMBER_TOO_BIG && vrc != VWRN_NEGATIVE_UNSIGNED,
+                          ("%Rrc '%s'\n", vrc, pszName), VINF_SUCCESS)
 #endif
 
@@ -302 +302 @@
     if (ptrVM.isOk())
     {
-        int rc;
+        int vrc;
 
         /*
@@ -312 +312 @@
             /* Query the missing per-VM memory statistics. */
             uint64_t cbTotalMemIgn, cbPrivateMemIgn, cbZeroMemIgn;
-            rc = ptrVM.vtable()->pfnPGMR3QueryMemoryStats(ptrVM.rawUVM(), &cbTotalMemIgn, &cbPrivateMemIgn,
-                                                          &cbSharedMem, &cbZeroMemIgn);
-            if (rc == VINF_SUCCESS)
+            vrc = ptrVM.vtable()->pfnPGMR3QueryMemoryStats(ptrVM.rawUVM(), &cbTotalMemIgn, &cbPrivateMemIgn,
+                                                           &cbSharedMem, &cbZeroMemIgn);
+            if (vrc == VINF_SUCCESS)
                 validStats |= pm::VMSTATMASK_GUEST_MEMSHARED;
         }
@@ -320 +320 @@
         if (mCollectVMMStats)
         {
-            rc = ptrVM.vtable()->pfnPGMR3QueryGlobalMemoryStats(ptrVM.rawUVM(), &cbAllocTotal, &cbFreeTotal,
-                                                                &cbBalloonedTotal, &cbSharedTotal);
-            AssertRC(rc);
-            if (rc == VINF_SUCCESS)
+            vrc = ptrVM.vtable()->pfnPGMR3QueryGlobalMemoryStats(ptrVM.rawUVM(), &cbAllocTotal, &cbFreeTotal,
+                                                                 &cbBalloonedTotal, &cbSharedTotal);
+            AssertRC(vrc);
+            if (vrc == VINF_SUCCESS)
                 validStats |= pm::VMSTATMASK_VMM_ALLOC  | pm::VMSTATMASK_VMM_FREE
                            |  pm::VMSTATMASK_VMM_BALOON | pm::VMSTATMASK_VMM_SHARED;
@@ -331 +331 @@
         uint64_t uTxPrev = mNetStatTx;
         mNetStatRx = mNetStatTx = 0;
-        rc = ptrVM.vtable()->pfnSTAMR3Enum(ptrVM.rawUVM(), "/Public/Net/*/Bytes*", i_staticEnumStatsCallback, this);
-        AssertRC(rc);
+        vrc = ptrVM.vtable()->pfnSTAMR3Enum(ptrVM.rawUVM(), "/Public/Net/*/Bytes*", i_staticEnumStatsCallback, this);
+        AssertRC(vrc);
 
         uint64_t uTsNow = RTTimeNanoTS();
@@ -709 +709 @@
 
     uint64_t cbFreeTotal, cbAllocTotal, cbBalloonedTotal, cbSharedTotal;
-    int rc = ptrVM.vtable()->pfnPGMR3QueryGlobalMemoryStats(ptrVM.rawUVM(), &cbAllocTotal, &cbFreeTotal,
-                                                            &cbBalloonedTotal, &cbSharedTotal);
-    AssertRCReturn(rc, E_FAIL);
+    int vrc = ptrVM.vtable()->pfnPGMR3QueryGlobalMemoryStats(ptrVM.rawUVM(), &cbAllocTotal, &cbFreeTotal,
+                                                             &cbBalloonedTotal, &cbSharedTotal);
+    AssertRCReturn(vrc, E_FAIL);
 
     *aMemAllocTotal   = (ULONG)(cbAllocTotal / _1K);  /* bytes -> KB */
@@ -720 +720 @@
     /* Query the missing per-VM memory statistics. */
     uint64_t cbTotalMemIgn, cbPrivateMemIgn, cbSharedMem, cbZeroMemIgn;
-    rc = ptrVM.vtable()->pfnPGMR3QueryMemoryStats(ptrVM.rawUVM(), &cbTotalMemIgn, &cbPrivateMemIgn, &cbSharedMem, &cbZeroMemIgn);
-    AssertRCReturn(rc, E_FAIL);
+    vrc = ptrVM.vtable()->pfnPGMR3QueryMemoryStats(ptrVM.rawUVM(), &cbTotalMemIgn, &cbPrivateMemIgn, &cbSharedMem, &cbZeroMemIgn);
+    AssertRCReturn(vrc, E_FAIL);
     *aMemShared = (ULONG)(cbSharedMem / _1K);
 
@@ -813 +813 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
     switch (aLevel)
     {
@@ -829 +829 @@
 
         default:
-            rc = setError(VBOX_E_NOT_SUPPORTED,
-                          tr("Invalid status level defined: %u"), aLevel);
+            hrc = setError(VBOX_E_NOT_SUPPORTED,
+                           tr("Invalid status level defined: %u"), aLevel);
             break;
     }
 
-    return rc;
-}
+    return hrc;
+}
+
 HRESULT Guest::setCredentials(const com::Utf8Str &aUserName, const com::Utf8Str &aPassword,
                               const com::Utf8Str &aDomain, BOOL aAllowInteractiveLogon)