diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2011-10-29 20:15:13 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2011-10-29 20:15:13 -0700 |
| commit | 2fe26848181e50e451dde7c65a8d780ec52dc26a (patch) | |
| tree | 12938a1944a791512c8fc2cc2effd9ce7f71b3cf | |
| parent | 21cfd0d44635e30356ed1c94a8afed3c5b155219 (diff) | |
Use malloc/calloc/realloc/free directly
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
| -rwxr-xr-x | src/xgi_memcpy.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/xgi_memcpy.c b/src/xgi_memcpy.c index f604899..fd90b33 100755 --- a/src/xgi_memcpy.c +++ b/src/xgi_memcpy.c @@ -740,13 +740,13 @@ XGI_AllocBuffers(ScrnInfoPtr pScrn, UChar **buf1, UChar **buf2, UChar **buf3) (*buf1) = (UChar *)pXGI->FbBase + offset; (*buf1) = (UChar *)(((ULong)(*buf1) + 31) & ~31); - if(!((*buf2) = (UChar *)xalloc(BUFFERSIZE + 15))) { + if(!((*buf2) = (UChar *)malloc(BUFFERSIZE + 15))) { XGIFreeFBMemory(pScrn, &handle); return NULL; } - if(!((*buf3) = (UChar *)xalloc(BUFFERSIZE + 15))) { - xfree((*buf2)); + if(!((*buf3) = (UChar *)malloc(BUFFERSIZE + 15))) { + free((*buf2)); XGIFreeFBMemory(pScrn, &handle); return NULL; } @@ -1224,8 +1224,8 @@ XGIVidCopyInitGen(ScreenPtr pScreen, XGIMCFuncData *MCFunctions, vidCopyFunc *UM /* Free buffers */ XGIFreeFBMemory(pScrn, &fbhandle); - xfree(buf2); - xfree(buf3); + free(buf2); + free(buf3); xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Using %s method for aligned data transfers %s video RAM\n", |