(submit/xext-saver-cleanup) Xext: saver: drop New() macro
We can directly use calloc() as all other places do. If we wanna have an convenient macro for struct allocation, that would be the job of a separate patch queue and should be done consequently, treewide. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
parent
dc8230a1e0
commit
c119239e0e
|
|
@ -195,8 +195,6 @@ static DevPrivateKeyRec ScreenPrivateKeyRec;
|
|||
dixSetPrivate(&(s)->devPrivates, ScreenPrivateKey, v);
|
||||
#define SetupScreen(s) ScreenSaverScreenPrivatePtr pPriv = (s ? GetScreenPrivate(s) : NULL)
|
||||
|
||||
#define New(t) (malloc(sizeof (t)))
|
||||
|
||||
static void
|
||||
CheckScreenPrivate(ScreenPtr pScreen)
|
||||
{
|
||||
|
|
@ -219,7 +217,7 @@ MakeScreenPrivate(ScreenPtr pScreen)
|
|||
|
||||
if (pPriv)
|
||||
return pPriv;
|
||||
pPriv = New(ScreenSaverScreenPrivateRec);
|
||||
pPriv = calloc(1, sizeof(ScreenSaverScreenPrivateRec));
|
||||
if (!pPriv)
|
||||
return 0;
|
||||
pPriv->events = 0;
|
||||
|
|
@ -269,7 +267,7 @@ setEventMask(ScreenPtr pScreen, ClientPtr client, unsigned long mask)
|
|||
}
|
||||
else {
|
||||
if (!pEv) {
|
||||
pEv = New(ScreenSaverEventRec);
|
||||
pEv = calloc(1, sizeof(ScreenSaverEventRec));
|
||||
if (!pEv) {
|
||||
CheckScreenPrivate(pScreen);
|
||||
return FALSE;
|
||||
|
|
@ -848,7 +846,7 @@ ScreenSaverSetAttributes(ClientPtr client)
|
|||
if (!pPriv)
|
||||
return FALSE;
|
||||
}
|
||||
pAttr = New(ScreenSaverAttrRec);
|
||||
pAttr = calloc(1, sizeof(ScreenSaverAttrRec));
|
||||
if (!pAttr) {
|
||||
ret = BadAlloc;
|
||||
goto bail;
|
||||
|
|
|
|||
Loading…
Reference in New Issue