diff options
| author | Mihai Moldovan <ïonic@ionic.de> | 2016-09-16 23:58:54 +0000 |
|---|---|---|
| committer | Mihai Moldovan <ïonic@ionic.de> | 2017-03-03 11:20:20 +0000 |
| commit | 7011de155a1063a77cbab2f4d1ca599e23d7b102 (patch) | |
| tree | 75f91e23bbe13469d1a9a53d4b714ce4eaefccf2 /nx-X11/programs/Xserver/randr/rrproperty.c | |
| parent | 5413c5ec8b17dcc223b31f9d08fa3f3c3665d83e (diff) | |
| download | nx-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/rrproperty.c')
| -rw-r--r-- | nx-X11/programs/Xserver/randr/rrproperty.c | 16 |
1 files changed, 0 insertions, 16 deletions
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; } |