Changeset 16530 in vbox for trunk/src/VBox/Frontends/VBoxSDL

Timestamp:

Feb 5, 2009 4:08:49 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

42461

Message:

Main: rework error macros everywhere; make error messages much more readable (esp. with VBoxManage); use shared function to actually print message; reduces size of VBoxManage debug build from 3.4 to 2.3 MB

File:

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

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -30 +30 @@
 #include <VBox/com/array.h>
 #include <VBox/com/ErrorInfo.h>
+#include <VBox/com/errorprint2.h>
+
 #include <VBox/com/EventQueue.h>
 #include <VBox/com/VirtualBox.h>
@@ -813 +815 @@
     {
         Bstr formatVersion;
-        CHECK_RC_BREAK (virtualBox->
-                        COMGETTER(SettingsFormatVersion) (formatVersion.asOutParam()));
+        CHECK_ERROR_BREAK(virtualBox, COMGETTER(SettingsFormatVersion) (formatVersion.asOutParam()));
 
         bool isGlobalConverted = false;
@@ -823 +824 @@
 
         com::SafeIfaceArray <IMachine> machines;
-        CHECK_RC_BREAK (virtualBox->
-                        COMGETTER(Machines2) (ComSafeArrayAsOutParam (machines)));
+        CHECK_ERROR_BREAK(virtualBox, COMGETTER(Machines2) (ComSafeArrayAsOutParam (machines)));
 
         for (size_t i = 0; i < machines.size(); ++ i)
         {
             BOOL accessible;
-            CHECK_RC_BREAK (machines [i]->
-                            COMGETTER(Accessible) (&accessible));
+            CHECK_ERROR_BREAK(machines[i], COMGETTER(Accessible) (&accessible));
             if (!accessible)
                 continue;
 
-            CHECK_RC_BREAK (machines [i]->
-                            COMGETTER(SettingsFileVersion) (version.asOutParam()));
+            CHECK_ERROR_BREAK(machines[i], COMGETTER(SettingsFileVersion) (version.asOutParam()));
 
             if (version != formatVersion)
@@ -841 +839 @@
                 cvtMachines.push_back (machines [i]);
                 Bstr filePath;
-                CHECK_RC_BREAK (machines [i]->
-                                COMGETTER(SettingsFilePath) (filePath.asOutParam()));
+                CHECK_ERROR_BREAK(machines[i], COMGETTER(SettingsFilePath) (filePath.asOutParam()));
                 fileList.push_back (Utf8StrFmt ("%ls  (%ls)", filePath.raw(),
                                                 version.raw()));
@@ -848 +845 @@
         }
 
-        CHECK_RC_BREAK (rc);
-
-        CHECK_RC_BREAK (virtualBox->
-                        COMGETTER(SettingsFileVersion) (version.asOutParam()));
+        if (FAILED(rc))
+            break;
+
+        CHECK_ERROR_BREAK(virtualBox, COMGETTER(SettingsFileVersion) (version.asOutParam()));
         if (version != formatVersion)
         {
             isGlobalConverted = true;
-            CHECK_RC_BREAK (virtualBox->
-                            COMGETTER(SettingsFilePath) (filePath.asOutParam()));
+            CHECK_ERROR_BREAK(virtualBox, COMGETTER(SettingsFilePath) (filePath.asOutParam()));
             fileList.push_back (Utf8StrFmt ("%ls  (%ls)", filePath.raw(),
                                             version.raw()));
@@ -908 +904 @@
             {
                 Guid id;
-                CHECK_RC_BREAK ((*m)->COMGETTER(Id) (id.asOutParam()));
+                CHECK_ERROR_BREAK((*m), COMGETTER(Id) (id.asOutParam()));
 
                 /* open a session for the VM */
@@ -914 +910 @@
 
                 ComPtr <IMachine> sm;
-                CHECK_RC_BREAK (session->COMGETTER(Machine) (sm.asOutParam()));
+                CHECK_ERROR_BREAK(session, COMGETTER(Machine) (sm.asOutParam()));
 
                 Bstr bakFileName;
@@ -924 +920 @@
                 session->Close();
 
-                CHECK_RC_BREAK (rc);
-            }
-
-            CHECK_RC_BREAK (rc);
+                if (FAILED(rc))
+                    break;
+            }
+
+            if (FAILED(rc))
+                break;
 
             if (isGlobalConverted)
@@ -938 +936 @@
             }
 
-            CHECK_RC_BREAK (rc);
+            if (FAILED(rc))
+                break;
         }
     }