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

os: replace LogWrite() by LogMessageVerb() 

It's nothing but a wrapper, doing the same as LogMessageVerb(X_NONE, ...),
and no external module / driver needs it, so can be easily 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 15:41:06 +02:00 committed by Marge Bot
parent 37446b70de
commit c26023a009
4 changed files with 22 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
hw/xfree86/loader/loader.c
View File

@ -75,19 +75,18 @@ LoaderInit(void)
LogMessageVerb(X_INFO, 2, "Loader magic: %p\n", (void *) xorg_symbols); LogMessageVerb(X_INFO, 2, "Loader magic: %p\n", (void *) xorg_symbols);
#endif #endif
LogMessageVerb(X_INFO, 2, "Module ABI versions:\n"); LogMessageVerb(X_INFO, 2, "Module ABI versions:\n");
LogWrite(2, "\t%s: %d.%d\n", ABI_CLASS_ANSIC, LogMessageVerb(X_NONE, 2, "\t%s: %d.%d\n", ABI_CLASS_ANSIC,
GET_ABI_MAJOR(LoaderVersionInfo.ansicVersion), GET_ABI_MAJOR(LoaderVersionInfo.ansicVersion),
GET_ABI_MINOR(LoaderVersionInfo.ansicVersion)); GET_ABI_MINOR(LoaderVersionInfo.ansicVersion));
LogWrite(2, "\t%s: %d.%d\n", ABI_CLASS_VIDEODRV, LogMessageVerb(X_NONE, 2, "\t%s: %d.%d\n", ABI_CLASS_VIDEODRV,
GET_ABI_MAJOR(LoaderVersionInfo.videodrvVersion), GET_ABI_MAJOR(LoaderVersionInfo.videodrvVersion),
GET_ABI_MINOR(LoaderVersionInfo.videodrvVersion)); GET_ABI_MINOR(LoaderVersionInfo.videodrvVersion));
LogWrite(2, "\t%s : %d.%d\n", ABI_CLASS_XINPUT, LogMessageVerb(X_NONE, 2, "\t%s : %d.%d\n", ABI_CLASS_XINPUT,
GET_ABI_MAJOR(LoaderVersionInfo.xinputVersion), GET_ABI_MAJOR(LoaderVersionInfo.xinputVersion),
GET_ABI_MINOR(LoaderVersionInfo.xinputVersion)); GET_ABI_MINOR(LoaderVersionInfo.xinputVersion));
LogWrite(2, "\t%s : %d.%d\n", ABI_CLASS_EXTENSION, LogMessageVerb(X_NONE, 2, "\t%s : %d.%d\n", ABI_CLASS_EXTENSION,
GET_ABI_MAJOR(LoaderVersionInfo.extensionVersion), GET_ABI_MAJOR(LoaderVersionInfo.extensionVersion),
GET_ABI_MINOR(LoaderVersionInfo.extensionVersion)); GET_ABI_MINOR(LoaderVersionInfo.extensionVersion));
} }
/* Public Interface to the loader. */ /* Public Interface to the loader. */

18
hw/xfree86/loader/loadmod.c
View File

