diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-02 14:11:38 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-02 14:11:38 +0200 |
| commit | 1dbd3c888a3eee51db5303bd93e95b84999f5d31 (patch) | |
| tree | 84db92271726b42b8c0864c8b7c77b2330566fc1 /nx-X11/programs/Xserver/randr/rrprovider.c | |
| parent | 279d37127db241a9ee685f6b671f51aa21a972ea (diff) | |
| parent | e85808245810d0cc6918104deef25213d5f9e06c (diff) | |
| download | nx-libs-1dbd3c888a3eee51db5303bd93e95b84999f5d31.tar.gz nx-libs-1dbd3c888a3eee51db5303bd93e95b84999f5d31.tar.bz2 nx-libs-1dbd3c888a3eee51db5303bd93e95b84999f5d31.zip | |
Merge branch 'sunweaver-pr/backport-Xorg-memory-handling' into 3.6.x
Attributes GH PR #159: https://github.com/ArcticaProject/nx-libs/pull/159
Reviewed by: Vadim Troshchinskiy <vadim@qindel.com> -- Fri, 01 Jul 2016 12:47:46 -0700
Diffstat (limited to 'nx-X11/programs/Xserver/randr/rrprovider.c')
| -rw-r--r-- | nx-X11/programs/Xserver/randr/rrprovider.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nx-X11/programs/Xserver/randr/rrprovider.c b/nx-X11/programs/Xserver/randr/rrprovider.c index b2251b682..7d3096482 100644 --- a/nx-X11/programs/Xserver/randr/rrprovider.c +++ b/nx-X11/programs/Xserver/randr/rrprovider.c @@ -121,7 +121,7 @@ ProcRRGetProviders(ClientPtr client) }; extraLen = rep.length << 2; if (extraLen) { - extra = xalloc(extraLen); + extra = malloc(extraLen); if (!extra) return BadAlloc; } else @@ -152,7 +152,7 @@ ProcRRGetProviders(ClientPtr client) if (extraLen) { WriteToClient(client, extraLen, (char *) extra); - xfree(extra); + free(extra); } return Success; } @@ -217,7 +217,7 @@ ProcRRGetProviderInfo(ClientPtr client) extraLen = rep.length << 2; if (extraLen) { - extra = xalloc(extraLen); + extra = malloc(extraLen); if (!extra) return BadAlloc; } @@ -295,7 +295,7 @@ ProcRRGetProviderInfo(ClientPtr client) if (extraLen) { WriteToClient(client, extraLen, (char *) extra); - xfree(extra); + free(extra); } return Success; } @@ -380,7 +380,7 @@ RRProviderCreate(ScreenPtr pScreen, const char *name, pScrPriv = rrGetScrPriv(pScreen); - provider = xcalloc(1, sizeof(RRProviderRec) + nameLength + 1); + provider = calloc(1, sizeof(RRProviderRec) + nameLength + 1); if (!provider) return NULL; @@ -427,7 +427,7 @@ RRProviderDestroyResource(void *value, XID pid) (*pScrPriv->rrProviderDestroy) (pScreen, provider); pScrPriv->provider = NULL; } - xfree(provider); + free(provider); return 1; } |