diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-05 08:34:17 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-05 08:34:17 +0200 |
commit | 320a8cc0c7fa472970bc3698c7e77b6406ca343b (patch) | |
tree | d13d3a78686c3d44fd4d89adfd1b57ddd4274533 /nx-X11/programs/Xserver/os/log.c | |
parent | 854f3fa49351ec72da432f195806162fcf5e5ddc (diff) | |
parent | b15fc63f4c0c4c741af1255d17907ba3b98b5cf9 (diff) | |
download | nx-libs-320a8cc0c7fa472970bc3698c7e77b6406ca343b.tar.gz nx-libs-320a8cc0c7fa472970bc3698c7e77b6406ca343b.tar.bz2 nx-libs-320a8cc0c7fa472970bc3698c7e77b6406ca343b.zip |
Merge branch 'sunweaver-pr/silencing-compiler-warnings' into 3.6.x
Attributes GH PR #168: https://github.com/ArcticaProject/nx-libs/pull/168
Reviewed by: Vadim Troshchinskiy <vadim@qindel.com> -- Mon, 04 Jul 2016 11:15:20 -0700
Diffstat (limited to 'nx-X11/programs/Xserver/os/log.c')
-rw-r--r-- | nx-X11/programs/Xserver/os/log.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/nx-X11/programs/Xserver/os/log.c b/nx-X11/programs/Xserver/os/log.c index d97317819..d8640b5fd 100644 --- a/nx-X11/programs/Xserver/os/log.c +++ b/nx-X11/programs/Xserver/os/log.c @@ -107,6 +107,7 @@ OR PERFORMANCE OF THIS SOFTWARE. #include <stdlib.h> /* for malloc() */ #include <errno.h> +#include "input.h" #include "site.h" #include "opaque.h" @@ -561,15 +562,6 @@ VAuditF(const char *f, va_list args) prefix = AuditPrefix(); len = vsnprintf(buf, sizeof(buf), f, args); -#if 1 - /* XXX Compressing duplicated messages is temporarily disabled to - * work around bugzilla 964: - * https://freedesktop.org/bugzilla/show_bug.cgi?id=964 - */ - ErrorF("%s%s", prefix != NULL ? prefix : "", buf); - oldlen = -1; - nrepeat = 0; -#else if (len == oldlen && strcmp(buf, oldbuf) == 0) { /* Message already seen */ nrepeat++; @@ -583,7 +575,6 @@ VAuditF(const char *f, va_list args) nrepeat = 0; auditTimer = TimerSet(auditTimer, 0, AUDIT_TIMEOUT, AuditFlush, NULL); } -#endif if (prefix != NULL) free(prefix); } |