From 44ae54e3c61c404e47fdf19f675c79ea200cfa32 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Tue, 12 Aug 2025 18:51:31 +0200 Subject: [PATCH] xfixes: 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 --- xfixes/cursor.c | 8 ++++---- xfixes/region.c | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/xfixes/cursor.c b/xfixes/cursor.c index 738d433130..6f85fa1265 100644 --- a/xfixes/cursor.c +++ b/xfixes/cursor.c @@ -1038,10 +1038,10 @@ XFixesCursorInit(void) return FALSE; for (i = 0; i < screenInfo.numScreens; i++) { - ScreenPtr pScreen = screenInfo.screens[i]; - CursorScreenPtr cs = GetCursorScreen(pScreen); - dixScreenHookClose(pScreen, CursorScreenClose); - Wrap(cs, pScreen, DisplayCursor, CursorDisplayCursor); + ScreenPtr walkScreen = screenInfo.screens[i]; + CursorScreenPtr cs = GetCursorScreen(walkScreen); + dixScreenHookClose(walkScreen, CursorScreenClose); + Wrap(cs, walkScreen, DisplayCursor, CursorDisplayCursor); cs->pCursorHideCounts = NULL; } CursorClientType = CreateNewResourceType(CursorFreeClient, diff --git a/xfixes/region.c b/xfixes/region.c index 30c6fba6fb..8139dc2736 100644 --- a/xfixes/region.c +++ b/xfixes/region.c @@ -871,16 +871,16 @@ PanoramiXFixesSetWindowShapeRegion(ClientPtr client, xXFixesSetWindowShapeRegion VERIFY_REGION_OR_NONE(reg, stuff->region, client, DixReadAccess); FOR_NSCREENS_FORWARD(j) { - ScreenPtr screen = screenInfo.screens[j]; + ScreenPtr walkScreen = screenInfo.screens[j]; stuff->dest = win->info[j].id; if (reg) - RegionTranslate(reg, -screen->x, -screen->y); + RegionTranslate(reg, -walkScreen->x, -walkScreen->y); result = SingleXFixesSetWindowShapeRegion(client, stuff); if (reg) - RegionTranslate(reg, screen->x, screen->y); + RegionTranslate(reg, walkScreen->x, walkScreen->y); if (result != Success) break; @@ -907,16 +907,16 @@ PanoramiXFixesSetPictureClipRegion(ClientPtr client, xXFixesSetPictureClipRegion VERIFY_REGION_OR_NONE(reg, stuff->region, client, DixReadAccess); FOR_NSCREENS_BACKWARD(j) { - ScreenPtr screen = screenInfo.screens[j]; + ScreenPtr walkScreen = screenInfo.screens[j]; stuff->picture = pict->info[j].id; if (reg) - RegionTranslate(reg, -screen->x, -screen->y); + RegionTranslate(reg, -walkScreen->x, -walkScreen->y); result = SingleXFixesSetPictureClipRegion(client, stuff); if (reg) - RegionTranslate(reg, screen->x, screen->y); + RegionTranslate(reg, walkScreen->x, walkScreen->y); if (result != Success) break;