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

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>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1586>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-06-28 13:24:15 +02:00 committed by Marge Bot
parent a5e863963e
commit df38987656
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Xext/saver.c
View File

@ -193,8 +193,6 @@ static DevPrivateKeyRec ScreenPrivateKeyRec;
dixSetPrivate(&(s)->devPrivates, ScreenPrivateKey, v); dixSetPrivate(&(s)->devPrivates, ScreenPrivateKey, v);
#define SetupScreen(s) ScreenSaverScreenPrivatePtr pPriv = (s ? GetScreenPrivate(s) : NULL) #define SetupScreen(s) ScreenSaverScreenPrivatePtr pPriv = (s ? GetScreenPrivate(s) : NULL)
#define New(t) (malloc(sizeof (t)))
static void static void
CheckScreenPrivate(ScreenPtr pScreen) CheckScreenPrivate(ScreenPtr pScreen)
{ {
@ -217,7 +215,7 @@ MakeScreenPrivate(ScreenPtr pScreen)
if (pPriv) if (pPriv)
return pPriv; return pPriv;
pPriv = New(ScreenSaverScreenPrivateRec); pPriv = calloc(1, sizeof(ScreenSaverScreenPrivateRec));
if (!pPriv) if (!pPriv)
return 0; return 0;
pPriv->events = 0; pPriv->events = 0;
@ -267,7 +265,7 @@ setEventMask(ScreenPtr pScreen, ClientPtr client, unsigned long mask)
} }
else { else {
if (!pEv) { if (!pEv) {
pEv = New(ScreenSaverEventRec); pEv = calloc(1, sizeof(ScreenSaverEventRec));
if (!pEv) { if (!pEv) {
CheckScreenPrivate(pScreen); CheckScreenPrivate(pScreen);
return FALSE; return FALSE;
@ -846,7 +844,7 @@ ScreenSaverSetAttributes(ClientPtr client)
if (!pPriv) if (!pPriv)
return FALSE; return FALSE;
} }
pAttr = New(ScreenSaverAttrRec); pAttr = calloc(1, sizeof(ScreenSaverAttrRec));
if (!pAttr) { if (!pAttr) {
ret = BadAlloc; ret = BadAlloc;
goto bail; goto bail;