@ -438,14 +438,14 @@ CheckVersion(const char *module, XF86ModuleVersionInfo * data,
vercode[1] = (ver / 100000) % 100; vercode[1] = (ver / 100000) % 100;
vercode[2] = (ver / 1000) % 100; vercode[2] = (ver / 1000) % 100;
vercode[3] = ver % 1000; vercode[3] = ver % 1000;
LogWrite(1, "\tcompiled for %d.%d.%d", vercode[0], vercode[1], vercode[2]); LogMessageVerb(X_NONE, 1, "\tcompiled for %d.%d.%d", vercode[0], vercode[1], vercode[2]);
if (vercode[3] != 0) if (vercode[3] != 0)
LogWrite(1, ".%d", vercode[3]); LogMessageVerb(X_NONE, 1, ".%d", vercode[3]);
LogWrite(1, ", module version = %d.%d.%d\n", data->majorversion, LogMessageVerb(X_NONE, 1, ", module version = %d.%d.%d\n", data->majorversion,
data->minorversion, data->patchlevel); data->minorversion, data->patchlevel);
if (data->moduleclass) if (data->moduleclass)
LogWrite(2, "\tModule class: %s\n", data->moduleclass); LogMessageVerb(X_NONE, 2, "\tModule class: %s\n", data->moduleclass);
ver = -1; ver = -1;
if (data->abiclass) { if (data->abiclass) {
@ -463,8 +463,8 @@ CheckVersion(const char *module, XF86ModuleVersionInfo * data,
abimaj = GET_ABI_MAJOR(data->abiversion); abimaj = GET_ABI_MAJOR(data->abiversion);
abimin = GET_ABI_MINOR(data->abiversion); abimin = GET_ABI_MINOR(data->abiversion);
LogWrite(2, "\tABI class: %s, version %d.%d\n", LogMessageVerb(X_NONE, 2, "\tABI class: %s, version %d.%d\n",
data->abiclass, abimaj, abimin); data->abiclass, abimaj, abimin);
if (ver != -1) { if (ver != -1) {
vermaj = GET_ABI_MAJOR(ver); vermaj = GET_ABI_MAJOR(ver);
vermin = GET_ABI_MINOR(ver); vermin = GET_ABI_MINOR(ver);
@ -686,14 +686,14 @@ LoadModule(const char *module, void *options, const XF86ModReqInfo *modreq,
name = LoaderGetCanonicalName(module, patterns); name = LoaderGetCanonicalName(module, patterns);
noncanonical = (name && strcmp(module, name) != 0); noncanonical = (name && strcmp(module, name) != 0);
if (noncanonical) { if (noncanonical) {
LogWrite(3, " (%s)\n", name); LogMessageVerb(X_NONE, 3, " (%s)\n", name);
LogMessageVerb(X_WARNING, 1, LogMessageVerb(X_WARNING, 1,
"LoadModule: given non-canonical module name \"%s\"\n", "LoadModule: given non-canonical module name \"%s\"\n",
module); module);
m = name; m = name;
} }
else { else {
LogWrite(3, "\n"); LogMessageVerb(X_NONE, 3, "\n");
m = (char *) module; m = (char *) module;
} }

3
include/os.h
View File

@ -358,9 +358,6 @@ extern _X_EXPORT void
LogVWrite(int verb, const char *f, va_list args) LogVWrite(int verb, const char *f, va_list args)
_X_ATTRIBUTE_PRINTF(2, 0); _X_ATTRIBUTE_PRINTF(2, 0);
extern _X_EXPORT void extern _X_EXPORT void
LogWrite(int verb, const char *f, ...)
_X_ATTRIBUTE_PRINTF(2, 3);
extern _X_EXPORT void
LogVMessageVerb(MessageType type, int verb, const char *format, va_list args) LogVMessageVerb(MessageType type, int verb, const char *format, va_list args)
_X_ATTRIBUTE_PRINTF(3, 0); _X_ATTRIBUTE_PRINTF(3, 0);
extern _X_EXPORT void extern _X_EXPORT void

12
os/log.c
View File

@ -635,16 +635,6 @@ LogVWrite(int verb, const char *f, va_list args)
return LogVMessageVerb(X_NONE, verb, f, args); return LogVMessageVerb(X_NONE, verb, f, args);
} }
void
LogWrite(int verb, const char *f, ...)
{
va_list args;
va_start(args, f);
LogVWrite(verb, f, args);
va_end(args);
}
/* Returns the Message Type string to prepend to a logging message, or NULL /* Returns the Message Type string to prepend to a logging message, or NULL
* if the message will be dropped due to insufficient verbosity. */ * if the message will be dropped due to insufficient verbosity. */
static const char * static const char *
@ -1046,7 +1036,7 @@ void
LogPrintMarkers(void) LogPrintMarkers(void)
{ {
/* Show what the message marker symbols mean. */ /* Show what the message marker symbols mean. */
LogWrite(0, "Markers: "); LogMessageVerb(X_NONE, 0, "Markers: ");
LogMessageVerb(X_PROBED, 0, "probed, "); LogMessageVerb(X_PROBED, 0, "probed, ");
LogMessageVerb(X_CONFIG, 0, "from config file, "); LogMessageVerb(X_CONFIG, 0, "from config file, ");
LogMessageVerb(X_DEFAULT, 0, "default setting,\n\t"); LogMessageVerb(X_DEFAULT, 0, "default setting,\n\t");