andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xf86Helper: use LogHdrMessageVerb in xf86VIDrvMsgVerb

Browse Source 
LogHdrMessageVerb allows passing a parameterized header to insert in a log
message between MessageType and the formatted message body string.

Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Daniel Kurtz 2011-08-08 15:09:47 +08:00 committed by Peter Hutterer
parent b31d104fc0
commit cd8ee3e5cb
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1082,20 +1082,23 @@ xf86DrvMsg(int scrnIndex, MessageType type, const char *format, ...)
} }
/* Print input driver messages in the standard format of /* Print input driver messages in the standard format of
<driver>: <device name>: <message> */ (<type>) <driver>: <device name>: <message> */
void void
xf86VIDrvMsgVerb(InputInfoPtr dev, MessageType type, int verb, const char *format, xf86VIDrvMsgVerb(InputInfoPtr dev, MessageType type, int verb,
va_list args) const char *format, va_list args)
{ {
char *msg; const char *driverName = NULL;
const char *deviceName = NULL;
if (asprintf(&msg, "%s: %s: %s", dev->drv->driverName, dev->name, format) /* Prefix driver and device names to formatted message. */
== -1) { if (dev) {
LogVMessageVerb(type, verb, "%s", args); deviceName = dev->name;
} else { if (dev->drv)
LogVMessageVerb(type, verb, msg, args); driverName = dev->drv->driverName;
free(msg);
} }
LogHdrMessageVerb(type, verb, format, args, "%s: %s: ", driverName,
deviceName);
} }
/* Print input driver message, with verbose level specified directly */ /* Print input driver message, with verbose level specified directly */