From 9652bc73e2f655487bc9823719014e024a28f226 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Fri, 13 Sep 2024 12:02:58 +0200
Subject: [PATCH] xwin: drop duplicate OsVendorVErrorF()

It really doesn't seem to be necessary to protect a LogVMessageVerb()
call by extra mutex on windows only, while obviously not needed on
any other platform.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1691>
---
 hw/xwin/InitOutput.c |  3 ---
 hw/xwin/win.h        |  4 ----
 hw/xwin/winerror.c   | 17 -----------------
 hw/xwin/winprocarg.c |  6 ------
 os/log.c             |  7 +------
 os/osdep.h           |  4 ----
 6 files changed, 1 insertion(+), 40 deletions(-)

diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c
index 541503552..a8a8cac24 100644
--- a/hw/xwin/InitOutput.c
+++ b/hw/xwin/InitOutput.c
@@ -633,9 +633,6 @@ OsVendorInit(void)
 
     winFixupPaths();
 
-    if (!OsVendorVErrorFProc)
-        OsVendorVErrorFProc = OsVendorVErrorF;
-
     if (!g_fLogInited) {
         /* keep this order. If LogInit fails it calls Abort which then calls
          * ddxGiveUp where LogInit is called again and creates an infinite
diff --git a/hw/xwin/win.h b/hw/xwin/win.h
index 49a2031d3..44736a08b 100644
--- a/hw/xwin/win.h
+++ b/hw/xwin/win.h
@@ -742,10 +742,6 @@ void
  * winerror.c
  */
 
-void
-OsVendorVErrorF(const char *pszFormat, va_list va_args)
-_X_ATTRIBUTE_PRINTF(1, 0);
-
 void
 winMessageBoxF(const char *pszError, UINT uType, ...)
 _X_ATTRIBUTE_PRINTF(1, 3);
diff --git a/hw/xwin/winerror.c b/hw/xwin/winerror.c
index bdf03f053..401481327 100644
--- a/hw/xwin/winerror.c
+++ b/hw/xwin/winerror.c
@@ -39,23 +39,6 @@
 
 #include "dix/input_priv.h"
 
-void
-OsVendorVErrorF(const char *pszFormat, va_list va_args)
-{
-    /* make sure the clipboard and multiwindow threads do not interfere the
-     * main thread */
-    static pthread_mutex_t s_pmPrinting = PTHREAD_MUTEX_INITIALIZER;
-
-    /* Lock the printing mutex */
-    pthread_mutex_lock(&s_pmPrinting);
-
-    /* Print the error message to a log file, could be stderr */
-    LogVMessageVerb(X_NONE, 0, pszFormat, va_args);
-
-    /* Unlock the printing mutex */
-    pthread_mutex_unlock(&s_pmPrinting);
-}
-
 /*
  * os/log.c:FatalError () calls our vendor ErrorF, so the message
  * from a FatalError will be logged.
diff --git a/hw/xwin/winprocarg.c b/hw/xwin/winprocarg.c
index 4f753982f..d87c40936 100644
--- a/hw/xwin/winprocarg.c
+++ b/hw/xwin/winprocarg.c
@@ -225,12 +225,6 @@ ddxProcessArgument(int argc, char *argv[], int i)
 
     /* Initialize once */
     if (!s_fBeenHere) {
-        /*
-         * This initialises our hook into VErrorF () for catching log messages
-         * that are generated before OsInit () is called.
-         */
-        OsVendorVErrorFProc = OsVendorVErrorF;
-
         s_fBeenHere = TRUE;
 
         /* Initialize only if option is not -help */
diff --git a/os/log.c b/os/log.c
index 131bd7239..6ce2ec04c 100644
--- a/os/log.c
+++ b/os/log.c
@@ -105,8 +105,6 @@ OR PERFORMANCE OF THIS SOFTWARE.
 #pragma clang diagnostic ignored "-Wformat-nonliteral"
 #endif
 
-void (*OsVendorVErrorFProc) (const char *, va_list args) = NULL;
-
 /* Default logging parameters. */
 #define DEFAULT_LOG_VERBOSITY		0
 #define DEFAULT_LOG_FILE_VERBOSITY	3
@@ -911,10 +909,7 @@ FatalError(const char *f, ...)
 void
 VErrorF(const char *f, va_list args)
 {
-    if (OsVendorVErrorFProc)
-        OsVendorVErrorFProc(f, args);
-    else
-        LogVMessageVerb(X_NONE, -1, f, args);
+    LogVMessageVerb(X_NONE, -1, f, args);
 }
 
 void
diff --git a/os/osdep.h b/os/osdep.h
index 8d2f0678e..3319ee188 100644
--- a/os/osdep.h
+++ b/os/osdep.h
@@ -176,10 +176,6 @@ int os_move_fd(int fd);
    depending on whether multithreading is used */
 int xthread_sigmask(int how, const sigset_t *set, sigset_t *oldest);
 
-/* callback for DDX specific error printing, if any (may be NULL) */
-extern void (*OsVendorVErrorFProc) (const char *, va_list args)
-    _X_ATTRIBUTE_PRINTF(1, 0);
-
 typedef void (*OsSigHandlerPtr) (int sig);
 
 /* install signal handler */