diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c index 8d8086cb6..f8b16fd00 100644 --- a/hw/xfree86/common/xf86Helper.c +++ b/hw/xfree86/common/xf86Helper.c @@ -1124,7 +1124,7 @@ xf86ErrorFVerb(int verb, const char *format, ...) va_start(ap, format); if (xf86Verbose >= verb || xf86LogVerbose >= verb) - LogVWrite(verb, format, ap); + LogVMessageVerb(X_NONE, verb, format, ap); va_end(ap); } @@ -1136,7 +1136,7 @@ xf86ErrorF(const char *format, ...) va_start(ap, format); if (xf86Verbose >= 1 || xf86LogVerbose >= 1) - LogVWrite(1, format, ap); + LogVMessageVerb(X_NONE, 1, format, ap); va_end(ap); } diff --git a/hw/xwin/winerror.c b/hw/xwin/winerror.c index b9cffd8d7..bdf03f053 100644 --- a/hw/xwin/winerror.c +++ b/hw/xwin/winerror.c @@ -50,7 +50,7 @@ OsVendorVErrorF(const char *pszFormat, va_list va_args) pthread_mutex_lock(&s_pmPrinting); /* Print the error message to a log file, could be stderr */ - LogVWrite(0, pszFormat, va_args); + LogVMessageVerb(X_NONE, 0, pszFormat, va_args); /* Unlock the printing mutex */ pthread_mutex_unlock(&s_pmPrinting); diff --git a/include/os.h b/include/os.h index 4892affd6..fa41d6698 100644 --- a/include/os.h +++ b/include/os.h @@ -355,9 +355,6 @@ LogClose(enum ExitCode error); extern _X_EXPORT Bool LogSetParameter(LogParameter param, int value); extern _X_EXPORT void -LogVWrite(int verb, const char *f, va_list args) -_X_ATTRIBUTE_PRINTF(2, 0); -extern _X_EXPORT void LogVMessageVerb(MessageType type, int verb, const char *format, va_list args) _X_ATTRIBUTE_PRINTF(3, 0); extern _X_EXPORT void diff --git a/os/log.c b/os/log.c index 2908eacdd..0780ee800 100644 --- a/os/log.c +++ b/os/log.c @@ -654,12 +654,6 @@ LogSWrite(int verb, const char *buf, size_t len, Bool end_line) (void) ret; } -void -LogVWrite(int verb, const char *f, va_list args) -{ - return LogVMessageVerb(X_NONE, verb, f, args); -} - /* Returns the Message Type string to prepend to a logging message, or NULL * if the message will be dropped due to insufficient verbosity. */ static const char * @@ -1028,7 +1022,7 @@ VErrorF(const char *f, va_list args) if (OsVendorVErrorFProc) OsVendorVErrorFProc(f, args); else - LogVWrite(-1, f, args); + LogVMessageVerb(X_NONE, -1, f, args); } void