From 7354f607833c69626d8692bc5176b18ea1cf6263 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 4 Jul 2011 14:26:13 +1000 Subject: [PATCH] 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 Reviewed-by: Daniel Stone --- hw/xfree86/common/xf86Config.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index 2dba088ad..c7d567d55 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c @@ -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;