From 6730e673d6c3217b65aed2a89f683c4fb9a17a3d Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Tue, 12 Aug 2025 18:51:31 +0200
Subject: [PATCH] Xi: canonical `walkScreen` variable on screen list iterations

When iterating screen lists, consistently use the same variable name
`walkScreen` for holding current screen pointer everywhere.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 Xi/closedev.c   |  6 +++---
 Xi/exevents.c   |  7 +++----
 Xi/xibarriers.c | 10 +++++-----
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/Xi/closedev.c b/Xi/closedev.c
index 7979facd25..33f997d243 100644
--- a/Xi/closedev.c
+++ b/Xi/closedev.c
@@ -122,7 +122,6 @@ int
 ProcXCloseDevice(ClientPtr client)
 {
     int rc, i;
-    WindowPtr pWin, p1;
     DeviceIntPtr d;
 
     REQUEST(xCloseDeviceReq);
@@ -140,9 +139,10 @@ ProcXCloseDevice(ClientPtr client)
      * Delete passive grabs from all windows for this device.      */
 
     for (i = 0; i < screenInfo.numScreens; i++) {
-        pWin = screenInfo.screens[i]->root;
+        ScreenPtr walkScreen = screenInfo.screens[i];
+        WindowPtr pWin = walkScreen->root;
         DeleteDeviceEvents(d, pWin, client);
-        p1 = pWin->firstChild;
+        WindowPtr p1 = pWin->firstChild;
         DeleteEventsFromChildren(d, p1, client);
     }
 
diff --git a/Xi/exevents.c b/Xi/exevents.c
index 8afd776c8f..428c795753 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -3308,14 +3308,13 @@ void
 SendEventToAllWindows(DeviceIntPtr dev, Mask mask, xEvent *ev, int count)
 {
     int i;
-    WindowPtr pWin, p1;
-
     for (i = 0; i < screenInfo.numScreens; i++) {
-        pWin = screenInfo.screens[i]->root;
+        ScreenPtr walkScreen = screenInfo.screens[i];
+        WindowPtr pWin = walkScreen->root;
         if (!pWin)
             continue;
         DeliverEventsToWindow(dev, pWin, ev, count, mask, NullGrab);
-        p1 = pWin->firstChild;
+        WindowPtr p1 = pWin->firstChild;
         FindInterestedChildren(dev, p1, mask, ev, count);
     }
 }
diff --git a/Xi/xibarriers.c b/Xi/xibarriers.c
index 977a497142..6e1358b818 100644
--- a/Xi/xibarriers.c
+++ b/Xi/xibarriers.c
@@ -938,14 +938,14 @@ XIBarrierInit(void)
         return FALSE;
 
     for (i = 0; i < screenInfo.numScreens; i++) {
-        ScreenPtr pScreen = screenInfo.screens[i];
+        ScreenPtr walkScreen = screenInfo.screens[i];
         BarrierScreenPtr cs;
 
         cs = (BarrierScreenPtr) calloc(1, sizeof(BarrierScreenRec));
         if (!cs)
             return FALSE;
         xorg_list_init(&cs->barriers);
-        SetBarrierScreen(pScreen, cs);
+        SetBarrierScreen(walkScreen, cs);
     }
 
     PointerBarrierType = CreateNewResourceType(BarrierFreeBarrier,
@@ -959,9 +959,9 @@ XIBarrierReset(void)
 {
     int i;
     for (i = 0; i < screenInfo.numScreens; i++) {
-        ScreenPtr pScreen = screenInfo.screens[i];
-        BarrierScreenPtr cs = GetBarrierScreen(pScreen);
+        ScreenPtr walkScreen = screenInfo.screens[i];
+        BarrierScreenPtr cs = GetBarrierScreen(walkScreen);
         free(cs);
-        SetBarrierScreen(pScreen, NULL);
+        SetBarrierScreen(walkScreen, NULL);
     }
 }