Changeset 8309

Timestamp:

04/22/08 21:17:24 (9 months ago)

Author:

vboxsync

Message:

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

Files:

• trunk/include/VBox/com/ErrorInfo.h (modified) (3 diffs)
• trunk/include/VBox/com/assert.h (modified) (2 diffs)
• trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp (modified) (1 diff)
• trunk/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
- 
+
-     */
-    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 { \
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    } 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
-////////////////////////////////////////////////////////////////////////////////