xfree86: nest loops instead of 0x1 pointers.
If we find the core device, move all other device pointers forward right then and there. The break will jump out of the top loop. They had a special on braces today, so I added some for readability (and fixed up tab vs space indentation. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Daniel Stone <daniel@fooishbar.org>
This commit is contained in:
parent
5669aa2d24
commit
7354f60783
|
@ -1139,15 +1139,14 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
|
||||||
* removed.
|
* removed.
|
||||||
*/
|
*/
|
||||||
if (corePointer) {
|
if (corePointer) {
|
||||||
for (devs = servlayoutp->inputs; devs && *devs; devs++)
|
for (devs = servlayoutp->inputs; devs && *devs; devs++) {
|
||||||
if (*devs == corePointer)
|
if (*devs == corePointer) {
|
||||||
{
|
|
||||||
free(*devs);
|
free(*devs);
|
||||||
*devs = (InputInfoPtr)0x1; /* ensure we dont skip next loop*/
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
for (; devs && *devs; devs++)
|
for (; devs && *devs; devs++)
|
||||||
devs[0] = devs[1];
|
devs[0] = devs[1];
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
count--;
|
count--;
|
||||||
}
|
}
|
||||||
corePointer = NULL;
|
corePointer = NULL;
|
||||||
|
@ -1285,15 +1284,14 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
|
||||||
* removed.
|
* removed.
|
||||||
*/
|
*/
|
||||||
if (coreKeyboard) {
|
if (coreKeyboard) {
|
||||||
for (devs = servlayoutp->inputs; devs && *devs; devs++)
|
for (devs = servlayoutp->inputs; devs && *devs; devs++) {
|
||||||
if (*devs == coreKeyboard)
|
if (*devs == coreKeyboard) {
|
||||||
{
|
|
||||||
free(*devs);
|
free(*devs);
|
||||||
*devs = (InputInfoPtr)0x1; /* ensure we dont skip next loop */
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
for (; devs && *devs; devs++)
|
for (; devs && *devs; devs++)
|
||||||
devs[0] = devs[1];
|
devs[0] = devs[1];
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
count--;
|
count--;
|
||||||
}
|
}
|
||||||
coreKeyboard = NULL;
|
coreKeyboard = NULL;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user