xserver: Branch 'master' - 2 commits

[GitLab Mirror]

 hw/xfree86/common/xf86.h       |   10 ++++------
 hw/xfree86/common/xf86Helper.c |   22 ----------------------
 2 files changed, 4 insertions(+), 28 deletions(-)

New commits:
commit a136ce3d57831e8ffc476be2bd8c075291b02965
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Tue Sep 10 17:12:48 2024 +0200

    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 at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1679>

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, ...)
commit 14767eccc0d00b937e519adfe6d92955077bfdf0
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Tue Sep 10 17:25:08 2024 +0200

    xfree86: drop xf86MsgVerb() 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 at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1679>

diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
index 8d0cb0532..0f7443306 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
-xf86MsgVerb(MessageType type, int verb, 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
@@ -406,4 +403,7 @@ extern _X_EXPORT ScreenPtr xf86ScrnToScreen(ScrnInfoPtr pScrn);
 extern _X_EXPORT void
 xf86UpdateDesktopDimensions(void);
 
+/* only for backwards (source) compatibility */
+#define xf86MsgVerb LogMessageVerb
+
 #endif                          /* _XF86_H */
diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
index f8b16fd00..b3df06062 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 specified directly */
-void
-xf86MsgVerb(MessageType type, int verb, const char *format, ...)
-{
-    va_list ap;
-
-    va_start(ap, format);
-    LogVMessageVerb(type, verb, format, ap);
-    va_end(ap);
-}
-
 /* Print non-driver messages with verbose level of 1 (default) */
 void
 xf86Msg(MessageType type, const char *format, ...)