From 5ebbc3a366287b631775ed3e17537580d380db8a Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 30 Aug 2013 15:35:17 +0200
Subject: fontconfig mesa xserver xkeyboard-config xkbcomp git update 30 aug
 2013

xserver          commit 94d4e29aedc69431fa9b299ca1b67947173d7a24
xkeyboard-config commit fcb91cb1013cbdd87a6f77533f188d5934f24046
xkbcomp          commit 24d18e0a844041ef82441adb16aa18cc4b4814ae
fontconfig       commit 071ce44c35733e54cb477cc75810cbe55025b619
mesa             commit f7217b99f243738f941a5d009c68387dfadcb50a
---
 xkbcomp/xkbscan.c | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'xkbcomp')

diff --git a/xkbcomp/xkbscan.c b/xkbcomp/xkbscan.c
index 144f315dd..237f52084 100644
--- a/xkbcomp/xkbscan.c
+++ b/xkbcomp/xkbscan.c
@@ -388,9 +388,9 @@ yyGetString(void)
         if (i < sizeof(scanBuf) - 1)
             scanBuf[i++] = ch;
     }
+    scanBuf[i] = '\0';
     if (ch == '"')
     {
-        scanBuf[i++] = '\0';
         scanStrLine = lineNum;
         return STRING;
     }
@@ -401,7 +401,6 @@ static int
 yyGetKeyName(void)
 {
     int ch, i;
-    int last;
 
     i = 0;
     while (((ch = scanchar()) != EOF) && (ch != '>'))
@@ -463,24 +462,15 @@ yyGetKeyName(void)
             else
                 return ERROR_TOK;
         }
-
         if (i < sizeof(scanBuf) - 1)
             scanBuf[i++] = ch;
     }
-
-    if (i < sizeof(scanBuf) - i)
-        last = i;
-    else
-        last = sizeof(scanBuf) - 1;
-
-    scanBuf[last] = '\0';
-
+    scanBuf[i] = '\0';
     if ((ch == '>') && (i < 5))
     {
         scanStrLine = lineNum;
         return KEYNAME;
     }
-
     return ERROR_TOK;
 }
 
-- 
cgit v1.2.3