summaryrefslogtreecommitdiff
path: root/src/ffb_driver.c
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@apple.com>2011-10-29 19:52:52 -0700
committerJeremy Huddleston <jeremyhu@apple.com>2011-10-29 19:52:52 -0700
commitd76eda9d1c6456ece6b5e2a6b8a772293e10beb6 (patch)
treed26db79ddd21d18859d1f53ab9e444d01ff88bb9 /src/ffb_driver.c
parent205ed4acdfc9e73821b83244cb27f808bbab9933 (diff)
Use malloc/calloc/realloc/free directly
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Diffstat (limited to 'src/ffb_driver.c')
-rw-r--r--src/ffb_driver.c10
1 files changed, 5 insertions, 5 deletions
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);