xserver: Branch 'master'

[GitLab Mirror]

 pseudoramiX/pseudoramiX.c |   32 ++------------------------------
 1 file changed, 2 insertions(+), 30 deletions(-)

New commits:
commit 6625cc14df81f105eea45d8f457a4c1918489991
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Thu Sep 12 10:21:34 2024 +0200

    pseudoramix: replace PseudoramiXTrace & PseudoramiXDebug by LogMessageVerb
    
    Since we're only going through macros (that are calling these), this extra
    wrapper function isn't needed at all - using LogMessageVerb() directly.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1689>

diff --git a/pseudoramiX/pseudoramiX.c b/pseudoramiX/pseudoramiX.c
index 233f91704..addc920f1 100644
--- a/pseudoramiX/pseudoramiX.c
+++ b/pseudoramiX/pseudoramiX.c
@@ -46,8 +46,8 @@
 #include <X11/extensions/panoramiXproto.h>
 #include "globals.h"
 
-#define TRACE PseudoramiXTrace("TRACE " __FILE__ ":%s",__FUNCTION__)
-#define DEBUG_LOG PseudoramiXDebug
+#define TRACE LogMessageVerb(X_NONE, 10, "TRACE " __FILE__ ":%s", __FUNCTION__)
+#define DEBUG_LOG(...) LogMessageVerb(X_NONE, 3, __VA_ARGS__);
 
 Bool noPseudoramiXExtension = FALSE;
 extern Bool noRRXineramaExtension;
@@ -100,34 +100,6 @@ static int pseudoramiXScreensAllocated = 0;
 static int pseudoramiXNumScreens = 0;
 static unsigned long pseudoramiXGeneration = 0;
 
-static void
-PseudoramiXTrace(const char *format, ...)
-    _X_ATTRIBUTE_PRINTF(1, 2);
-
-static void
-PseudoramiXTrace(const char *format, ...)
-{
-    va_list ap;
-
-    va_start(ap, format);
-    LogVMessageVerb(X_NONE, 10, format, ap);
-    va_end(ap);
-}
-
-static void
-PseudoramiXDebug(const char *format, ...)
-    _X_ATTRIBUTE_PRINTF(1, 2);
-
-static void
-PseudoramiXDebug(const char *format, ...)
-{
-    va_list ap;
-
-    va_start(ap, format);
-    LogVMessageVerb(X_NONE, 3, format, ap);
-    va_end(ap);
-}
-
 // Add a PseudoramiX screen.
 // The rest of the X server will know nothing about this screen.
 // Can be called before or after extension init.