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@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@who-t.net>

xkb: remove oldState from XkbHandleActions.
56dcc8a4 · Ulrich Sibiller · Mike Gabriel · c8520ac0 · 56dcc8a4
Commit 56dcc8a4 authored Jun 21, 2019 by Ulrich Sibiller Committed by Mike Gabriel Jun 22, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

xkbActions.c nx-X11/programs/Xserver/xkb/xkbActions.c +2 -4

No files found.
--- 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;