Changeset 8309 in vbox

Timestamp:

Apr 22, 2008 7:17:24 PM (17 years ago)

Author:

vboxsync

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

30066

Message:

Main/Glue: Removed ErrorInfo::print() (functionality moved back to PRINT_ERROR_INFO macro).

Location:

trunk

Files:

• include/VBox/com/ErrorInfo.h (modified) (3 diffs)
• include/VBox/com/assert.h (modified) (2 diffs)
• src/VBox/Frontends/VBoxManage/VBoxManage.cpp (modified) (1 diff)
• src/VBox/Main/glue/ErrorInfo.cpp (modified) (1 diff)

trunk/include/VBox/com/ErrorInfo.h

@@ -195 +195 @@
     bool isFullAvailable() const { return mIsFullAvailable; }
 
-    /** 
+    /**
      *  Returns @c true if both isBasicAvailable() and isFullAvailable() are
-     *  @c false. 
+     *  @c false.
      */
     bool isNull() const { return !mIsBasicAvailable && !mIsFullAvailable; }
@@ -248 +248 @@
      */
     const Bstr &getCalleeName() const { return mCalleeName; }
-
-    /**
-     *  Prints error information stored in this instance to the console.
-     *  Intended mainly for debugging and for simple command-line tools.
-     *
-     *  @param aPrefix  optional prefix
-     */
-    void print (const char *aPrefix = NULL);
 
     /**
@@ -382 +374 @@
     ~ErrorInfoKeeper() { if (!mForgot) restore(); }
 
-    /** 
+    /**
      *  Tries to (re-)fetch error info set on the current thread.  On success,
      *  the previous error information, if any, will be overwritten with the

trunk/include/VBox/com/assert.h

@@ -159 +159 @@
 #define PRINT_ERROR_INFO(info) \
     do { \
-        info.print ("[!] "); \
+        RTPrintf ("[!] Full error info present: %RTbool, basic error info present: %RTbool\n", \
+                  info.isFullAvailable(), info.isBasicAvailable()); \
+        Log (("[!] Full error info present: %RTbool, basic error info present: %RTbool\n", \
+              info.isFullAvailable(), info.isBasicAvailable())); \
+        if (info.isFullAvailable() || info.isBasicAvailable()) { \
+            RTPrintf ("[!] Result Code = %Rwa\n", info.getResultCode()); \
+            RTPrintf ("[!] Text        = %ls\n", info.getText().raw()); \
+            RTPrintf ("[!] Component   = %ls, Interface: %ls, {%Vuuid}\n", \
+                      info.getComponent().raw(), info.getInterfaceName().raw(), \
+                      info.getInterfaceID().raw()); \
+            RTPrintf ("[!] Callee      = %ls, {%Vuuid}\n", \
+                      info.getCalleeName().raw(), info.getCalleeIID().raw()); \
+            Log (("[!] Result Code = %Rwa\n", info.getResultCode())); \
+            Log (("[!] Text        = %ls\n", info.getText().raw())); \
+            Log (("[!] Component   = %ls, Interface: %ls, {%Vuuid}\n", \
+                  info.getComponent().raw(), info.getInterfaceName().raw(), \
+                  info.getInterfaceID().raw())); \
+            Log (("[!] Callee      = %ls, {%Vuuid}\n", \
+                  info.getCalleeName().raw(), info.getCalleeIID().raw())); \
+        } \
     } while (0)
 
@@ -210 +229 @@
         if (FAILED(rc)) { \
             com::ErrorInfo info (iface); \
-            info.print ("[!] "); \
+            PRINT_ERROR_INFO (info); \
         } \
     } while (0)

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

@@ -831 +831 @@
             RTPrintf ("Access error details:\n");
             ErrorInfo ei (accessError);
-            ei.print ("[-] ");
+            PRINT_ERROR_INFO (ei);
             RTPrintf ("\n");
         }

trunk/src/VBox/Main/glue/ErrorInfo.cpp

@@ -221 +221 @@
 }
 
-void ErrorInfo::print (const char *aPrefix /* = NULL */)
-{
-    if (aPrefix == NULL)
-        aPrefix = "";
-
-    RTPrintf ("%sFull error info present: %RTbool, basic error info present: %RTbool\n", aPrefix,
-              mIsFullAvailable, mIsBasicAvailable);
-    if (mIsFullAvailable || mIsBasicAvailable)
-    {
-        RTPrintf ("%sResult Code = %Rwa\n", aPrefix, mResultCode);
-        RTPrintf ("%sText        = %ls\n", aPrefix, mText.raw());
-        RTPrintf ("%sComponent   = %ls, Interface: %ls, {%s}\n", aPrefix,
-                  mComponent.raw(), mInterfaceName.raw(), mInterfaceID.toString().raw());
-        RTPrintf ("%sCallee      = %ls, {%s}\n", aPrefix, mCalleeName.raw(), mCalleeIID.toString().raw());
-    }
-}
-
 // ProgressErrorInfo class
 ////////////////////////////////////////////////////////////////////////////////