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

dmx: Annotate dmxlog.c with _X_ATTRIBUTE_PRINTF and _X_NORETURN 

and fix resulting printf warning in dmxLogVisual

Signed-off-by: Michal Suchanek <hramrach@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Michal Suchanek 2012-04-26 15:11:20 +02:00 committed by Peter Hutterer
parent 5c361d59c5
commit d662fa2450
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/dmx/dmxlog.c
View File

@ -86,6 +86,8 @@ ErrorF(const char *format, ...)
/** Provide an VFatalError function when used stand-alone. */ /** Provide an VFatalError function when used stand-alone. */
static void static void
VFatalError(const char *format, va_list args) _X_ATTRIBUTE_PRINTF(1, 0) _X_NORETURN;
static void
VFatalError(const char *format, va_list args) VFatalError(const char *format, va_list args)
{ {
vfprintf(stderr, format, args); /* RATS: We assume the format string vfprintf(stderr, format, args); /* RATS: We assume the format string
@ -104,7 +106,9 @@ VErrorF(const char *format, va_list args)
} }
#else #else
/** This function was removed between XFree86 4.3.0 and XFree86 4.4.0. */ /** This function was removed between XFree86 4.3.0 and XFree86 4.4.0. */
extern void AbortServer(void); extern void AbortServer(void) _X_NORETURN;
static void
VFatalError(const char *format, va_list args) _X_ATTRIBUTE_PRINTF(1, 0) _X_NORETURN;
static void static void
VFatalError(const char *format, va_list args) VFatalError(const char *format, va_list args)
{ {
@ -163,6 +167,8 @@ dmxHeader(dmxLogLevel logLevel, DMXInputInfo * dmxInput,
/* Prints the error message with the appropriate low-level X output /* Prints the error message with the appropriate low-level X output
* routine. */ * routine. */
static void static void
dmxMessage(dmxLogLevel logLevel, const char *format, va_list args) _X_ATTRIBUTE_PRINTF(2, 0);
static void
dmxMessage(dmxLogLevel logLevel, const char *format, va_list args) dmxMessage(dmxLogLevel logLevel, const char *format, va_list args)
{ {
if (logLevel == dmxFatal || logLevel >= dmxCurrentLogLevel) { if (logLevel == dmxFatal || logLevel >= dmxCurrentLogLevel) {
@ -300,10 +306,11 @@ dmxLogVisual(DMXScreenInfo * dmxScreen, XVisualInfo * vi, int defaultVisual)
class = "DirectColor"; class = "DirectColor";
break; break;
} }
#define VisualLogFormat "0x%02lx %s %2db %db/rgb %3d 0x%04lx 0x%04lx 0x%04lx%s\n"
if (dmxScreen) { if (dmxScreen) {
dmxLogOutput(dmxScreen, dmxLogOutput(dmxScreen,
"0x%02x %s %2db %db/rgb %3d 0x%04x 0x%04x 0x%04x%s\n", VisualLogFormat,
vi->visualid, class, vi->depth, vi->bits_per_rgb, vi->visualid, class, vi->depth, vi->bits_per_rgb,
vi->colormap_size, vi->colormap_size,
vi->red_mask, vi->green_mask, vi->blue_mask, vi->red_mask, vi->green_mask, vi->blue_mask,
@ -311,7 +318,7 @@ dmxLogVisual(DMXScreenInfo * dmxScreen, XVisualInfo * vi, int defaultVisual)
} }
else { else {
dmxLog(dmxInfo, dmxLog(dmxInfo,
" 0x%02x %s %2db %db/rgb %3d 0x%04x 0x%04x 0x%04x%s\n", " " VisualLogFormat,
vi->visualid, class, vi->depth, vi->bits_per_rgb, vi->visualid, class, vi->depth, vi->bits_per_rgb,
vi->colormap_size, vi->colormap_size,
vi->red_mask, vi->green_mask, vi->blue_mask, vi->red_mask, vi->green_mask, vi->blue_mask,

19
hw/dmx/dmxlog.h
View File

@ -55,18 +55,23 @@ typedef enum {
/* Logging functions used by Xserver/hw/dmx routines. */ /* Logging functions used by Xserver/hw/dmx routines. */
extern dmxLogLevel dmxSetLogLevel(dmxLogLevel newLevel); extern dmxLogLevel dmxSetLogLevel(dmxLogLevel newLevel);
extern dmxLogLevel dmxGetLogLevel(void); extern dmxLogLevel dmxGetLogLevel(void);
extern void dmxLog(dmxLogLevel logLevel, const char *format, ...); extern void dmxLog(dmxLogLevel logLevel, const char *format,
extern void dmxLogCont(dmxLogLevel logLevel, const char *format, ...); ...) _X_ATTRIBUTE_PRINTF(2, 3);
extern void dmxLogCont(dmxLogLevel logLevel, const char *format,
...) _X_ATTRIBUTE_PRINTF(2, 3);
extern const char *dmxEventName(int type); extern const char *dmxEventName(int type);
#ifndef DMX_LOG_STANDALONE #ifndef DMX_LOG_STANDALONE
extern void dmxLogOutput(DMXScreenInfo * dmxScreen, const char *format, ...); extern void dmxLogOutput(DMXScreenInfo * dmxScreen, const char *format,
...) _X_ATTRIBUTE_PRINTF(2, 3);
extern void dmxLogOutputCont(DMXScreenInfo * dmxScreen, const char *format, extern void dmxLogOutputCont(DMXScreenInfo * dmxScreen, const char *format,
...); ...) _X_ATTRIBUTE_PRINTF(2, 3);
extern void dmxLogOutputWarning(DMXScreenInfo * dmxScreen, const char *format, extern void dmxLogOutputWarning(DMXScreenInfo * dmxScreen, const char *format,
...); ...) _X_ATTRIBUTE_PRINTF(2, 3);
extern void dmxLogInput(DMXInputInfo * dmxInput, const char *format, ...); extern void dmxLogInput(DMXInputInfo * dmxInput, const char *format,
extern void dmxLogInputCont(DMXInputInfo * dmxInput, const char *format, ...); ...) _X_ATTRIBUTE_PRINTF(2, 3);
extern void dmxLogInputCont(DMXInputInfo * dmxInput, const char *format,
...) _X_ATTRIBUTE_PRINTF(2, 3);
extern void dmxLogArgs(dmxLogLevel logLevel, int argc, char **argv); extern void dmxLogArgs(dmxLogLevel logLevel, int argc, char **argv);
extern void dmxLogVisual(DMXScreenInfo * dmxScreen, XVisualInfo * vi, extern void dmxLogVisual(DMXScreenInfo * dmxScreen, XVisualInfo * vi,
int defaultVisual); int defaultVisual);