diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2012-11-10 14:15:56 +0000 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2018-05-13 18:21:06 +0100 |
| commit | cb1b3f04bbeb3caa7f0dd645a1a6ea5698be23fb (patch) | |
| tree | f4803f1daf6c088581cbd7379e39004e9431854d /hw | |
| parent | cfe99ac1dc3902bcb60b09652205213089ef8e44 (diff) | |
Rename ErrorF()->winError() in icon_convert.c
v2: Add prototype for winError()
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/xwin/winmsg.c | 10 | ||||
| -rw-r--r-- | hw/xwin/winmsg.h | 4 | ||||
| -rw-r--r-- | hw/xwin/wmutil/icon_convert.c | 9 |
3 files changed, 18 insertions, 5 deletions
diff --git a/hw/xwin/winmsg.c b/hw/xwin/winmsg.c index 2ee48ce5a..1d3a387d8 100644 --- a/hw/xwin/winmsg.c +++ b/hw/xwin/winmsg.c @@ -72,6 +72,16 @@ winErrorFVerb(int verb, const char *format, ...) } void +winError(const char *format, ...) +{ + va_list ap; + + va_start(ap, format); + LogVMessageVerb(X_NONE, -1, format, ap); + va_end(ap); +} + +void winDebug(const char *format, ...) { va_list ap; diff --git a/hw/xwin/winmsg.h b/hw/xwin/winmsg.h index 02f672f08..25d887510 100644 --- a/hw/xwin/winmsg.h +++ b/hw/xwin/winmsg.h @@ -60,6 +60,10 @@ _X_ATTRIBUTE_PRINTF(1, 2); void winErrorFVerb(int verb, const char *format, ...) _X_ATTRIBUTE_PRINTF(2, 3); +void +winError(const char *format, ...) +_X_ATTRIBUTE_PRINTF(1, 2); + void winW32Error(int verb, const char *message); void winW32ErrorEx(int verb, const char *message, DWORD errorcode); void winDebugWin32Message(const char *function, HWND hwnd, UINT message, diff --git a/hw/xwin/wmutil/icon_convert.c b/hw/xwin/wmutil/icon_convert.c index 233cc8391..be9f4e027 100644 --- a/hw/xwin/wmutil/icon_convert.c +++ b/hw/xwin/wmutil/icon_convert.c @@ -49,7 +49,6 @@ #include "icon_convert.h" -extern void ErrorF(const char *f, ...); extern unsigned long serverGeneration; /* @@ -81,8 +80,8 @@ winScaleXImageToWindowsIcon(int iconSize, xStride = pixmap->stride; if (stride == 0 || xStride == 0) { - ErrorF("winScaleXBitmapToWindows - stride or xStride is zero. " - "Bailing.\n"); + winError("winScaleXBitmapToWindows - stride or xStride is zero. " + "Bailing.\n"); return; } @@ -353,8 +352,8 @@ NetWMToWinIcon(int bpp, uint32_t * icon) dwlConditionMask); versionChecked = TRUE; - ErrorF("OS has icon alpha channel support: %s\n", - hasIconAlphaChannel ? "yes" : "no"); + winError("OS has icon alpha channel support: %s\n", + hasIconAlphaChannel ? "yes" : "no"); } if (hasIconAlphaChannel && (bpp == 32)) |