From 7011de155a1063a77cbab2f4d1ca599e23d7b102 Mon Sep 17 00:00:00 2001 From: Mihai Moldovan <ïonic@ionic.de> Date: Fri, 16 Sep 2016 23:58:54 +0000 Subject: misc nx-X11/programs/Xserver/randr/: switch to using xreallocarray, since it has been ported now. --- nx-X11/programs/Xserver/randr/rrproviderproperty.c | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'nx-X11/programs/Xserver/randr/rrproviderproperty.c') 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; } -- cgit v1.2.3