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

Revert "xfre86: drop xf86Msg() in favor of LogMessageVerb()" 

This reverts commit a136ce3d57.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2021>
This commit is contained in:
Alan Coopersmith 2025-06-12 17:18:27 -07:00 committed by Marge Bot
parent 746f249a0d
commit 64593971d7
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/xfree86/common/xf86.h
View File

@ -248,6 +248,9 @@ extern _X_EXPORT void
xf86DrvMsg(int scrnIndex, MessageType type, const char *format, ...) xf86DrvMsg(int scrnIndex, MessageType type, const char *format, ...)
_X_ATTRIBUTE_PRINTF(3, 4); _X_ATTRIBUTE_PRINTF(3, 4);
extern _X_EXPORT void 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, ...) xf86ErrorFVerb(int verb, const char *format, ...)
_X_ATTRIBUTE_PRINTF(2, 3); _X_ATTRIBUTE_PRINTF(2, 3);
extern _X_EXPORT void extern _X_EXPORT void
@ -396,6 +399,5 @@ xf86UpdateDesktopDimensions(void);
/* only for backwards (source) compatibility */ /* only for backwards (source) compatibility */
#define xf86MsgVerb LogMessageVerb #define xf86MsgVerb LogMessageVerb
#define xf86Msg(type, ...) LogMessageVerb(type, 1, __VA_ARGS__)
#endif /* _XF86_H */ #endif /* _XF86_H */

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

@ -1095,6 +1095,17 @@ xf86IDrvMsg(InputInfoPtr dev, MessageType type, const char *format, ...)
va_end(ap); 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 */ /* Just like ErrorF, but with the verbose level checked */
void void
xf86ErrorFVerb(int verb, const char *format, ...) xf86ErrorFVerb(int verb, const char *format, ...)