andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xfree86: nest loops instead of 0x1 pointers.

Browse Source 
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:
Peter Hutterer 2011-07-04 14:26:13 +10:00
parent 5669aa2d24
commit 7354f60783
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
hw/xfree86/common/xf86Config.c
View File

@ -1139,15 +1139,14 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
* removed.
*/
if (corePointer) {
for (devs = servlayoutp->inputs; devs && *devs; devs++)
if (*devs == corePointer)
{
free(*devs);
*devs = (InputInfoPtr)0x1; /* ensure we dont skip next loop*/
for (devs = servlayoutp->inputs; devs && *devs; devs++) {
if (*devs == corePointer) {
free(*devs);
for (; devs && *devs; devs++)
devs[0] = devs[1];
break;
}
for (; devs && *devs; devs++)
devs[0] = devs[1];
}
}
count--;
}
corePointer = NULL;
@ -1285,15 +1284,14 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
* removed.
*/
if (coreKeyboard) {
for (devs = servlayoutp->inputs; devs && *devs; devs++)
if (*devs == coreKeyboard)
{
free(*devs);
*devs = (InputInfoPtr)0x1; /* ensure we dont skip next loop */
for (devs = servlayoutp->inputs; devs && *devs; devs++) {
if (*devs == coreKeyboard) {
free(*devs);
for (; devs && *devs; devs++)
devs[0] = devs[1];
break;
}
for (; devs && *devs; devs++)
devs[0] = devs[1];
}
}
count--;
}
coreKeyboard = NULL;