libxkbfile: Changes to 'master'

[Alan Coopersmith]

 include/X11/extensions/XKBfile.h  |    4 
 include/X11/extensions/XKBrules.h |    2 
 src/XKBfileInt.h                  |    2 
 src/cout.c                        |    4 
 src/maprules.c                    |   27 ----
 src/xkbatom.c                     |    4 
 src/xkbconfig.c                   |   20 --
 src/xkbmisc.c                     |   16 --
 src/xkbout.c                      |   17 --
 src/xkbtext.c                     |  254 ++++++++++++++++++--------------------
 src/xkmout.c                      |   16 +-
 src/xkmread.c                     |   22 ---
 12 files changed, 139 insertions(+), 249 deletions(-)

New commits:
commit 3b460259d0d21f9876cacd7e1f305d77b76724f7
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sun Oct 20 12:05:15 2013 -0700

    Constify atom name argument to XkbInternAtom
    
    Matches XInternAtom, which it wraps, and quiets a bunch of const warnings
    in xkbcomp.
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Ran Benita <ran234 at gmail.com>

commit 390acfe5bb88cdab509b5eaae4041f265e969d2b
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sun Oct 20 12:04:58 2013 -0700

    Convert sprintf calls to snprintf
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Ran Benita <ran234 at gmail.com>

commit 455c2f3715456fd88c2741bd2028a9f0a702bb28
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sun Oct 20 01:11:21 2013 -0700

    Don't dereference xkb pointer until after checking it for NULL
    
    Some compilers can perform mind-twistingly evil optimizations
    if you check for NULL after using it, others just let you segv.
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Ran Benita <ran234 at gmail.com>

commit 7544a9eb35d5850ae2e68d8cdab50f25ce7cd5d9
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sun Oct 20 01:01:37 2013 -0700

    unifdef -UXKB_IN_SERVER
    
    Xserver has its own copy of this code now, so we don't need to keep
    an unused copy in libxkbfile too.
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Ran Benita <ran234 at gmail.com>