From f00f20aa8ed81d281d24241192762c22c1f7d7b0 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Wed, 3 Sep 2025 17:49:35 +0200
Subject: [PATCH] Xi: ProcXCloseDevice(): compactify the loop a bit

In preparation of upcoming screen iterator macros, compactify the
loop body a little bit. This function is so cold that it's not
really worth caching the screen's root window pointer.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 Xi/closedev.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Xi/closedev.c b/Xi/closedev.c
index 33f997d243..5edff83e89 100644
--- a/Xi/closedev.c
+++ b/Xi/closedev.c
@@ -140,10 +140,8 @@ ProcXCloseDevice(ClientPtr client)
 
     for (i = 0; i < screenInfo.numScreens; i++) {
         ScreenPtr walkScreen = screenInfo.screens[i];
-        WindowPtr pWin = walkScreen->root;
-        DeleteDeviceEvents(d, pWin, client);
-        WindowPtr p1 = pWin->firstChild;
-        DeleteEventsFromChildren(d, p1, client);
+        DeleteDeviceEvents(d, walkScreen->root, client);
+        DeleteEventsFromChildren(d, walkScreen->root->firstChild, client);
     }
 
     return Success;