XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-24 05:54:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

dbe: 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 4bb89cdcdf
commit 840109488a
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
dbe/dbe.c
View File

@@ -1181,16 +1181,15 @@ static void
DbeResetProc(ExtensionEntry * extEntry)
{
int i;
ScreenPtr pScreen;
DbeScreenPrivPtr pDbeScreenPriv;
for (i = 0; i < screenInfo.numScreens; i++) {
pScreen = screenInfo.screens[i];
pDbeScreenPriv = DBE_SCREEN_PRIV(pScreen);
ScreenPtr walkScreen = screenInfo.screens[i];
pDbeScreenPriv = DBE_SCREEN_PRIV(walkScreen);
if (pDbeScreenPriv) {
dixScreenUnhookWindowDestroy(pScreen, miDbeWindowDestroy);
dixScreenUnhookWindowPosition(pScreen, miDbeWindowPosition);
dixScreenUnhookWindowDestroy(walkScreen, miDbeWindowDestroy);
dixScreenUnhookWindowPosition(walkScreen, miDbeWindowPosition);
free(pDbeScreenPriv);
}
}
@@ -1269,7 +1268,7 @@ DbeExtensionInit(void)
* interface.
*/
ScreenPtr pScreen = screenInfo.screens[i];
ScreenPtr walkScreen = screenInfo.screens[i];
if (!(pDbeScreenPriv = calloc(1, sizeof(DbeScreenPrivRec)))) {
/* If we can not alloc a window or screen private,
@@ -1277,15 +1276,16 @@ DbeExtensionInit(void)
*/
for (j = 0; j < i; j++) {
free(dixLookupPrivate(&screenInfo.screens[j]->devPrivates,
walkScreen = screenInfo.screens[j];
free(dixLookupPrivate(&walkScreen->devPrivates,
dbeScreenPrivKey));
dixSetPrivate(&screenInfo.screens[j]->devPrivates,
dixSetPrivate(&walkScreen->devPrivates,
dbeScreenPrivKey, NULL);
}
return;
}
dixSetPrivate(&pScreen->devPrivates, dbeScreenPrivKey, pDbeScreenPriv);
dixSetPrivate(&walkScreen->devPrivates, dbeScreenPrivKey, pDbeScreenPriv);
{
/* We don't have DDX support for DBE anymore */
@@ -1295,18 +1295,18 @@ DbeExtensionInit(void)
pDbeScreenPriv->SetupBackgroundPainter = DbeSetupBackgroundPainter;
/* Setup DDX. */
ddxInitSuccess = miDbeInit(pScreen, pDbeScreenPriv);
ddxInitSuccess = miDbeInit(walkScreen, pDbeScreenPriv);
/* DDX DBE initialization may have the side affect of
* reallocating pDbeScreenPriv, so we need to update it.
*/
pDbeScreenPriv = DBE_SCREEN_PRIV(pScreen);
pDbeScreenPriv = DBE_SCREEN_PRIV(walkScreen);
if (ddxInitSuccess) {
/* Hook in our window destructor. The DDX initialization function
* already added WindowPosition hook for us.
*/
dixScreenHookWindowDestroy(pScreen, miDbeWindowDestroy);
dixScreenHookWindowDestroy(walkScreen, miDbeWindowDestroy);
}
else {
/* DDX initialization failed. Stub the screen. */
@@ -1324,9 +1324,9 @@ DbeExtensionInit(void)
/* All screens stubbed. Clean up and return. */
for (i = 0; i < screenInfo.numScreens; i++) {
ScreenPtr pScreen = screenInfo.screens[i];
free(dixLookupPrivate(&pScreen->devPrivates, dbeScreenPrivKey));
dixSetPrivate(&pScreen->devPrivates, dbeScreenPrivKey, NULL);
ScreenPtr walkScreen = screenInfo.screens[i];
free(dixLookupPrivate(&walkScreen->devPrivates, dbeScreenPrivKey));
dixSetPrivate(&walkScreen->devPrivates, dbeScreenPrivKey, NULL);
}
return;
}