mirror of
https://github.com/X11Libre/xserver.git
synced 2026-04-14 17:18:09 +00:00
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>
This commit is contained in:
committed by
Marge Bot
parent
da22bc9ae0
commit
9652bc73e2
7
os/log.c
7
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
|
||||
|
||||
@@ -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 */
|
||||
|
||||
Reference in New Issue
Block a user