diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2011-10-29 19:52:52 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2011-10-29 19:52:52 -0700 |
| commit | d76eda9d1c6456ece6b5e2a6b8a772293e10beb6 (patch) | |
| tree | d26db79ddd21d18859d1f53ab9e444d01ff88bb9 | |
| parent | 205ed4acdfc9e73821b83244cb27f808bbab9933 (diff) | |
Use malloc/calloc/realloc/free directly
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
| -rw-r--r-- | src/ffb_accel.c | 10 | ||||
| -rw-r--r-- | src/ffb_driver.c | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/ffb_accel.c b/src/ffb_accel.c index 6716bdc..ccae276 100644 --- a/src/ffb_accel.c +++ b/src/ffb_accel.c @@ -858,15 +858,15 @@ Bool FFBAccelInit(ScreenPtr pScreen, FFBPtr pFfb) return FALSE; } - pFfb->xaa_scanline_buffers[0] = xalloc(2048 * 4); + pFfb->xaa_scanline_buffers[0] = malloc(2048 * 4); if (!pFfb->xaa_scanline_buffers[0]) { XAADestroyInfoRec(infoRec); return FALSE; } - pFfb->xaa_scanline_buffers[1] = xalloc(2048 * 4); + pFfb->xaa_scanline_buffers[1] = malloc(2048 * 4); if (!pFfb->xaa_scanline_buffers[1]) { - xfree(pFfb->xaa_scanline_buffers[0]); + free(pFfb->xaa_scanline_buffers[0]); XAADestroyInfoRec(infoRec); return FALSE; } @@ -1084,8 +1084,8 @@ Bool FFBAccelInit(ScreenPtr pScreen, FFBPtr pFfb) if (!XAAInit(pScreen, infoRec)) { XAADestroyInfoRec(infoRec); - xfree(pFfb->xaa_scanline_buffers[0]); - xfree(pFfb->xaa_scanline_buffers[1]); + free(pFfb->xaa_scanline_buffers[0]); + free(pFfb->xaa_scanline_buffers[1]); pFfb->pXAAInfo = NULL; FFBWidFree(pFfb, pFfb->xaa_wid); return FALSE; diff --git a/src/ffb_driver.c b/src/ffb_driver.c index 4e37c6c..b89771a 100644 --- a/src/ffb_driver.c +++ b/src/ffb_driver.c @@ -175,7 +175,7 @@ FFBFreeRec(ScrnInfoPtr pScrn) pFfb = GET_FFB_FROM_SCRN(pScrn); - xfree(pScrn->driverPrivate); + free(pScrn->driverPrivate); pScrn->driverPrivate = NULL; return; @@ -245,7 +245,7 @@ FFBProbe(DriverPtr drv, int flags) devSections, numDevSections, drv, &usedChips); - xfree(devSections); + free(devSections); if (numUsed <= 0) return FALSE; @@ -279,9 +279,9 @@ FFBProbe(DriverPtr drv, int flags) xf86AddEntityToScreen(pScrn, pEnt->index); foundScreen = TRUE; } - xfree(pEnt); + free(pEnt); } - xfree(usedChips); + free(usedChips); return foundScreen; } @@ -356,7 +356,7 @@ FFBPreInit(ScrnInfoPtr pScrn, int flags) /* Collect all of the relevant option flags (fill in pScrn->options) */ xf86CollectOptions(pScrn, NULL); /* Process the options */ - if (!(pFfb->Options = xalloc(sizeof(FFBOptions)))) + if (!(pFfb->Options = malloc(sizeof(FFBOptions)))) return FALSE; memcpy(pFfb->Options, FFBOptions, sizeof(FFBOptions)); xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pFfb->Options); |