aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/randr/rrproviderproperty.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/rrproviderproperty.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/rrproviderproperty.c')
-rw-r--r--nx-X11/programs/Xserver/randr/rrproviderproperty.c12
1 files changed, 0 insertions, 12 deletions
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;
}