Skip to content

N
nx-libs
Commit 56dcc8a4 authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel
Browse files
Options

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: 's avatarPeter Hutterer <peter.hutterer@who-t.net>
parent c8520ac0
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
nx-X11/programs/Xserver/xkb/xkbActions.c
View file @ 56dcc8a4
...@@ -1142,7 +1142,6 @@ XkbSrvInfoPtr xkbi; ...@@ -1142,7 +1142,6 @@ XkbSrvInfoPtr xkbi;
KeyClassPtr keyc; KeyClassPtr keyc;
int changed,sendEvent; int changed,sendEvent;
Bool genStateNotify; Bool genStateNotify;
XkbStateRec oldState;
XkbAction act; XkbAction act;
XkbFilterPtr filter; XkbFilterPtr filter;
Bool keyEvent; Bool keyEvent;
...@@ -1157,7 +1156,7 @@ xkbDeviceInfoPtr xkbPrivPtr = XKBDEVICEINFO(dev); ...@@ -1157,7 +1156,7 @@ xkbDeviceInfoPtr xkbPrivPtr = XKBDEVICEINFO(dev);
xkbi= keyc->xkbInfo; xkbi= keyc->xkbInfo;
key= xE->u.u.detail; key= xE->u.u.detail;
if ((xkbi->flags&_XkbStateNotifyInProgress)==0) { if ((xkbi->flags&_XkbStateNotifyInProgress)==0) {
oldState= xkbi->state; xkbi->prev_state = xkbi->state;
xkbi->flags|= _XkbStateNotifyInProgress; xkbi->flags|= _XkbStateNotifyInProgress;
genStateNotify= True; genStateNotify= True;
} }
...@@ -1303,11 +1302,10 @@ xkbDeviceInfoPtr xkbPrivPtr = XKBDEVICEINFO(dev); ...@@ -1303,11 +1302,10 @@ xkbDeviceInfoPtr xkbPrivPtr = XKBDEVICEINFO(dev);
else if (keyEvent) else if (keyEvent)
FixKeyState(xE,dev); FixKeyState(xE,dev);
xkbi->prev_state= oldState;
XkbComputeDerivedState(xkbi); XkbComputeDerivedState(xkbi);
keyc->prev_state= keyc->state; keyc->prev_state= keyc->state;
keyc->state= XkbStateFieldFromRec(&xkbi->state); keyc->state= XkbStateFieldFromRec(&xkbi->state);
changed = XkbStateChangedFlags(&oldState,&xkbi->state); changed = XkbStateChangedFlags(&xkbi->prev_state,&xkbi->state);
if (genStateNotify) { if (genStateNotify) {
if (changed) { if (changed) {
xkbStateNotify sn; xkbStateNotify sn;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment