aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver
diff options
context:
space:
mode:
Diffstat (limited to 'nx-X11/programs/Xserver')
-rw-r--r--nx-X11/programs/Xserver/randr/rrcrtc.c12
-rw-r--r--nx-X11/programs/Xserver/randr/rrmode.c4
-rw-r--r--nx-X11/programs/Xserver/randr/rroutput.c12
-rw-r--r--nx-X11/programs/Xserver/randr/rrproperty.c16
-rw-r--r--nx-X11/programs/Xserver/randr/rrproviderproperty.c12
-rw-r--r--nx-X11/programs/Xserver/randr/rrtransform.c4
6 files changed, 0 insertions, 60 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;
}
diff --git a/nx-X11/programs/Xserver/randr/rrmode.c b/nx-X11/programs/Xserver/randr/rrmode.c
index f4c12062e..92f67afb9 100644
--- a/nx-X11/programs/Xserver/randr/rrmode.c
+++ b/nx-X11/programs/Xserver/randr/rrmode.c
@@ -212,11 +212,7 @@ RRModesForScreen(ScreenPtr pScreen, int *num_ret)
RRModePtr *screen_modes;
int num_screen_modes = 0;
-#ifndef NXAGENT_SERVER
screen_modes = xallocarray((num_modes ? num_modes : 1), sizeof(RRModePtr));
-#else /* !defined(NXAGENT_SERVER) */
- screen_modes = malloc((num_modes ? num_modes : 1) * sizeof(RRModePtr));
-#endif /* !defined(NXAGENT_SERVER) */
if (!screen_modes)
return NULL;
diff --git a/nx-X11/programs/Xserver/randr/rroutput.c b/nx-X11/programs/Xserver/randr/rroutput.c
index 2b44b7f4d..8042b719c 100644
--- a/nx-X11/programs/Xserver/randr/rroutput.c
+++ b/nx-X11/programs/Xserver/randr/rroutput.c
@@ -139,11 +139,7 @@ RROutputSetClones(RROutputPtr output, RROutputPtr * clones, int numClones)
return TRUE;
}
if (numClones) {
-#ifndef NXAGENT_SERVER
newClones = xallocarray(numClones, sizeof(RROutputPtr));
-#else /* !defined(NXAGENT_SERVER) */
- newClones = malloc(numClones * sizeof(RROutputPtr));
-#endif /* !defined(NXAGENT_SERVER) */
if (!newClones)
return FALSE;
}
@@ -176,11 +172,7 @@ RROutputSetModes(RROutputPtr output,
}
if (numModes) {
-#ifndef NXAGENT_SERVER
newModes = xallocarray(numModes, sizeof(RRModePtr));
-#else /* !defined(NXAGENT_SERVER) */
- newModes = malloc(numModes * sizeof(RRModePtr));
-#endif /* !defined(NXAGENT_SERVER) */
if (!newModes)
return FALSE;
}
@@ -279,11 +271,7 @@ RROutputSetCrtcs(RROutputPtr output, RRCrtcPtr * crtcs, int numCrtcs)
return TRUE;
}
if (numCrtcs) {
-#ifndef NXAGENT_SERVER
newCrtcs = xallocarray(numCrtcs, sizeof(RRCrtcPtr));
-#else /* !defined(NXAGENT_SERVER) */
- newCrtcs = malloc(numCrtcs * sizeof(RRCrtcPtr));
-#endif /* !defined(NXAGENT_SERVER) */
if (!newCrtcs)
return FALSE;
}
diff --git a/nx-X11/programs/Xserver/randr/rrproperty.c b/nx-X11/programs/Xserver/randr/rrproperty.c
index dab9e10cc..aad68273a 100644
--- a/nx-X11/programs/Xserver/randr/rrproperty.c
+++ b/nx-X11/programs/Xserver/randr/rrproperty.c
@@ -183,11 +183,7 @@ RRChangeOutputProperty(RROutputPtr output, Atom property, Atom type,
if (mode == PropModeReplace || len > 0) {
void *new_data = NULL, *old_data = NULL;
-#ifndef NXAGENT_SERVER
new_value.data = xallocarray(total_len, size_in_bytes);
-#else /* !defined(NXAGENT_SERVER) */
- new_value.data = malloc(total_len * size_in_bytes);
-#endif /* !defined(NXAGENT_SERVER) */
if (!new_value.data && total_len && size_in_bytes) {
if (add)
RRDestroyOutputProperty(prop);
@@ -356,11 +352,7 @@ RRConfigureOutputProperty(RROutputPtr output, Atom property,
return BadMatch;
}
-#ifndef NXAGENT_SERVER
new_values = xallocarray(num_values, sizeof(INT32));
-#else /* !defined(NXAGENT_SERVER) */
- new_values = malloc(num_values * sizeof(INT32));
-#endif /* !defined(NXAGENT_SERVER) */
if (!new_values && num_values) {
if (add)
RRDestroyOutputProperty(prop);
@@ -410,11 +402,7 @@ ProcRRListOutputProperties(ClientPtr client)
for (prop = output->properties; prop; prop = prop->next)
numProps++;
if (numProps)
-#ifndef NXAGENT_SERVER
if (!(pAtoms = xallocarray(numProps, sizeof(Atom))))
-#else /* !defined(NXAGENT_SERVER) */
- if (!(pAtoms = malloc(numProps * sizeof(Atom))))
-#endif /* !defined(NXAGENT_SERVER) */
return BadAlloc;
rep = (xRRListOutputPropertiesReply) {
@@ -461,11 +449,7 @@ ProcRRQueryOutputProperty(ClientPtr client)
return BadName;
if (prop->num_valid) {
-#ifndef NXAGENT_SERVER
extra = xallocarray(prop->num_valid, sizeof(INT32));
-#else /* !defined(NXAGENT_SERVER) */
- extra = malloc(prop->num_valid * sizeof(INT32));
-#endif /* !defined(NXAGENT_SERVER) */
if (!extra)
return BadAlloc;
}
diff --git a/nx-X11/programs/Xserver/randr/rrproviderproperty.c b/nx-X11/programs/Xserver/randr/rrproviderproperty.c
index 9ac4eb09d..1849ed29a 100644
--- a/nx-X11/programs/Xserver/randr/rrproviderproperty.c
+++ b/nx-X11/programs/Xserver/randr/rrproviderproperty.c
@@ -354,11 +354,7 @@ RRConfigureProviderProperty(RRProviderPtr provider, Atom property,
return BadMatch;
}
-#ifndef NXAGENT_SERVER
new_values = xallocarray(num_values, sizeof(INT32));
-#else /* !defined(NXAGENT_SERVER) */
- new_values = malloc(num_values * sizeof(INT32));
-#endif /* !defined(NXAGENT_SERVER) */
if (!new_values && num_values) {
if (add)
@@ -409,11 +405,7 @@ ProcRRListProviderProperties(ClientPtr client)
for (prop = provider->properties; prop; prop = prop->next)
numProps++;
if (numProps)
-#ifndef NXAGENT_SERVER
if (!(pAtoms = xallocarray(numProps, sizeof(Atom))))
-#else /* !defined(NXAGENT_SERVER) */
- if (!(pAtoms = malloc(numProps * sizeof(Atom))))
-#endif /* !defined(NXAGENT_SERVER) */
return BadAlloc;
rep = (xRRListProviderPropertiesReply) {
@@ -459,11 +451,7 @@ ProcRRQueryProviderProperty(ClientPtr client)
return BadName;
if (prop->num_valid) {
-#ifndef NXAGENT_SERVER
extra = xallocarray(prop->num_valid, sizeof(INT32));
-#else /* !defined(NXAGENT_SERVER) */
- extra = malloc(prop->num_valid * sizeof(INT32));
-#endif /* !defined(NXAGENT_SERVER) */
if (!extra)
return BadAlloc;
}
diff --git a/nx-X11/programs/Xserver/randr/rrtransform.c b/nx-X11/programs/Xserver/randr/rrtransform.c
index f0c5dd8c7..d32b43aa3 100644
--- a/nx-X11/programs/Xserver/randr/rrtransform.c
+++ b/nx-X11/programs/Xserver/randr/rrtransform.c
@@ -70,11 +70,7 @@ RRTransformSetFilter(RRTransformPtr dst,
xFixed *new_params;
if (nparams) {
-#ifndef NXAGENT_SERVER
new_params = xallocarray(nparams, sizeof(xFixed));
-#else /* !defined(NXAGENT_SERVER) */
- new_params = malloc(nparams * sizeof(xFixed));
-#endif /* !defined(NXAGENT_SERVER) */
if (!new_params)
return FALSE;
memcpy(new_params, params, nparams * sizeof(xFixed));
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 02:43:27 +0000