From f2c28743a465f7be02275eddd69a49b50b912f3f Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Tue, 12 Aug 2025 18:51:31 +0200 Subject: [PATCH] present: 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 --- present/present_scmd.c | 8 ++++---- present/present_screen.c | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/present/present_scmd.c b/present/present_scmd.c index efd8267b29..5628d197c8 100644 --- a/present/present_scmd.c +++ b/present/present_scmd.c @@ -410,14 +410,14 @@ present_event_notify(uint64_t event_id, uint64_t ust, uint64_t msc) } for (s = 0; s < screenInfo.numScreens; s++) { - ScreenPtr screen = screenInfo.screens[s]; - present_screen_priv_ptr screen_priv = present_screen_priv(screen); + ScreenPtr walkScreen = screenInfo.screens[s]; + present_screen_priv_ptr screen_priv = present_screen_priv(walkScreen); if (event_id == screen_priv->unflip_event_id) { DebugPresent(("\tun %" PRIu64 "\n", event_id)); screen_priv->unflip_event_id = 0; - present_flip_idle(screen); - present_flip_try_ready(screen); + present_flip_idle(walkScreen); + present_flip_try_ready(walkScreen); return; } } diff --git a/present/present_screen.c b/present/present_screen.c index ce9a2103ab..7a2c14ce2e 100644 --- a/present/present_screen.c +++ b/present/present_screen.c @@ -262,7 +262,8 @@ present_extension_init(void) goto bail; for (i = 0; i < screenInfo.numScreens; i++) { - if (!present_screen_init(screenInfo.screens[i], NULL)) + ScreenPtr walkScreen = screenInfo.screens[i]; + if (!present_screen_init(walkScreen, NULL)) goto bail; } return;