diff options
| author | Mihai Moldovan <ïonic@ionic.de> | 2016-09-12 02:59:02 +0000 |
|---|---|---|
| committer | Mihai Moldovan <ïonic@ionic.de> | 2017-03-03 11:20:20 +0000 |
| commit | 5413c5ec8b17dcc223b31f9d08fa3f3c3665d83e (patch) | |
| tree | 0ebd53bdaa410fc836b2e36a1cf2ec260634d346 /nx-X11/programs/Xserver/randr/rrinfo.c | |
| parent | cd1dcdb2b7458717c6692e43c4ecc36e92a3f81c (diff) | |
| download | nx-libs-5413c5ec8b17dcc223b31f9d08fa3f3c3665d83e.tar.gz nx-libs-5413c5ec8b17dcc223b31f9d08fa3f3c3665d83e.tar.bz2 nx-libs-5413c5ec8b17dcc223b31f9d08fa3f3c3665d83e.zip | |
misc nx-X11/programs/Xserver/{composite,dix,randr}/: switch to using reallocarray, since it has been ported now.
Diffstat (limited to 'nx-X11/programs/Xserver/randr/rrinfo.c')
| -rw-r--r-- | nx-X11/programs/Xserver/randr/rrinfo.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/nx-X11/programs/Xserver/randr/rrinfo.c b/nx-X11/programs/Xserver/randr/rrinfo.c index bea921436..24245b7b6 100644 --- a/nx-X11/programs/Xserver/randr/rrinfo.c +++ b/nx-X11/programs/Xserver/randr/rrinfo.c @@ -55,13 +55,8 @@ RROldModeAdd(RROutputPtr output, RRScreenSizePtr size, int refresh) } if (output->numModes) -#ifndef NXAGENT_SERVER modes = reallocarray(output->modes, output->numModes + 1, sizeof(RRModePtr)); -#else /* !defined(NXAGENT_SERVER) */ - modes = realloc(output->modes, - (output->numModes + 1) * sizeof(RRModePtr)); -#endif /* !defined(NXAGENT_SERVER) */ else modes = malloc(sizeof(RRModePtr)); if (!modes) { @@ -271,13 +266,8 @@ RRRegisterSize(ScreenPtr pScreen, for (i = 0; i < pScrPriv->nSizes; i++) if (RRScreenSizeMatches(&tmp, &pScrPriv->pSizes[i])) return &pScrPriv->pSizes[i]; -#ifndef NXAGENT_SERVER pNew = reallocarray(pScrPriv->pSizes, pScrPriv->nSizes + 1, sizeof(RRScreenSize)); -#else /* !defined(NXAGENT_SERVER) */ - pNew = realloc(pScrPriv->pSizes, - (pScrPriv->nSizes + 1) * sizeof(RRScreenSize)); -#endif /* !defined(NXAGENT_SERVER) */ if (!pNew) return 0; pNew[pScrPriv->nSizes++] = tmp; @@ -299,11 +289,7 @@ RRRegisterRate(ScreenPtr pScreen, RRScreenSizePtr pSize, int rate) if (pSize->pRates[i].rate == rate) return TRUE; -#ifndef NXAGENT_SERVER pNew = reallocarray(pSize->pRates, pSize->nRates + 1, sizeof(RRScreenRate)); -#else /* !defined(NXAGENT_SERVER) */ - pNew = realloc(pSize->pRates, (pSize->nRates + 1) * sizeof(RRScreenRate)); -#endif /* !defined(NXAGENT_SERVER) */ if (!pNew) return FALSE; pRate = &pNew[pSize->nRates++]; |