From d8149d9c9e1004c00a5db98a8293dff6b2a549a2 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] glx: 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>
---
 glx/glxext.c | 18 +++++++++---------
 glx/vndext.c | 18 ++++++++++++------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/glx/glxext.c b/glx/glxext.c
index 8c50c8b6c4..858887a5c3 100644
--- a/glx/glxext.c
+++ b/glx/glxext.c
@@ -287,11 +287,11 @@ checkScreenVisuals(void)
     int i, j;
 
     for (i = 0; i < screenInfo.numScreens; i++) {
-        ScreenPtr screen = screenInfo.screens[i];
-        for (j = 0; j < screen->numVisuals; j++) {
-            if ((screen->visuals[j].class == TrueColor ||
-                 screen->visuals[j].class == DirectColor) &&
-                screen->visuals[j].nplanes > 12)
+        ScreenPtr walkScreen = screenInfo.screens[i];
+        for (j = 0; j < walkScreen->numVisuals; j++) {
+            if ((walkScreen->visuals[j].class == TrueColor ||
+                 walkScreen->visuals[j].class == DirectColor) &&
+                walkScreen->visuals[j].nplanes > 12)
                 return TRUE;
         }
     }
@@ -537,17 +537,17 @@ xorgGlxServerInit(CallbackListPtr *pcbl, void *param, void *ext)
     }
 
     for (i = 0; i < screenInfo.numScreens; i++) {
-        ScreenPtr pScreen = screenInfo.screens[i];
+        ScreenPtr walkScreen = screenInfo.screens[i];
         __GLXprovider *p;
 
-        if (glxServer.getVendorForScreen(NULL, pScreen) != NULL) {
+        if (glxServer.getVendorForScreen(NULL, walkScreen) != NULL) {
             // There's already a vendor registered.
             LogMessage(X_INFO, "GLX: Another vendor is already registered for screen %d\n", i);
             continue;
         }
 
         for (p = __glXProviderStack; p != NULL; p = p->next) {
-            __GLXscreen *glxScreen = p->screenProbe(pScreen);
+            __GLXscreen *glxScreen = p->screenProbe(walkScreen);
             if (glxScreen != NULL) {
                 LogMessage(X_INFO,
                            "GLX: Initialized %s GL provider for screen %d\n",
@@ -558,7 +558,7 @@ xorgGlxServerInit(CallbackListPtr *pcbl, void *param, void *ext)
         }
 
         if (p) {
-            glxServer.setScreenVendor(pScreen, glvnd_vendor);
+            glxServer.setScreenVendor(walkScreen, glvnd_vendor);
         } else {
             LogMessage(X_INFO,
                        "GLX: no usable GL providers found for screen %d\n", i);
diff --git a/glx/vndext.c b/glx/vndext.c
index bfaa337176..86cc012b82 100644
--- a/glx/vndext.c
+++ b/glx/vndext.c
@@ -98,9 +98,10 @@ GlxMappingReset(void)
     int i;
 
     for (i=0; i<screenInfo.numScreens; i++) {
-        GlxScreenPriv *priv = xglvGetScreenPrivate(screenInfo.screens[i]);
+        ScreenPtr walkScreen = screenInfo.screens[i];
+        GlxScreenPriv *priv = xglvGetScreenPrivate(walkScreen);
         if (priv != NULL) {
-            xglvSetScreenPrivate(screenInfo.screens[i], NULL);
+            xglvSetScreenPrivate(walkScreen, NULL);
             free(priv);
         }
     }
@@ -112,7 +113,8 @@ GlxMappingInit(void)
     int i;
 
     for (i=0; i<screenInfo.numScreens; i++) {
-        if (GlxGetScreen(screenInfo.screens[i]) == NULL) {
+        ScreenPtr walkScreen = screenInfo.screens[i];
+        if (GlxGetScreen(walkScreen) == NULL) {
             GlxMappingReset();
             return FALSE;
         }
@@ -153,7 +155,8 @@ GlxGetClientData(ClientPtr client)
             cl->vendors = (GlxServerVendor **) (cl + 1);
             for (i=0; i<screenInfo.numScreens; i++)
             {
-                cl->vendors[i] = GlxGetVendorForScreen(NULL, screenInfo.screens[i]);
+                ScreenPtr walkScreen = screenInfo.screens[i];
+                cl->vendors[i] = GlxGetVendorForScreen(NULL, walkScreen);
             }
 
             xglvSetClientPrivate(client, cl);
@@ -250,9 +253,12 @@ GlxExtensionInit(void)
     CallCallbacks(&vndInitCallbackListPtr, extEntry);
 
     /* We'd better have found at least one vendor */
-    for (int i = 0; i < screenInfo.numScreens; i++)
-        if (GlxGetVendorForScreen(serverClient, screenInfo.screens[i]))
+    for (int i = 0; i < screenInfo.numScreens; i++) {
+        ScreenPtr walkScreen = screenInfo.screens[i];
+        if (GlxGetVendorForScreen(serverClient, walkScreen))
             return;
+    }
+
     extEntry->base = 0;
 }