summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@apple.com>2011-10-29 19:50:27 -0700
committerJeremy Huddleston <jeremyhu@apple.com>2011-10-29 19:50:27 -0700
commit6d87bfa5949dc923a7cd869b748aa5323b3e17d0 (patch)
tree72d9f36c3c003ace3f5fc1764ae4d83d638d9d93
parente865dffc32485406759f25a24e52a618034a1a05 (diff)
Use malloc/calloc/realloc/free directly
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
-rw-r--r--src/cg14_driver.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/cg14_driver.c b/src/cg14_driver.c
index 7834996..b6c533d 100644
--- a/src/cg14_driver.c
+++ b/src/cg14_driver.c
@@ -167,7 +167,7 @@ CG14FreeRec(ScrnInfoPtr pScrn)
pCg14 = GET_CG14_FROM_SCRN(pScrn);
- xfree(pScrn->driverPrivate);
+ free(pScrn->driverPrivate);
pScrn->driverPrivate = NULL;
return;
@@ -237,7 +237,7 @@ CG14Probe(DriverPtr drv, int flags)
devSections, numDevSections,
drv, &usedChips);
- xfree(devSections);
+ free(devSections);
if (numUsed <= 0)
return FALSE;
@@ -271,9 +271,9 @@ CG14Probe(DriverPtr drv, int flags)
xf86AddEntityToScreen(pScrn, pEnt->index);
foundScreen = TRUE;
}
- xfree(pEnt);
+ free(pEnt);
}
- xfree(usedChips);
+ free(usedChips);
return foundScreen;
}
@@ -349,7 +349,7 @@ CG14PreInit(ScrnInfoPtr pScrn, int flags)
/* Collect all of the relevant option flags (fill in pScrn->options) */
xf86CollectOptions(pScrn, NULL);
/* Process the options */
- if (!(pCg14->Options = xalloc(sizeof(CG14Options))))
+ if (!(pCg14->Options = malloc(sizeof(CG14Options))))
return FALSE;
memcpy(pCg14->Options, CG14Options, sizeof(CG14Options));
xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pCg14->Options);