Changeset 99689 in vbox for trunk/src/VBox/GuestHost

Timestamp:

May 9, 2023 8:28:38 AM (22 months ago)

Author:

vboxsync

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

157237

Message:

Guest Additions/VBoxClient: Dropped the idea of having an own logging facility (VBGHLogXXX) for shared guest/host code again; the (release) logger is flexible enough for this. bugref:10427

Location:

trunk/src/VBox/GuestHost

Files:

• DisplayServerType.cpp (modified) (7 diffs)
• Log.cpp (deleted)

trunk/src/VBox/GuestHost/DisplayServerType.cpp

@@ -34 +34 @@
 #include <iprt/string.h>
 #include <iprt/ldr.h>
-
-#include <VBox/GuestHost/Log.h>
+#include <iprt/log.h>
+
 #include <VBox/GuestHost/DisplayServerType.h>
 
@@ -102 +102 @@
 VBGHDISPLAYSERVERTYPE VBGHDisplayServerTypeDetect(void)
 {
-    VBGHLogVerbose(1, "Detecting display server ...\n");
+    LogRel2(("Detecting display server ...\n"));
 
     /* Try to connect to the wayland display, assuming it succeeds only when a wayland compositor is active: */
@@ -180 +180 @@
         retSessionType = VBGHDISPLAYSERVERTYPE_X11;
 
-    VBGHLogVerbose(1, "Detected via connection: %s\n", VBGHDisplayServerTypeToStr(retSessionType));
+    LogRel2(("Detected via connection: %s\n", VBGHDisplayServerTypeToStr(retSessionType)));
 
     /* If retSessionType is set, we assume we're done here;
@@ -197 +197 @@
         waylandDisplayType = VBGHDISPLAYSERVERTYPE_WAYLAND;
 
-    VBGHLogVerbose(1, "Wayland display type is: %s\n", VBGHDisplayServerTypeToStr(waylandDisplayType));
+    LogRel2(("Wayland display type is: %s\n", VBGHDisplayServerTypeToStr(waylandDisplayType)));
 
     VBGHDISPLAYSERVERTYPE xdgSessionType = VBGHDISPLAYSERVERTYPE_NONE;
@@ -209 +209 @@
     }
 
-    VBGHLogVerbose(1, "XDG session type is: %s\n", VBGHDisplayServerTypeToStr(xdgSessionType));
+    LogRel2(("XDG session type is: %s\n", VBGHDisplayServerTypeToStr(xdgSessionType)));
 
     VBGHDISPLAYSERVERTYPE xdgCurrentDesktopType = VBGHDISPLAYSERVERTYPE_NONE;
@@ -222 +222 @@
     }
 
-    VBGHLogVerbose(1, "XDG current desktop type is: %s\n", VBGHDisplayServerTypeToStr(xdgCurrentDesktopType));
+    LogRel2(("XDG current desktop type is: %s\n", VBGHDisplayServerTypeToStr(xdgCurrentDesktopType)));
 
     /* Set the returning type according to the precedence. */
@@ -237 +237 @@
         && (a_Type1 != a_Type2)) \
         { \
-            VBGHLogError("Unable to reliably detect desktop environment:\n"); \
-            VBGHLogError("Mismatch between %s (%s) and %s (%s) detected! This might indicate a misconfigured and/or broken system!\n", \
-                         #a_Type1, VBGHDisplayServerTypeToStr(a_Type1), #a_Type2, VBGHDisplayServerTypeToStr(a_Type2)); \
-            VBGHLogError("Use --session-type to override this detection.\n"); \
+            LogRel(("Unable to reliably detect desktop environment:\n")); \
+            LogRel(("Mismatch between %s (%s) and %s (%s) detected! This might indicate a misconfigured and/or broken system!\n", \
+                    #a_Type1, VBGHDisplayServerTypeToStr(a_Type1), #a_Type2, VBGHDisplayServerTypeToStr(a_Type2))); \
+            LogRel(("Use --session-type to override this detection.\n")); \
             retSessionType = VBGHDISPLAYSERVERTYPE_NONE; \
         }