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

xf86Helper: use LogHdrMessageVerb in xf86VDrvMsgVerb 

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:48 +08:00 committed by Peter Hutterer
parent cd8ee3e5cb
commit 033f53c223
1 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1027,36 +1027,20 @@ xf86EnableDisableFBAccess(int scrnIndex, Bool enable)
} }
} }
/* Print driver messages in the standard format */ /* Print driver messages in the standard format of
(<type>) <screen name>(<screen index>): <message> */
#undef PREFIX_SIZE
#define PREFIX_SIZE 14
void void
xf86VDrvMsgVerb(int scrnIndex, MessageType type, int verb, const char *format, xf86VDrvMsgVerb(int scrnIndex, MessageType type, int verb, const char *format,
va_list args) va_list args)
{ {
char *tmpFormat;
/* Prefix the scrnIndex name to the format string. */ /* Prefix the scrnIndex name to the format string. */
if (scrnIndex >= 0 && scrnIndex < xf86NumScreens && if (scrnIndex >= 0 && scrnIndex < xf86NumScreens &&
xf86Screens[scrnIndex]->name) { xf86Screens[scrnIndex]->name)
tmpFormat = malloc(strlen(format) + LogHdrMessageVerb(type, verb, format, args, "%s(%d): ",
strlen(xf86Screens[scrnIndex]->name) + xf86Screens[scrnIndex]->name, scrnIndex);
PREFIX_SIZE + 1); else
if (!tmpFormat)
return;
snprintf(tmpFormat, PREFIX_SIZE + 1, "%s(%d): ",
xf86Screens[scrnIndex]->name, scrnIndex);
strcat(tmpFormat, format);
LogVMessageVerb(type, verb, tmpFormat, args);
free(tmpFormat);
} else
LogVMessageVerb(type, verb, format, args); LogVMessageVerb(type, verb, format, args);
} }
#undef PREFIX_SIZE
/* Print driver messages, with verbose level specified directly */ /* Print driver messages, with verbose level specified directly */
void void