summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@apple.com>2011-10-29 20:00:00 -0700
committerJeremy Huddleston <jeremyhu@apple.com>2011-10-29 20:00:00 -0700
commit431e56e06b456ad9bd95dc2b5416708625d91b0a (patch)
treee78a9eedc9d71e03f648e118956a10d01b45d5f8
parent1abbc496b1eeeb9311c3694057e8f5130738ec16 (diff)
Use malloc/calloc/realloc/free directly
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
-rw-r--r--src/tcx_driver.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/tcx_driver.c b/src/tcx_driver.c
index 364a520..83c71af 100644
--- a/src/tcx_driver.c
+++ b/src/tcx_driver.c
@@ -169,7 +169,7 @@ TCXFreeRec(ScrnInfoPtr pScrn)
pTcx = GET_TCX_FROM_SCRN(pScrn);
- xfree(pScrn->driverPrivate);
+ free(pScrn->driverPrivate);
pScrn->driverPrivate = NULL;
return;
@@ -239,7 +239,7 @@ TCXProbe(DriverPtr drv, int flags)
devSections, numDevSections,
drv, &usedChips);
- xfree(devSections);
+ free(devSections);
if (numUsed <= 0)
return FALSE;
@@ -273,9 +273,9 @@ TCXProbe(DriverPtr drv, int flags)
xf86AddEntityToScreen(pScrn, pEnt->index);
foundScreen = TRUE;
}
- xfree(pEnt);
+ free(pEnt);
}
- xfree(usedChips);
+ free(usedChips);
return foundScreen;
}
@@ -373,7 +373,7 @@ TCXPreInit(ScrnInfoPtr pScrn, int flags)
/* Collect all of the relevant option flags (fill in pScrn->options) */
xf86CollectOptions(pScrn, NULL);
/* Process the options */
- if (!(pTcx->Options = xalloc(sizeof(TCXOptions))))
+ if (!(pTcx->Options = malloc(sizeof(TCXOptions))))
return FALSE;
memcpy(pTcx->Options, TCXOptions, sizeof(TCXOptions));
xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pTcx->Options);