From 1c65d0949e0de1cd8184fd78b5567eecbeb02ebd Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Wed, 3 Sep 2025 16:27:03 +0200 Subject: [PATCH] glx: xorgGlxServerInit(): canonical screen iterator index in preparation of upcoming generic screen iterator macros, already rename the index variable to what the macro will be using. Signed-off-by: Enrico Weigelt, metux IT consult --- glx/glxext.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/glx/glxext.c b/glx/glxext.c index 858887a5c3..eb7bb2edf1 100644 --- a/glx/glxext.c +++ b/glx/glxext.c @@ -525,7 +525,6 @@ static void xorgGlxServerInit(CallbackListPtr *pcbl, void *param, void *ext) { const ExtensionEntry *extEntry = ext; - int i; if (!xorgGlxServerPreInit(extEntry)) { return; @@ -536,13 +535,13 @@ xorgGlxServerInit(CallbackListPtr *pcbl, void *param, void *ext) return; } - for (i = 0; i < screenInfo.numScreens; i++) { - ScreenPtr walkScreen = screenInfo.screens[i]; + for (int walkScreenIdx = 0; walkScreenIdx < screenInfo.numScreens; walkScreenIdx++) { + ScreenPtr walkScreen = screenInfo.screens[walkScreenIdx]; __GLXprovider *p; 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); + LogMessage(X_INFO, "GLX: Another vendor is already registered for screen %d\n", walkScreenIdx); continue; } @@ -551,7 +550,7 @@ xorgGlxServerInit(CallbackListPtr *pcbl, void *param, void *ext) if (glxScreen != NULL) { LogMessage(X_INFO, "GLX: Initialized %s GL provider for screen %d\n", - p->name, i); + p->name, walkScreenIdx); break; } @@ -561,7 +560,7 @@ xorgGlxServerInit(CallbackListPtr *pcbl, void *param, void *ext) glxServer.setScreenVendor(walkScreen, glvnd_vendor); } else { LogMessage(X_INFO, - "GLX: no usable GL providers found for screen %d\n", i); + "GLX: no usable GL providers found for screen %d\n", walkScreenIdx); } } }