hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-09-26 21:12:25 +00:00
Code Issues Projects Releases Wiki Activity

mi: malloc checks for misprite and midispcur, code cleanup

Browse source 
removed IsMPDev()
This commit is contained in:
Peter Hutterer 2006-11-27 18:07:16 +10:30 • committed by Peter Hutterer
commit 85ea408e38
5 changed files with 106 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

40
mi/midispcur.c
View file

@ -139,6 +139,7 @@ miDCInitialize (pScreen, screenFuncs)
miPointerScreenFuncPtr screenFuncs;
{
miDCScreenPtr pScreenPriv;
miDCBufferPtr pBuffer;
if (miDCGeneration != serverGeneration)
{
@ -154,36 +155,33 @@ miDCInitialize (pScreen, screenFuncs)
/*
* initialize the entire private structure to zeros
*/
#if !defined MPX
pScreenPriv->pCoreBuffer = (miDCBufferPtr)xalloc(sizeof(miDCBufferRec));
pScreenPriv->pCoreBuffer->pSourceGC =
pScreenPriv->pCoreBuffer->pMaskGC =
pScreenPriv->pCoreBuffer->pSaveGC =
pScreenPriv->pCoreBuffer->pRestoreGC =
pScreenPriv->pCoreBuffer->pMoveGC =
pScreenPriv->pCoreBuffer->pPixSourceGC =
pScreenPriv->pCoreBuffer->pPixMaskGC = NULL;
#ifdef ARGB_CURSOR
pScreenPriv->pCoreBuffer->pRootPicture = NULL;
pScreenPriv->pCoreBuffer->pTempPicture = NULL;
#endif
pScreenPriv->pCoreBuffer->pSave = pScreenPriv->pCoreBuffer->pTemp = NULL;
#ifdef MPX
if (!pScreenPriv->pCoreBuffer)
{
xfree((pointer)pScreenPriv);
return FALSE;
}
pBuffer = pScreenPriv->pCoreBuffer;
#else /* ifdef MPX */
{
int mpBufferIdx = 0;
pScreenPriv->pMPBuffers = (miDCBufferPtr)xalloc(MAX_DEVICES *
sizeof(miDCBufferRec));
if (!pScreenPriv->pMPBuffers)
{
xfree((pointer)pScreenPriv);
return FALSE;
}
/* virtual core pointer ID is 1 */
xfree(pScreenPriv->pCoreBuffer);
pScreenPriv->pCoreBuffer = &pScreenPriv->pMPBuffers[1];
while (mpBufferIdx < MAX_DEVICES)
while(mpBufferIdx < MAX_DEVICES)
{
miDCBufferPtr pBuffer = &pScreenPriv->pMPBuffers[mpBufferIdx];
pBuffer = &pScreenPriv->pMPBuffers[mpBufferIdx];
#endif
pBuffer->pSourceGC =
pBuffer->pMaskGC =
pBuffer->pSaveGC =
@ -198,11 +196,13 @@ miDCInitialize (pScreen, screenFuncs)
pBuffer->pSave = pBuffer->pTemp = NULL;
#ifdef MPX
mpBufferIdx++;
}
}
#endif
pScreenPriv->CloseScreen = pScreen->CloseScreen;
pScreen->CloseScreen = miDCCloseScreen;