[PULL updated] button mapping fix and unconstify patches

[Peter Hutterer]

Changes to original pull request: more unconstify patches ("xfree86: device
name ..." and down)

The following changes since commit 83e38eb73fd8c852513aac2da2975b4c01070ec2:

  edid: Add quirk for Sony Vaio Pro 13 (2014-01-30 16:27:59 -0800)

are available in the git repository at:

  git://people.freedesktop.org/~whot/xserver for-keith

for you to fetch changes up to 0b193b3ac94e078d9291d1b1dfd4814e5f2d9e34:

  xfree86: use xnfstrdup in the Xorg -configure code (2014-02-10 07:02:38 +1000)

----------------------------------------------------------------
Peter Hutterer (17):
      Xi: remove superfluous cast.
      xkb: add a call to init an XkbRMLVOSet from const chars
      input: un-constify InputAttributes
      Revert "os: xstrtokenize takes and returns const char * now"
      input: un-constify dev->name
      Revert "xfree86/parser: make strings in xf86MatchGroup const"
      Revert "xfree86/common: handle string constants in xf86Xinput configuration"
      dix: prevent a driver from initializing or submitting buttons > MAX_BUTTONS
      include: make the various button array lengths more obvious
      dix: fix button state check before changing a button mapping
      xfree86: device name and driver are not const char
      xfree86: un-constify inp_driver/inp_identifier
      xfree86: unconstify another string
      xfree86: unconstify driver in the XF86ConfInputClassRec
      dix: fix a -Wshadow warning
      mi: fix printf warning about size_t format specifier
      xfree86: use xnfstrdup in the Xorg -configure code

 Xi/extinit.c                      |  4 +--
 Xi/listdev.c                      |  2 +-
 config/udev.c                     | 14 +++++-----
 dix/devices.c                     |  3 ++-
 dix/dispatch.c                    |  4 +--
 dix/getevents.c                   |  2 ++
 dix/inpututils.c                  | 19 ++++++-------
 hw/xfree86/common/xf86Config.c    | 16 +++++------
 hw/xfree86/common/xf86Configure.c | 42 ++++++++++++++---------------
 hw/xfree86/common/xf86Xinput.c    |  4 +--
 hw/xfree86/common/xf86Xinput.h    |  4 +--
 hw/xfree86/parser/InputClass.c    | 24 ++++++++---------
 hw/xfree86/parser/xf86Parser.h    | 10 +++----
 include/input.h                   | 16 +++++------
 include/inputstr.h                |  2 +-
 include/misc.h                    |  2 +-
 include/xkbrules.h                | 10 +++----
 include/xkbsrv.h                  |  8 ++++++
 mi/mieq.c                         |  2 +-
 os/utils.c                        |  6 ++---
 test/input.c                      | 56 +++++++++++++++++++++------------------
 test/touch.c                      | 20 ++++++++++----
 test/xkb.c                        | 18 ++++++++-----
 xkb/xkbInit.c                     | 25 +++++++++++++----
 24 files changed, 179 insertions(+), 134 deletions(-)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20140210/b6ed54ae/attachment.pgp>