From ac503cca59c128800f55d8cb45f28bac4187e16a Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Tue, 10 Sep 2024 17:12:48 +0200 Subject: [PATCH] (!1679) xfre86: drop xf86Msg() in favor of LogMessageVerb() This function is doing the same like LogMessageVerb(), so no need to keep around a duplicate implementation. Leaving it as a macro, until all callers, also in drivers, have been migrated. Signed-off-by: Enrico Weigelt, metux IT consult --- hw/xfree86/common/xf86.h | 4 +--- hw/xfree86/common/xf86Helper.c | 11 ----------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h index 9417e887e..d8023a0d2 100644 --- a/hw/xfree86/common/xf86.h +++ b/hw/xfree86/common/xf86.h @@ -250,9 +250,6 @@ extern _X_EXPORT void xf86DrvMsg(int scrnIndex, MessageType type, const char *format, ...) _X_ATTRIBUTE_PRINTF(3, 4); extern _X_EXPORT void -xf86Msg(MessageType type, const char *format, ...) -_X_ATTRIBUTE_PRINTF(2, 3); -extern _X_EXPORT void xf86ErrorFVerb(int verb, const char *format, ...) _X_ATTRIBUTE_PRINTF(2, 3); extern _X_EXPORT void @@ -401,5 +398,6 @@ xf86UpdateDesktopDimensions(void); /* only for backwards (source) compatibility */ #define xf86MsgVerb LogMessageVerb +#define xf86Msg(type, ...) LogMessageVerb(type, 1, __VA_ARGS__) #endif /* _XF86_H */ diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c index 0e7736d96..7572be488 100644 --- a/hw/xfree86/common/xf86Helper.c +++ b/hw/xfree86/common/xf86Helper.c @@ -1094,17 +1094,6 @@ xf86IDrvMsg(InputInfoPtr dev, MessageType type, const char *format, ...) va_end(ap); } -/* Print non-driver messages with verbose level of 1 (default) */ -void -xf86Msg(MessageType type, const char *format, ...) -{ - va_list ap; - - va_start(ap, format); - LogVMessageVerb(type, 1, format, ap); - va_end(ap); -} - /* Just like ErrorF, but with the verbose level checked */ void xf86ErrorFVerb(int verb, const char *format, ...)