diff options
| author | Trevor Woerner <twoerner@gmail.com> | 2010-10-22 20:48:13 -0400 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2010-10-24 09:59:11 -0400 |
| commit | a123285200c6747bfc2631f684a9d1c06c868fb4 (patch) | |
| tree | 25e5bbec326b185998c6720bf666f5bb3640ae67 | |
| parent | 477fe18698b95b546669a3d2089045ed4c7141d8 (diff) | |
Convert x+m/calloc/free to m/calloc/free.
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
| -rw-r--r-- | src/tseng_dga.c | 4 | ||||
| -rw-r--r-- | src/tseng_driver.c | 10 | ||||
| -rw-r--r-- | src/tseng_mode.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/tseng_dga.c b/src/tseng_dga.c index 70ebe23..cb57dfe 100644 --- a/src/tseng_dga.c +++ b/src/tseng_dga.c @@ -74,9 +74,9 @@ TsengDGAInit(ScreenPtr pScreen) if (!pTseng->DGAnumModes) { pMode = firstMode = pScrn->modes; while (pMode) { - newmodes = xrealloc(modes, (num + 1) * sizeof (DGAModeRec)); + newmodes = realloc(modes, (num + 1) * sizeof (DGAModeRec)); if (!newmodes) { - xfree(modes); + free(modes); return FALSE; } modes = newmodes; diff --git a/src/tseng_driver.c b/src/tseng_driver.c index 445c17e..6992671 100644 --- a/src/tseng_driver.c +++ b/src/tseng_driver.c @@ -269,9 +269,9 @@ TsengFreeRec(ScrnInfoPtr pScrn) pTseng = TsengPTR(pScrn); if (pTseng->SavedReg.RAMDAC) - xfree(pTseng->SavedReg.RAMDAC); + free(pTseng->SavedReg.RAMDAC); - xfree(pScrn->driverPrivate); + free(pScrn->driverPrivate); pScrn->driverPrivate = NULL; } @@ -395,10 +395,10 @@ TsengProbe(DriverPtr drv, int flags) foundScreen = TRUE; } } - xfree(usedChips); + free(usedChips); } - xfree(devSections); + free(devSections); return foundScreen; } @@ -806,7 +806,7 @@ TsengProcessOptions(ScrnInfoPtr pScrn) xf86CollectOptions(pScrn, NULL); /* Process the options */ - if (!(pTseng->Options = xalloc(sizeof(TsengOptions)))) + if (!(pTseng->Options = malloc(sizeof(TsengOptions)))) return FALSE; memcpy(pTseng->Options, TsengOptions, sizeof(TsengOptions)); xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pTseng->Options); diff --git a/src/tseng_mode.c b/src/tseng_mode.c index f075226..7649efd 100644 --- a/src/tseng_mode.c +++ b/src/tseng_mode.c @@ -1502,7 +1502,7 @@ TsengModeInit(ScrnInfoPtr pScrn, DisplayModePtr OrigMode) /* clean up */ if (new->RAMDAC) - xfree(new->RAMDAC); + free(new->RAMDAC); return TRUE; } |