frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

os: replace LogVWrite() by LogVMessageVerb() 

It's just a wrapper around LogVMessageVerb() and no external module
using it, so can easily be optimized-away.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1683>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-09-09 16:14:33 +02:00 committed by Marge Bot
parent c26023a009
commit e5b5b302d3
4 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/xfree86/common/xf86Helper.c
View File

@ -1123,7 +1123,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);
}
@ -1135,7 +1135,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);
}

2
hw/xwin/winerror.c
View File

@ -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);

3
include/os.h
View File

@ -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

8
os/log.c
View File

@ -629,12 +629,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 *
@ -1003,7 +997,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