From d0c30e7945e76ac119f6d867e27137c8a76f7e15 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Sat, 19 Jul 2014 15:00:38 +0200
Subject: fontconfig plink libX11 libxcb mesa git update 19 July 2014

plink revision 10207
xserver          commit cfa302d6224d10860e60491333950544c4fb9b04
libxcb           commit 49a61c8b459ab19c7f39e653bbb0d0339ea8f00f
libX11           commit 5525e8433f93bce464412f27cffa203ea628f368
fontconfig       commit 6781c6baef062eeea5b5b68e4a9c31ea6cd7539b
mesa             commit f6fc80734533140a69b30361fe0d4773a03515db
---
 xorg-server/os/access.c | 6 +++---
 xorg-server/os/log.c    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'xorg-server/os')

diff --git a/xorg-server/os/access.c b/xorg-server/os/access.c
index e8c0781f2..9fcf99a73 100644
--- a/xorg-server/os/access.c
+++ b/xorg-server/os/access.c
@@ -1217,9 +1217,9 @@ AddHost(ClientPtr client, int family, unsigned length,  /* of bytes in pAddr */
 }
 
 Bool
-ForEachHostInFamily(int family, Bool (*func) (unsigned char * /* addr */ ,
-                                              short /* len */ ,
-                                              void */* closure */ ),
+ForEachHostInFamily(int family, Bool (*func) (unsigned char *addr,
+                                              short len,
+                                              void *closure),
                     void *closure)
 {
     HOST *host;
diff --git a/xorg-server/os/log.c b/xorg-server/os/log.c
index a368569d0..2a721b948 100644
--- a/xorg-server/os/log.c
+++ b/xorg-server/os/log.c
@@ -697,7 +697,7 @@ LogVMessageVerbSigSafe(MessageType type, int verb, const char *format, va_list a
     if (sizeof(buf) - len == 1)
         buf[len - 1] = '\n';
 
-    newline = (buf[len - 1] == '\n');
+    newline = (len > 0 && buf[len - 1] == '\n');
     LogSWrite(verb, buf, len, newline);
 }
 
-- 
cgit v1.2.3