Changeset 95140 in vbox for trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestProp.cpp

Timestamp:

May 31, 2022 9:11:39 AM (3 years ago)

Author:

vboxsync

Message:

Frontends + Main: Adjust to the new rules wrt. to rc -> hrc,vrc usage. This also fixes quite a few bugs wrt shadow variables, wrong return values and output error translations / exit codes. Also see @todos added. ​​bugref:10223

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestProp.cpp (modified) (9 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestProp.cpp

@@ -52 +52 @@
 static RTEXITCODE handleGetGuestProperty(HandlerArg *a)
 {
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
 
     setCurrentSubcommand(HELP_SCOPE_GUESTPROPERTY_GET);
@@ -91 +91 @@
         }
     }
-    return SUCCEEDED(rc) ? RTEXITCODE_SUCCESS : RTEXITCODE_FAILURE;
+    return SUCCEEDED(hrc) ? RTEXITCODE_SUCCESS : RTEXITCODE_FAILURE;
 }
 
 static RTEXITCODE handleSetGuestProperty(HandlerArg *a)
 {
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
 
     setCurrentSubcommand(HELP_SCOPE_GUESTPROPERTY_SET);
@@ -146 +146 @@
                                                   Bstr(pszFlags).raw()));
 
-        if (SUCCEEDED(rc))
+        if (SUCCEEDED(hrc))
             CHECK_ERROR(machine, SaveSettings());
 
         a->session->UnlockMachine();
     }
-    return SUCCEEDED(rc) ? RTEXITCODE_SUCCESS : RTEXITCODE_FAILURE;
+    return SUCCEEDED(hrc) ? RTEXITCODE_SUCCESS : RTEXITCODE_FAILURE;
 }
 
 static RTEXITCODE handleDeleteGuestProperty(HandlerArg *a)
 {
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
 
     setCurrentSubcommand(HELP_SCOPE_GUESTPROPERTY_UNSET);
@@ -186 +186 @@
         CHECK_ERROR(machine, DeleteGuestProperty(Bstr(pszName).raw()));
 
-        if (SUCCEEDED(rc))
+        if (SUCCEEDED(hrc))
             CHECK_ERROR(machine, SaveSettings());
 
         a->session->UnlockMachine();
     }
-    return SUCCEEDED(rc) ? RTEXITCODE_SUCCESS : RTEXITCODE_FAILURE;
+    return SUCCEEDED(hrc) ? RTEXITCODE_SUCCESS : RTEXITCODE_FAILURE;
 }
 
@@ -226 +226 @@
      */
     ComPtr<IMachine> machine;
-    HRESULT rc;
+    HRESULT hrc;
     CHECK_ERROR(a->virtualBox, FindMachine(Bstr(a->argv[0]).raw(),
                                            machine.asOutParam()));
@@ -246 +246 @@
                                                       ComSafeArrayAsOutParam(timestamps),
                                                       ComSafeArrayAsOutParam(flags)));
-        if (SUCCEEDED(rc))
+        if (SUCCEEDED(hrc))
         {
             if (names.size() == 0)
@@ -255 +255 @@
         }
     }
-    return SUCCEEDED(rc) ? RTEXITCODE_SUCCESS : RTEXITCODE_FAILURE;
+    return SUCCEEDED(hrc) ? RTEXITCODE_SUCCESS : RTEXITCODE_FAILURE;
 }
 
@@ -280 +280 @@
         pszPatterns = a->argv[1];
     ComPtr<IMachine> machine;
-    HRESULT rc;
+    HRESULT hrc;
     CHECK_ERROR(a->virtualBox, FindMachine(Bstr(a->argv[0]).raw(),
                                            machine.asOutParam()));
@@ -334 +334 @@
 
         ComPtr<IEvent> ev;
-        rc = es->GetEvent(listener, cMsWait, ev.asOutParam());
-        if (ev)
+        hrc = es->GetEvent(listener, cMsWait, ev.asOutParam());
+        if (ev) /** @todo r=andy Why not using SUCCEEDED(hrc) here? */
         {
             VBoxEventType_T aType;
-            rc = ev->COMGETTER(Type)(&aType);
+            hrc = ev->COMGETTER(Type)(&aType);
             switch (aType)
             {