frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XKB: Simplify a loop in ProcXkbGetKbdByName 

Replace:
    for (stuff; things; etc) {
        if (misc || other) {
            [...]
        }
    }
with:
    for (stuff; things; etc) {
        if (!misc && !other)
            continue;
        [...]
    }

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Daniel Stone 2011-05-03 02:50:48 +01:00 committed by Peter Hutterer
parent 72b6639c83
commit b8540d18c7
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
xkb/xkb.c
View File

@ -5870,21 +5870,22 @@ ProcXkbGetKbdByName(ClientPtr client)
xkb->ctrls->num_groups= nTG; xkb->ctrls->num_groups= nTG;
for (tmpd = inputInfo.devices; tmpd; tmpd = tmpd->next) { for (tmpd = inputInfo.devices; tmpd; tmpd = tmpd->next) {
if ((tmpd == dev) || (!IsMaster(tmpd) && GetMaster(tmpd, MASTER_KEYBOARD) == dev)) { if (tmpd != dev && GetMaster(tmpd, MASTER_KEYBOARD) != dev)
if (tmpd != dev) continue;
XkbCopyDeviceKeymap(tmpd, dev);
if (tmpd->kbdfeed && tmpd->kbdfeed->xkb_sli) { if (tmpd != dev)
old_sli = tmpd->kbdfeed->xkb_sli; XkbCopyDeviceKeymap(tmpd, dev);
tmpd->kbdfeed->xkb_sli = NULL;
sli = XkbAllocSrvLedInfo(tmpd, tmpd->kbdfeed, NULL, 0); if (tmpd->kbdfeed && tmpd->kbdfeed->xkb_sli) {
if (sli) { old_sli = tmpd->kbdfeed->xkb_sli;
sli->explicitState = old_sli->explicitState; tmpd->kbdfeed->xkb_sli = NULL;
sli->effectiveState = old_sli->effectiveState; sli = XkbAllocSrvLedInfo(tmpd, tmpd->kbdfeed, NULL, 0);
} if (sli) {
tmpd->kbdfeed->xkb_sli = sli; sli->explicitState = old_sli->explicitState;
XkbFreeSrvLedInfo(old_sli); sli->effectiveState = old_sli->effectiveState;
} }
tmpd->kbdfeed->xkb_sli = sli;
XkbFreeSrvLedInfo(old_sli);
} }
} }