diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c index d2d0d1e43..9e296b2e3 100644 --- a/hw/xwin/InitOutput.c +++ b/hw/xwin/InitOutput.c @@ -529,9 +529,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 8ca484b80..a01c5b6f1 100644 --- a/hw/xwin/win.h +++ b/hw/xwin/win.h @@ -739,10 +739,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 174c76f5d..bbf302b67 100644 --- a/hw/xwin/winerror.c +++ b/hw/xwin/winerror.c @@ -40,23 +40,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 e88dca235..500023e15 100644 --- a/hw/xwin/winprocarg.c +++ b/hw/xwin/winprocarg.c @@ -226,12 +226,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 e6a66a5bc..88be9f82a 100644 --- a/os/log.c +++ b/os/log.c @@ -110,8 +110,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 @@ -899,10 +897,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 6521b8a2a..90e5e84d9 100644 --- a/os/osdep.h +++ b/os/osdep.h @@ -172,10 +172,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 */