Changeset 81040 in vbox for trunk/src/VBox/Additions/x11/VBoxClient/testcase

Timestamp:

Sep 27, 2019 9:45:46 AM (5 years ago)

Author:

vboxsync

Message:

Additions/VBoxClient: Revamped and unified local logging infrastructure; cleaned up a lot of different logging styles / ways. Fixed logging memory leaks.

Location:

trunk/src/VBox/Additions/x11/VBoxClient/testcase

Files:

• tstSeamlessX11-auto.cpp (modified) (1 diff)
• tstSeamlessX11.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/testcase/tstSeamlessX11-auto.cpp

@@ -46 +46 @@
 #define TEST_ROOT ((Window)1)
 
-extern void vbclFatalError(char *psz)
-{
-    RTPrintf("Fatal error: %s\n", psz);
+void VBClLogError(const char *pszFormat, ...)
+{
+    va_list args;
+    va_start(args, pszFormat);
+    char *psz = NULL;
+    RTStrAPrintfV(&psz, pszFormat, args);
+    va_end(args);
+
+    AssertPtr(psz);
+    RTPrintf("Error: %s", psz);
+
+    RTStrFree(psz);
+}
+
+/** Exit with a fatal error. */
+void VBClLogFatalError(const char *pszFormat, ...)
+{
+    va_list args;
+    va_start(args, pszFormat);
+    char *psz = NULL;
+    RTStrAPrintfV(&psz, pszFormat, args);
+    va_end(args);
+
+    AssertPtr(psz);
+    RTPrintf("Fatal error: %s", psz);
+
+    RTStrFree(psz);
+
     exit(1);
 }

trunk/src/VBox/Additions/x11/VBoxClient/testcase/tstSeamlessX11.cpp

@@ -21 +21 @@
 #include <iprt/initterm.h>
 #include <iprt/semaphore.h>
+#include <iprt/string.h>
 #include <iprt/stream.h>
 #include <VBox/VBoxGuestLib.h>
@@ -28 +29 @@
 static RTSEMEVENT eventSem;
 
+void VBClLogError(const char *pszFormat, ...)
+{
+    va_list args;
+    va_start(args, pszFormat);
+    char *psz = NULL;
+    RTStrAPrintfV(&psz, pszFormat, args);
+    va_end(args);
+
+    AssertPtr(psz);
+    RTPrintf("Error: %s", psz);
+
+    RTStrFree(psz);
+}
+
 /** Exit with a fatal error. */
-void vbclFatalError(char *pszMessage)
+void VBClLogFatalError(const char *pszFormat, ...)
 {
-    RTPrintf("Fatal error: %s", pszMessage);
+    va_list args;
+    va_start(args, pszFormat);
+    char *psz = NULL;
+    RTStrAPrintfV(&psz, pszFormat, args);
+    va_end(args);
+
+    AssertPtr(psz);
+    RTPrintf("Fatal error: %s", psz);
+
+    RTStrFree(psz);
+
     exit(1);
 }