diff --git a/Xext/saver.c b/Xext/saver.c index 819aafbea..296de0dac 100644 --- a/Xext/saver.c +++ b/Xext/saver.c @@ -193,8 +193,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) { @@ -217,7 +215,7 @@ MakeScreenPrivate(ScreenPtr pScreen) if (pPriv) return pPriv; - pPriv = New(ScreenSaverScreenPrivateRec); + pPriv = calloc(1, sizeof(ScreenSaverScreenPrivateRec)); if (!pPriv) return 0; pPriv->events = 0; @@ -267,7 +265,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; @@ -846,7 +844,7 @@ ScreenSaverSetAttributes(ClientPtr client) if (!pPriv) return FALSE; } - pAttr = New(ScreenSaverAttrRec); + pAttr = calloc(1, sizeof(ScreenSaverAttrRec)); if (!pAttr) { ret = BadAlloc; goto bail;