Changeset 16580 in vbox for trunk

Timestamp:

Feb 9, 2009 12:07:53 PM (16 years ago)

Author:

vboxsync

Message:

Main: make new error functions more granular

Location:

trunk

Files:

• include/VBox/com/errorprint2.h (modified) (1 diff)
• src/VBox/Main/glue/errorprint2.cpp (modified) (2 diffs)

trunk/include/VBox/com/errorprint2.h

@@ -39 +39 @@
 // compiled only once for all front-ends
 void GluePrintErrorInfo(com::ErrorInfo &info);
+void GluePrintErrorContext(const char *pcszContext, const char *pcszSourceFile, uint32_t ulLine);
 void GluePrintRCMessage(HRESULT rc);
 void GlueHandleComError(ComPtr<IUnknown> iface, const char *pcszContext, HRESULT rc, const char *pcszSourceFile, uint32_t ulLine);

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

@@ -50 +50 @@
 }
 
+void GluePrintErrorContext(const char *pcszContext, const char *pcszSourceFile, uint32_t ulLine)
+{
+    // pcszSourceFile comes from __FILE__ macro, which always contains the full path,
+    // which we don't want to see printed:
+    Utf8Str strFilename(RTPathFilename(pcszSourceFile));
+    Utf8Str str = Utf8StrFmt("Context: \"%s\" at line %d of file %s\n",
+                                pcszContext,
+                                ulLine,
+                                strFilename.c_str());
+    // print and log
+    RTPrintf("%s", str.c_str());
+    Log(("%s", str.c_str()));
+}
+
 void GluePrintRCMessage(HRESULT rc)
 {
@@ -67 +81 @@
     com::ErrorInfo info(iface);
     if (info.isFullAvailable() || info.isBasicAvailable())
-    {
         GluePrintErrorInfo(info);
-
-        // pcszSourceFile comes from __FILE__ macro, which always contains the full path,
-        // which we don't want to see printed:
-        Utf8Str strFilename(RTPathFilename(pcszSourceFile));
-        Utf8Str str = Utf8StrFmt("Context: \"%s\" at line %d of file %s\n",
-                                 pcszContext,
-                                 ulLine,
-                                 strFilename.c_str());
-        // print and log
-        RTPrintf("%s", str.c_str());
-        Log(("%s", str.c_str()));
-    }
+    GluePrintErrorContext(pcszContext, pcszSourceFile, ulLine);
 }