XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-14 17:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

mi: canonical walkScreen variable on screen list iterations

Browse Source 
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>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-08-12 18:51:31 +02:00
committed by Enrico Weigelt
parent 6730e673d6
commit 17bf4e677e
1 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
mi/midispcur.c
View File

@@ -435,22 +435,21 @@ Bool
miDCDeviceInitialize(DeviceIntPtr pDev, ScreenPtr pScreen)
{
miDCBufferPtr pBuffer;
WindowPtr pWin;
int i;
if (!DevHasCursor(pDev))
return TRUE;
for (i = 0; i < screenInfo.numScreens; i++) {
pScreen = screenInfo.screens[i];
ScreenPtr walkScreen = screenInfo.screens[i];
pBuffer = calloc(1, sizeof(miDCBufferRec));
if (!pBuffer)
goto failure;
dixSetScreenPrivate(&pDev->devPrivates, miDCDeviceKey, pScreen,
dixSetScreenPrivate(&pDev->devPrivates, miDCDeviceKey, walkScreen,
pBuffer);
pWin = pScreen->root;
WindowPtr pWin = walkScreen->root;
pBuffer->pSourceGC = miDCMakeGC(pWin);
if (!pBuffer->pSourceGC)
@@ -472,28 +471,25 @@ miDCDeviceInitialize(DeviceIntPtr pDev, ScreenPtr pScreen)
/* (re)allocated lazily depending on the cursor size */
pBuffer->pSave = NULL;
continue;
failure:
miDCDeviceCleanup(pDev, walkScreen);
return FALSE;
}
return TRUE;
failure:
miDCDeviceCleanup(pDev, pScreen);
return FALSE;
}
void
miDCDeviceCleanup(DeviceIntPtr pDev, ScreenPtr pScreen)
{
miDCBufferPtr pBuffer;
int i;
if (DevHasCursor(pDev)) {
for (i = 0; i < screenInfo.numScreens; i++) {
pScreen = screenInfo.screens[i];
pBuffer = miGetDCDevice(pDev, pScreen);
ScreenPtr walkScreen = screenInfo.screens[i];
miDCBufferPtr pBuffer = miGetDCDevice(pDev, walkScreen);
if (pBuffer) {
if (pBuffer->pSourceGC)
@@ -512,7 +508,7 @@ miDCDeviceCleanup(DeviceIntPtr pDev, ScreenPtr pScreen)
dixDestroyPixmap(pBuffer->pSave, 0);
free(pBuffer);
dixSetScreenPrivate(&pDev->devPrivates, miDCDeviceKey, pScreen,
dixSetScreenPrivate(&pDev->devPrivates, miDCDeviceKey, walkScreen,
NULL);
}
}