aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/randr/rrcrtc.c
diff options
context:
space:
mode:
authorMihai Moldovan <ïonic@ionic.de>2016-09-16 23:58:54 +0000
committerMihai Moldovan <ïonic@ionic.de>2017-03-03 11:20:20 +0000
commit7011de155a1063a77cbab2f4d1ca599e23d7b102 (patch)
tree75f91e23bbe13469d1a9a53d4b714ce4eaefccf2 /nx-X11/programs/Xserver/randr/rrcrtc.c
parent5413c5ec8b17dcc223b31f9d08fa3f3c3665d83e (diff)
downloadnx-libs-7011de155a1063a77cbab2f4d1ca599e23d7b102.tar.gz
nx-libs-7011de155a1063a77cbab2f4d1ca599e23d7b102.tar.bz2
nx-libs-7011de155a1063a77cbab2f4d1ca599e23d7b102.zip
misc nx-X11/programs/Xserver/randr/: switch to using xreallocarray, since it has been ported now.
Diffstat (limited to 'nx-X11/programs/Xserver/randr/rrcrtc.c')
-rw-r--r--nx-X11/programs/Xserver/randr/rrcrtc.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/nx-X11/programs/Xserver/randr/rrcrtc.c b/nx-X11/programs/Xserver/randr/rrcrtc.c
index 55570e0cd..7775747f8 100644
--- a/nx-X11/programs/Xserver/randr/rrcrtc.c
+++ b/nx-X11/programs/Xserver/randr/rrcrtc.c
@@ -204,11 +204,7 @@ RRCrtcNotify(RRCrtcPtr crtc,
newoutputs = reallocarray(crtc->outputs,
numOutputs, sizeof(RROutputPtr));
else
-#ifndef NXAGENT_SERVER
newoutputs = xallocarray(numOutputs, sizeof(RROutputPtr));
-#else /* !defined(NXAGENT_SERVER) */
- newoutputs = malloc(numOutputs * sizeof(RROutputPtr));
-#endif /* !defined(NXAGENT_SERVER) */
if (!newoutputs)
return FALSE;
}
@@ -884,11 +880,7 @@ RRCrtcGammaSetSize(RRCrtcPtr crtc, int size)
if (size == crtc->gammaSize)
return TRUE;
if (size) {
-#ifndef NXAGENT_SERVER
gamma = xallocarray(size, 3 * sizeof(CARD16));
-#else /* !defined(NXAGENT_SERVER) */
- gamma = malloc(size * 3 * sizeof(CARD16));
-#endif /* !defined(NXAGENT_SERVER) */
if (!gamma)
return FALSE;
}
@@ -1131,11 +1123,7 @@ ProcRRSetCrtcConfig(ClientPtr client)
return BadMatch;
}
if (numOutputs) {
-#ifndef NXAGENT_SERVER
outputs = xallocarray(numOutputs, sizeof(RROutputPtr));
-#else /* !defined(NXAGENT_SERVER) */
- outputs = malloc(numOutputs * sizeof(RROutputPtr));
-#endif /* !defined(NXAGENT_SERVER) */
if (!outputs)
return BadAlloc;
}