aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/xkb/xkbLEDs.c
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-01-30 10:59:17 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-01-30 10:59:17 +0100
commitc8d69ebaeed8005d38c91613ab699747f45b2228 (patch)
treecd93f7cdaa242660d2c19ea5514cd3f674aaeb75 /nx-X11/programs/Xserver/xkb/xkbLEDs.c
parent105cd2be6dfce3579cb585a8d78f655f19cef57b (diff)
parent4821edfe0ecc2296745c4c5fcaa4c08245673c6e (diff)
downloadnx-libs-c8d69ebaeed8005d38c91613ab699747f45b2228.tar.gz
nx-libs-c8d69ebaeed8005d38c91613ab699747f45b2228.tar.bz2
nx-libs-c8d69ebaeed8005d38c91613ab699747f45b2228.zip
Merge branch 'uli42-pr/fix_shadowed_vars' into 3.6.x
Attributes GH PR #895: https://github.com/ArcticaProject/nx-libs/pull/895
Diffstat (limited to 'nx-X11/programs/Xserver/xkb/xkbLEDs.c')
-rw-r--r--nx-X11/programs/Xserver/xkb/xkbLEDs.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/xkb/xkbLEDs.c b/nx-X11/programs/Xserver/xkb/xkbLEDs.c
index 0fccd0913..9853efad5 100644
--- a/nx-X11/programs/Xserver/xkb/xkbLEDs.c
+++ b/nx-X11/programs/Xserver/xkb/xkbLEDs.c
@@ -630,11 +630,9 @@ XkbSrvLedInfoPtr sli;
/* optimization to check for most common case */
if (((class==XkbDfltXIClass)&&(id==XkbDfltXIId))&&(dev->kbdfeed)) {
- XkbSrvLedInfoPtr sli;
- sli= dev->kbdfeed->xkb_sli;
if (dev->kbdfeed->xkb_sli==NULL) {
- sli= XkbAllocSrvLedInfo(dev,dev->kbdfeed,NULL,needed_parts);
- dev->kbdfeed->xkb_sli= sli;
+ dev->kbdfeed->xkb_sli=
+ XkbAllocSrvLedInfo(dev,dev->kbdfeed,NULL,needed_parts);
}
return dev->kbdfeed->xkb_sli;
}