summaryrefslogtreecommitdiff
path: root/hw/xfree86
diff options
context:
space:
mode:
authorEnrico Weigelt, metux IT consult <info@metux.net>2024-09-10 17:12:48 +0200
committerMarge Bot <emma+marge@anholt.net>2024-10-10 21:16:26 +0000
commita136ce3d57831e8ffc476be2bd8c075291b02965 (patch)
treebe3c829d869eb9ba02d3c7b8b282ef9108b25f6d /hw/xfree86
parent14767eccc0d00b937e519adfe6d92955077bfdf0 (diff)
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 <info@metux.net> Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1679>
Diffstat (limited to 'hw/xfree86')
-rw-r--r--hw/xfree86/common/xf86.h4
-rw-r--r--hw/xfree86/common/xf86Helper.c11
2 files changed, 1 insertions, 14 deletions
diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
index 0f7443306..48f827069 100644
--- a/hw/xfree86/common/xf86.h
+++ b/hw/xfree86/common/xf86.h
@@ -254,9 +254,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
@@ -405,5 +402,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 b3df06062..caac5c078 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, ...)