xserver: Branch 'master'

[GitLab Mirror]

 xkb/xkb.c |    3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 9432106b304a40a298ce868cea0683101ea3304b
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Wed Mar 20 19:21:19 2024 +0100

    xkb: drop unused variable extDevReason
    
    fix warning on unused variable:
    
    > ../xkb/xkb.c:3576:18: warning: variable 'extDevReason' set but not used [-Wunused-but-set-variable]
    >     unsigned int extDevReason;
                     ^
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1426>

diff --git a/xkb/xkb.c b/xkb/xkb.c
index 751b4acfb..bd44a2094 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -3569,7 +3569,6 @@ static int
 _XkbSetNamedIndicator(ClientPtr client, DeviceIntPtr dev,
                       xkbSetNamedIndicatorReq * stuff)
 {
-    unsigned int extDevReason;
     unsigned int statec, namec, mapc;
     XkbSrvLedInfoPtr sli;
     int led = 0;
@@ -3591,11 +3590,9 @@ _XkbSetNamedIndicator(ClientPtr client, DeviceIntPtr dev,
         return BadAlloc;
 
     namec = mapc = statec = 0;
-    extDevReason = 0;
 
     namec |= (1 << led);
     sli->namesPresent |= ((stuff->indicator != None) ? (1 << led) : 0);
-    extDevReason |= XkbXI_IndicatorNamesMask;
 
     if (stuff->setMap) {
         map->flags = stuff->flags;