include: prettify BUG_WARN output

ErrorF output is prefixed with a timestamp, so the previous output would
look like this:

[ 50.423] BUG: triggered 'if (dev->valuator->numAxes < 2)'
BUG: getevents.c:842 in scale_to_desktop()

Change this to have the prefix on both lines:
[ 50.423] BUG: triggered 'if (dev->valuator->numAxes < 2)'
[ 50.423] BUG: getevents.c:842 in scale_to_desktop()

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
This commit is contained in:
Peter Hutterer 2012-01-11 09:01:05 +10:00
parent bbb6b8c834
commit c495a839ac

View File

@ -364,7 +364,8 @@ extern _X_EXPORT unsigned long serverGeneration;
/* Don't use this directly, use BUG_WARN or BUG_WARN_MSG instead */ /* Don't use this directly, use BUG_WARN or BUG_WARN_MSG instead */
#define __BUG_WARN_MSG(cond, with_msg, ...) \ #define __BUG_WARN_MSG(cond, with_msg, ...) \
do { if (cond) { \ do { if (cond) { \
ErrorF("BUG: triggered 'if (" #cond ")'\nBUG: %s:%d in %s()\n", \ ErrorF("BUG: triggered 'if (" #cond ")'\n"); \
ErrorF("BUG: %s:%d in %s()\n", \
__FILE__, __LINE__, __func__); \ __FILE__, __LINE__, __func__); \
if (with_msg) ErrorF(__VA_ARGS__); \ if (with_msg) ErrorF(__VA_ARGS__); \
xorg_backtrace(); \ xorg_backtrace(); \