[X2Go-Commits] [nx-libs] 106/219: xkb: remove oldState from XkbHandleActions.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 56dcc8a4b6a9ed3b7f55e0eeaeff9bc14737cdd5
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Fri Jun 21 10:10:21 2019 +0200

    xkb: remove oldState from XkbHandleActions.
    
    Fixes this cppcheck finding:
    [nx-X11/programs/Xserver/xkb/xkbActions.c:1306]: (error) Uninitialized variable: oldState
    
      commit 35a4b8e7f4526a92d44cb16a783f21030cd1f6df
      Author: Peter Hutterer <peter.hutterer at who-t.net>
      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 <peter.hutterer at who-t.net>
---
 nx-X11/programs/Xserver/xkb/xkbActions.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/nx-X11/programs/Xserver/xkb/xkbActions.c b/nx-X11/programs/Xserver/xkb/xkbActions.c
index d2dda00f4..90bad93e0 100644
--- a/nx-X11/programs/Xserver/xkb/xkbActions.c
+++ b/nx-X11/programs/Xserver/xkb/xkbActions.c
@@ -1142,7 +1142,6 @@ XkbSrvInfoPtr	xkbi;
 KeyClassPtr	keyc;
 int		changed,sendEvent;
 Bool		genStateNotify;
-XkbStateRec	oldState;
 XkbAction	act;
 XkbFilterPtr	filter;
 Bool		keyEvent;
@@ -1157,7 +1156,7 @@ xkbDeviceInfoPtr xkbPrivPtr = XKBDEVICEINFO(dev);
     xkbi= keyc->xkbInfo;
     key= xE->u.u.detail;
     if ((xkbi->flags&_XkbStateNotifyInProgress)==0) {
-	oldState= xkbi->state;
+	xkbi->prev_state = xkbi->state;
 	xkbi->flags|= _XkbStateNotifyInProgress;
 	genStateNotify= True;
     }
@@ -1303,11 +1302,10 @@ xkbDeviceInfoPtr xkbPrivPtr = XKBDEVICEINFO(dev);
     else if (keyEvent)
 	FixKeyState(xE,dev);
 
-    xkbi->prev_state= oldState;
     XkbComputeDerivedState(xkbi);
     keyc->prev_state= keyc->state;
     keyc->state= XkbStateFieldFromRec(&xkbi->state);
-    changed = XkbStateChangedFlags(&oldState,&xkbi->state);
+    changed = XkbStateChangedFlags(&xkbi->prev_state,&xkbi->state);
     if (genStateNotify) {
 	if (changed) {
 	    xkbStateNotify	sn;

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git