package/triggerhappy/0001-eventtable.h-use-correct-array-sizes-to-fix-building.patch

   1 From d3cfa80631a7e314fee9b2e0822e403fcf2a5c5c Mon Sep 17 00:00:00 2001
   2 From: Peter Korsgaard <peter@korsgaard.com>
   3 Date: Sun, 31 Jul 2016 10:28:43 +0200
   4 Subject: [PATCH] eventtable.h: use correct array sizes to fix building against
   5  4.7+ headers
   6 MIME-Version: 1.0
   7 Content-Type: text/plain; charset=UTF-8
   8 Content-Transfer-Encoding: 8bit
   9
  10 During the 4.7 development cycle, commit 9a9b6aa6a8 (Input: add
  11 SW_PEN_INSERTED define) got added, which has the same numerical value as
  12 SW_MAX:
  13
  14 +#define SW_PEN_INSERTED                0x0f  /* set = pen inserted */
  15 +#define SW_MAX                 0x0f
  16
  17 This breaks the build as the SW_NAME array is sized using the SW_MAX macro:
  18
  19 In file included from eventtable.h:21:0,
  20                  from eventnames.c:11:
  21 evtable_SW.inc:17:1: error: array index in initializer exceeds array bounds
  22  EV_MAP(SW_PEN_INSERTED),
  23  ^
  24 evtable_SW.inc:17:1: error: (near initialization for ‘SW_NAME’)
  25
  26 The arrays should be sized using the <foo>_CNT (which is MAX+1) macros
  27 instead of <foo>_MAX.  These got added during the 2.6.24 development cycle,
  28 so it should be safe to do so unconditially:
  29
  30 commit 7b19ada2ed3c1eccb9fe94d74b05e1428224663d
  31 Author: Jiri Slaby <jirislaby@gmail.com>
  32 Date:   Thu Oct 18 23:40:32 2007 -0700
  33
  34     get rid of input BIT* duplicate defines
  35
  36 Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
  37 ---
  38  eventtable.h | 6 +++---
  39  1 file changed, 3 insertions(+), 3 deletions(-)
  40
  41 diff --git a/eventtable.h b/eventtable.h
  42 index 349d9d7..7cd99aa 100644
  43 --- a/eventtable.h
  44 +++ b/eventtable.h
  45 @@ -8,15 +8,15 @@
  46
  47  #define EV_MAP( N ) [ N ] = #N
  48
  49 -static const char *EV_NAME[EV_MAX] = {
  50 +static const char *EV_NAME[EV_CNT] = {
  51  #include "evtable_EV.inc"
  52  };
  53
  54 -static const char *KEY_NAME[KEY_MAX] = {
  55 +static const char *KEY_NAME[KEY_CNT] = {
  56  #include "evtable_KEY.inc"
  57  #include "evtable_BTN.inc"
  58  };
  59
  60 -static const char *SW_NAME[SW_MAX] = {
  61 +static const char *SW_NAME[SW_CNT] = {
  62  #include "evtable_SW.inc"
  63  };
  64 --
  65 2.8.1
  66