Changeset 98264 in vbox for trunk/src

Timestamp:

Jan 24, 2023 9:12:26 AM (2 years ago)

Author:

vboxsync

Message:

iprt/cpp/xml.h,Main: Added EIPRTFailure::getStatus() as an alternative to rc() to avoid having scm getting upset about ambigous 'rc' term. bugref:10223

Location:

trunk/src/VBox/Main

Files:

• src-client/ConsoleImpl.cpp (modified) (1 diff)
• src-server/DHCPServerImpl.cpp (modified) (1 diff)
• src-server/VirtualBoxImpl.cpp (modified) (1 diff)

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

@@ -6260 +6260 @@
         if (FAILED(autoVMCaller.hrc()))
         {
-            LogFlowThisFunc(("Detach request ignored (mMachineState=%d).\n",
-                              mMachineState));
+            LogFlowThisFunc(("Detach request ignored (mMachineState=%d).\n", mMachineState));
             return autoVMCaller.hrc();
         }

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

@@ -1006 +1006 @@
         catch (const xml::EIPRTFailure &e)
         {
-            vrc = e.rc();
+            vrc = e.getStatus();
             LogThisFunc(("caught xml::EIPRTFailure: rc=%Rrc (attempt %u, msg=%s)\n", vrc, uReadAttempt, e.what()));
             if (   (   vrc == VERR_FILE_NOT_FOUND

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

@@ -608 +608 @@
             // only if the main settings file does not exist, create it,
             // if there's something more serious, then do fail!
-            if (e.rc() == VERR_FILE_NOT_FOUND)
+            if (e.getStatus() == VERR_FILE_NOT_FOUND)
                 fCreate = true;
             else