From d28d18ff00bf5bb89f31de9961fb748d2e790a5d Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Fri, 6 Feb 2026 20:21:49 +0100 Subject: [PATCH] dix: replace "screen" by "pScreen" in AttachDevice() Signed-off-by: Enrico Weigelt, metux IT consult --- dix/devices.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dix/devices.c b/dix/devices.c index af3ce9e6c7..a00590cfb3 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -2598,8 +2598,6 @@ ReleaseButtonsAndKeys(DeviceIntPtr dev) int AttachDevice(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr master) { - ScreenPtr screen; - if (!dev || InputDevIsMaster(dev)) return BadDevice; @@ -2614,8 +2612,8 @@ AttachDevice(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr master) /* free the existing sprite. */ if (InputDevIsFloating(dev) && dev->spriteInfo->paired == dev) { - screen = miPointerGetScreen(dev); - screen->DeviceCursorCleanup(dev, screen); + ScreenPtr pScreen = miPointerGetScreen(dev); + pScreen->DeviceCursorCleanup(dev, pScreen); free(dev->spriteInfo->sprite); dev->spriteInfo->sprite = NULL; } @@ -2637,8 +2635,8 @@ AttachDevice(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr master) currentRoot = dixGetMasterScreen()->root; /* we need to init a fake sprite */ - screen = currentRoot->drawable.pScreen; - screen->DeviceCursorInitialize(dev, screen); + ScreenPtr pScreen = currentRoot->drawable.pScreen; + pScreen->DeviceCursorInitialize(dev, pScreen); dev->spriteInfo->sprite = NULL; InitializeSprite(dev, currentRoot); dev->spriteInfo->spriteOwner = FALSE;