diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2011-04-23 20:49:27 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2011-04-25 10:45:34 -0700 |
| commit | c524f8bb768f886d413839bc22184098394c2559 (patch) | |
| tree | 229a5bbdbfdbe96d77ece6b162f43160c0d96c88 /os | |
| parent | ab81aa91404ca0fa6843ce8021cbd9de42255a8f (diff) | |
os: Silence warnings when building with clang
access.c:1492:20: error: equality comparison with extraneous parentheses [-Werror,-Wparentheses]
if ((host->family == FamilyServerInterpreted)) {
~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~
access.c:1492:20: note: use '=' to turn this equality comparison into an assignment
if ((host->family == FamilyServerInterpreted)) {
^~
=
access.c:1492:20: note: remove extraneous parentheses around the comparison to silence this warning
if ((host->family == FamilyServerInterpreted)) {
~ ^ ~
In file included from xstrans.c:8:
In file included from /usr/X11/include/X11/Xtrans/transport.c:62:
/usr/X11/include/X11/Xtrans/Xtranssock.c:262:5: error: implicit declaration of function 'ErrorF' is invalid in C99
[-Werror,-Wimplicit-function-declaration]
PRMSG (3,"SocketSelectFamily(%s)\n", family, 0, 0);
^
log.c:180:29: error: format string is not a string literal [-Werror,-Wformat-nonliteral]
if (asprintf(&logFileName, fname, display) == -1)
^~~~~
log.c:190:26: error: format string is not a string literal [-Werror,-Wformat-nonliteral]
if ((asprintf(&suffix, backup, display) == -1) ||
^~~~~~
log.c:382:25: error: format string is not a string literal [-Werror,-Wformat-nonliteral]
LogVWrite(verb, tmpBuf, args);
^~~~~~
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Diffstat (limited to 'os')
| -rw-r--r-- | os/access.c | 2 | ||||
| -rw-r--r-- | os/log.c | 4 | ||||
| -rw-r--r-- | os/xstrans.c | 5 |
3 files changed, 10 insertions, 1 deletions
diff --git a/os/access.c b/os/access.c index 3856e606e..b7b19279f 100644 --- a/os/access.c +++ b/os/access.c @@ -1489,7 +1489,7 @@ InvalidHost ( } for (host = validhosts; host; host = host->next) { - if ((host->family == FamilyServerInterpreted)) { + if (host->family == FamilyServerInterpreted) { if (siAddrMatch (family, addr, len, host, client)) { return 0; } @@ -102,6 +102,10 @@ OR PERFORMANCE OF THIS SOFTWARE. #include "xf86bigfontsrv.h" #endif +#ifdef __clang__ +#pragma clang diagnostic ignored "-Wformat-nonliteral" +#endif + #ifdef DDXOSVERRORF void (*OsVendorVErrorFProc)(const char *, va_list args) = NULL; #endif diff --git a/os/xstrans.c b/os/xstrans.c index c086e225b..44ff976a9 100644 --- a/os/xstrans.c +++ b/os/xstrans.c @@ -2,6 +2,11 @@ #include <dix-config.h> #endif +#include <X11/Xfuncproto.h> + +/* ErrorF is used by xtrans */ +extern _X_EXPORT void ErrorF(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2); + #define TRANS_REOPEN #define TRANS_SERVER #define XSERV_t |