frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dix: Remove some pointless casting of NULL 

Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Adam Jackson 2014-09-15 13:05:24 -04:00
parent 277330075b
commit d138d9ccc6
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dix/window.c
View File

@ -357,8 +357,8 @@ SetWindowToDefaults(WindowPtr pWin)
pWin->firstChild = NullWindow; pWin->firstChild = NullWindow;
pWin->lastChild = NullWindow; pWin->lastChild = NullWindow;
pWin->valdata = (ValidatePtr) NULL; pWin->valdata = NULL;
pWin->optional = (WindowOptPtr) NULL; pWin->optional = NULL;
pWin->cursorIsNone = TRUE; pWin->cursorIsNone = TRUE;
pWin->backingStore = NotUseful; pWin->backingStore = NotUseful;
@ -1550,7 +1550,7 @@ MoveWindowInStack(WindowPtr pWin, WindowPtr pNextSib)
if (pWin->prevSib) if (pWin->prevSib)
pWin->prevSib->nextSib = pWin->nextSib; pWin->prevSib->nextSib = pWin->nextSib;
pWin->nextSib = pParent->firstChild; pWin->nextSib = pParent->firstChild;
pWin->prevSib = (WindowPtr) NULL; pWin->prevSib = NULL;
pNextSib->prevSib = pWin; pNextSib->prevSib = pWin;
pParent->firstChild = pWin; pParent->firstChild = pWin;
} }
@ -1847,7 +1847,7 @@ WindowExtents(WindowPtr pWin, BoxPtr pBox)
return pBox; return pBox;
} }
#define IS_SHAPED(pWin) (wBoundingShape (pWin) != (RegionPtr) NULL) #define IS_SHAPED(pWin) (wBoundingShape (pWin) != NULL)
static RegionPtr static RegionPtr
MakeBoundingRegion(WindowPtr pWin, BoxPtr pBox) MakeBoundingRegion(WindowPtr pWin, BoxPtr pBox)
@ -1953,7 +1953,7 @@ WhereDoIGoInTheStack(WindowPtr pWin,
WindowPtr pHead, pFirst; WindowPtr pHead, pFirst;
if ((pWin == pWin->parent->firstChild) && (pWin == pWin->parent->lastChild)) if ((pWin == pWin->parent->firstChild) && (pWin == pWin->parent->lastChild))
return ((WindowPtr) NULL); return NULL;
pHead = RealChildHead(pWin->parent); pHead = RealChildHead(pWin->parent);
pFirst = pHead ? pHead->nextSib : pWin->parent->firstChild; pFirst = pHead ? pHead->nextSib : pWin->parent->firstChild;
box.x1 = x; box.x1 = x;
@ -2644,8 +2644,7 @@ MapSubwindows(WindowPtr pParent, ClientPtr client)
RealizeTree(pWin); RealizeTree(pWin);
if (pWin->viewable) { if (pWin->viewable) {
anyMarked |= (*pScreen->MarkOverlappedWindows) (pWin, pWin, anyMarked |= (*pScreen->MarkOverlappedWindows) (pWin, pWin,
(WindowPtr NULL);
*) NULL);
} }
} }
} }
@ -2655,8 +2654,7 @@ MapSubwindows(WindowPtr pParent, ClientPtr client)
pLayerWin = (*pScreen->GetLayerWindow) (pParent); pLayerWin = (*pScreen->GetLayerWindow) (pParent);
if (pLayerWin->parent != pParent) { if (pLayerWin->parent != pParent) {
anyMarked |= (*pScreen->MarkOverlappedWindows) (pLayerWin, anyMarked |= (*pScreen->MarkOverlappedWindows) (pLayerWin,
pLayerWin, pLayerWin, NULL);
(WindowPtr *) NULL);
pFirstMapped = pLayerWin; pFirstMapped = pLayerWin;
} }
if (anyMarked) { if (anyMarked) {
@ -2815,8 +2813,7 @@ UnmapSubwindows(WindowPtr pWin)
else { else {
WindowPtr ptmp; WindowPtr ptmp;
(*pScreen->MarkOverlappedWindows) (pWin, pLayerWin, (*pScreen->MarkOverlappedWindows) (pWin, pLayerWin, NULL);
(WindowPtr *) NULL);
(*pScreen->MarkWindow) (pLayerWin->parent); (*pScreen->MarkWindow) (pLayerWin->parent);
/* Windows between pWin and pLayerWin may not have been marked */ /* Windows between pWin and pLayerWin may not have been marked */
@ -2875,7 +2872,7 @@ HandleSaveSet(ClientPtr client)
} }
free(client->saveSet); free(client->saveSet);
client->numSaved = 0; client->numSaved = 0;
client->saveSet = (SaveSetElt *) NULL; client->saveSet = NULL;
} }
/** /**
@ -3591,7 +3588,7 @@ SetRootClip(ScreenPtr pScreen, Bool enable)
if (pWin->firstChild) { if (pWin->firstChild) {
anyMarked |= (*pScreen->MarkOverlappedWindows) (pWin->firstChild, anyMarked |= (*pScreen->MarkOverlappedWindows) (pWin->firstChild,
pWin->firstChild, pWin->firstChild,
(WindowPtr *) NULL); NULL);
} }
else { else {
(*pScreen->MarkWindow) (pWin); (*pScreen->MarkWindow) (pWin);