nx-libs/nx-X11/programs/Xserver/xkb, branch 3.5.99.22

rework xkb device private handling

2019-06-22T14:05:48+00:00

We can only free the xkbDevicePrivate because we do not know the details of any other (possible) extension. So let's limit to that one private for now and call the new xkbFreePrivates from dix (where such a function is completely missing).

xkb: fix what looks to be a copy-paste error with first vs firstMM

2019-06-22T09:30:54+00:00

commit 758393951233d1b2520cf4cefd33ec4288a3880a Author: Dave Airlie Date: Wed Sep 12 11:09:40 2018 +1000 xkb: fix what looks to be a copy-paste error with first vs firstMM Pointed out by coverity. Signed-off-by: Dave Airlie

xkmread.c: fix compiler warning

2019-06-22T09:30:54+00:00

xkmread.c: In function ‘XkmReadFileSectionName’: xkmread.c:1181:25: warning: ‘tmpTOC.type’ may be used uninitialized in this function [-Wmaybe-uninitialized] XkbConfigText(tmpTOC.type,XkbMessage),0);

xkb: Silence some compiler warnings

2019-06-22T09:30:54+00:00

commit 83913de25d35709b3ab7b0ab124b73924145d2dd Author: Adam Jackson Date: Thu Apr 5 12:59:11 2018 -0400 xkb: Silence some compiler warnings Of the form: ../xkb/XKBGAlloc.c: In function ‘SrvXkbAddGeomKeyAlias’: ../xkb/XKBGAlloc.c:591:13: warning: ‘strncpy’ specified bound 4 equals destination size [-Wstringop-truncation] strncpy(alias->real, realStr, XkbKeyNameLength); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ This is intentional; the code that reads from these fields never reads more than 4 bytes anyway. Rephrase things in terms of memcpy so that's clear. Obviously this is awful but in XKB awful is par. Signed-off-by: Adam Jackson Acked-by: Keith Packard

xkb: Use snprintf to measure string lengths instead of manual strlen math

2019-06-22T09:30:54+00:00

commit a4a2e814d5d0e6152307a301eda1d6fc1c555aaa Author: Alan Coopersmith Date: Sun Feb 13 21:36:02 2011 -0800 xkb: Use snprintf to measure string lengths instead of manual strlen math Signed-off-by: Alan Coopersmith Signed-off-by: Peter Hutterer Reviewed-by: Daniel Stone

xkbEvents.c: Fix "warning: unused variable `s'".

2019-06-22T09:30:54+00:00

commit 2391c409a2840d61fed93832650c0d6c82ebebdf Author: Eamon Walsh Date: Fri Jun 13 22:48:17 2008 -0400 Fix "warning: unused variable `s'".

XKB: Remove a bunch of mad ifdefs

2019-06-22T09:30:54+00:00

commit 534fc5140b039a8c98ab715d0a6740d513b41209 Author: Daniel Stone Date: Sun Feb 3 23:30:22 2008 +1100 XKB: Remove a bunch of mad ifdefs We have SEEK_SET and size_t, seriously. Also use DebugF instead of ifdef DEBUG, and ditch a couple of random bits that were never used.

xkb: remove oldState from XkbHandleActions.

2019-06-22T09:30:54+00:00

Fixes this cppcheck finding: [nx-X11/programs/Xserver/xkb/xkbActions.c:1306]: (error) Uninitialized variable: oldState commit 35a4b8e7f4526a92d44cb16a783f21030cd1f6df Author: Peter Hutterer Date: Tue May 5 16:51:59 2009 +1000 xkb: remove oldState from XkbHandleActions. I really don't know what the purpose of this variable is or was, aside from potentially clobbering up our key state since there's a path where it may be used uninitialised. Also, this means that xkbi->prev_state is now accessible from the DIX with meaningful data. Signed-off-by: Peter Hutterer

xkb: initialize tsyms

2019-06-18T22:39:58+00:00

Backport of this commit: commit b2167015043a458e9cf93b827b43eb5b7c552ce9 Author: Giuseppe Bilotta Date: Sat Nov 4 23:06:27 2017 +0100 xkb: initialize tsyms This fixes some “Conditional jump depends on uninitialized value(s)” errors spotted by valgrind. Reviewed-by: Eric Engestrom Signed-off-by: Giuseppe Bilotta

xkbUtils.c: Catch division by zero

2019-05-17T15:49:26+00:00

Fixes ArcticaProject/nx-libs#808