xkbcomp: Changes to 'master'

[Alan Coopersmith]

 symbols.c |    4 ----
 xkbscan.c |    6 +++---
 2 files changed, 3 insertions(+), 7 deletions(-)

New commits:
commit b4fafc4fa7edc4c04c3c0affae0d7f79a63e8d2f
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Wed Dec 28 20:57:55 2011 -0800

    Delete redundant redeclarations of extern Atoms in symbols.c
    
    Fixes gcc warnings of:
    
    symbols.c:43: warning: redundant redeclaration of 'tok_ONE_LEVEL'
    tokens.h:99: warning: previous declaration of 'tok_ONE_LEVEL' was here
    symbols.c:44: warning: redundant redeclaration of 'tok_TWO_LEVEL'
    tokens.h:100: warning: previous declaration of 'tok_TWO_LEVEL' was here
    symbols.c:45: warning: redundant redeclaration of 'tok_KEYPAD'
    tokens.h:102: warning: previous declaration of 'tok_KEYPAD' was here
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit 3835cae3cb1ad1073cbb2711f938beb878b4986c
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Wed Dec 28 20:53:45 2011 -0800

    Make sure to leave room for trailing nil byte in yyGetNumber
    
    ...though really, by the time you've added 1023 digits to the number
    you want to parse, you've got much bigger problems than an off-by-one
    error in your buffer count.
    
    Fixes parfait warnings:
       Buffer overflow (CWE 120): In array dereference of (*buf)[nInBuf] with index 'nInBuf'
          Array size is 1024 bytes, nInBuf >= 1 and nInBuf <= 1024
            at line 625 of xkbscan.c in function 'yyGetNumber'.
       Buffer overflow (CWE 120): In array dereference of (*buf)[nInBuf] with index 'nInBuf'
          Array size is 1024 bytes, nInBuf <= 1025
            at line 632 of xkbscan.c in function 'yyGetNumber'.
    
    [ This bug was found by the Parfait 0.4.2 bug checking tool.
      For more information see http://labs.oracle.com/projects/parfait/ ]
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>