Changeset 97363 in vbox for trunk/src/VBox/Main

Timestamp:

Nov 1, 2022 7:23:25 AM (2 years ago)

Author:

vboxsync

Message:

​bugref:10180 - Use hrc instead of rc for HRESULT.

File:

• trunk/src/VBox/Main/src-server/UnattendedImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/UnattendedImpl.cpp

@@ -4209 +4209 @@
 
     ComPtr<IMedium> ptrMedium;
-    HRESULT rc = mParent->OpenMedium(Bstr(pImage->strImagePath).raw(),
-                                     pImage->enmDeviceType,
-                                     pImage->enmAccessType,
-                                     true,
-                                     ptrMedium.asOutParam());
-    LogRelFlowFunc(("VirtualBox::openMedium -> %Rhrc\n", rc));
-    if (SUCCEEDED(rc))
+    HRESULT hrc = mParent->OpenMedium(Bstr(pImage->strImagePath).raw(),
+                                      pImage->enmDeviceType,
+                                      pImage->enmAccessType,
+                                      true,
+                                      ptrMedium.asOutParam());
+    LogRelFlowFunc(("VirtualBox::openMedium -> %Rhrc\n", hrc));
+    if (SUCCEEDED(hrc))
     {
         if (pImage->fAuxiliary && pImage->strImagePath.endsWith(".viso"))
         {
-            rc = ptrMedium->SetProperty(Bstr(L"UnattendedInstall").raw(), Bstr(L"1").raw());
-            LogRelFlowFunc(("Medium::SetProperty -> %Rhrc\n", rc));
+            hrc = ptrMedium->SetProperty(Bstr(L"UnattendedInstall").raw(), Bstr(L"1").raw());
+            LogRelFlowFunc(("Medium::SetProperty -> %Rhrc\n", hrc));
         }
 
@@ -4226 +4226 @@
         {
             // mount the opened disk image
-            rc = rPtrSessionMachine->MountMedium(Bstr(pImage->strControllerName).raw(), pImage->iPort,
-                                                 pImage->iDevice, ptrMedium, TRUE /*fForce*/);
-            LogRelFlowFunc(("Machine::MountMedium -> %Rhrc\n", rc));
+            hrc = rPtrSessionMachine->MountMedium(Bstr(pImage->strControllerName).raw(), pImage->iPort,
+                                                  pImage->iDevice, ptrMedium, TRUE /*fForce*/);
+            LogRelFlowFunc(("Machine::MountMedium -> %Rhrc\n", hrc));
         }
         else
         {
             //attach the opened disk image to the controller
-            rc = rPtrSessionMachine->AttachDevice(Bstr(pImage->strControllerName).raw(), pImage->iPort,
-                                                  pImage->iDevice, pImage->enmDeviceType, ptrMedium);
-            LogRelFlowFunc(("Machine::AttachDevice -> %Rhrc\n", rc));
+            hrc = rPtrSessionMachine->AttachDevice(Bstr(pImage->strControllerName).raw(), pImage->iPort,
+                                                   pImage->iDevice, pImage->enmDeviceType, ptrMedium);
+            LogRelFlowFunc(("Machine::AttachDevice -> %Rhrc\n", hrc));
         }
     }
 
     rLock.acquire();
-    return rc;
+    return hrc;
 }