diff options
| author | Paulo Zanoni <pzanoni@mandriva.com> | 2010-12-13 15:55:18 -0200 |
|---|---|---|
| committer | Julien Cristau <jcristau@debian.org> | 2010-12-17 13:03:59 +0100 |
| commit | 95b2e6f88fca70216d0bffd813981316ec74b2de (patch) | |
| tree | 1904f03df65701128b8be4d889c97761a85cc516 | |
| parent | 21c5ff7a38fb0a678f90478659e5e486213fb6a0 (diff) | |
Replace X{c,r,}alloc and Xfree for stdlib functions
Signed-off-by: Paulo Zanoni <pzanoni@mandriva.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Julien Cristau <jcristau@debian.org>
| -rw-r--r-- | src/newport_cursor.c | 2 | ||||
| -rw-r--r-- | src/newport_driver.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/newport_cursor.c b/src/newport_cursor.c index 3264de4..37b7492 100644 --- a/src/newport_cursor.c +++ b/src/newport_cursor.c @@ -125,7 +125,7 @@ static unsigned char* NewportRealizeCursor(xf86CursorInfoPtr infoPtr, CursorPtr CARD32 *mem, *SrcS, *SrcM, *DstS; unsigned int i; - if (!(mem = xcalloc(1, size))) + if (!(mem = calloc(1, size))) return NULL; SrcS = (CARD32*)pCurs->bits->source; diff --git a/src/newport_driver.c b/src/newport_driver.c index 6bd7c9f..5fb6f18 100644 --- a/src/newport_driver.c +++ b/src/newport_driver.c @@ -189,7 +189,7 @@ NewportFreeRec(ScrnInfoPtr pScrn) { if (pScrn->driverPrivate == NULL) return TRUE; - xfree(pScrn->driverPrivate); + free(pScrn->driverPrivate); pScrn->driverPrivate = NULL; return TRUE; } @@ -255,7 +255,7 @@ NewportProbe(DriverPtr drv, int flags) } } } - xfree(devSections); + free(devSections); return foundScreen; } @@ -354,7 +354,7 @@ NewportPreInit(ScrnInfoPtr pScrn, int flags) /* Fill in pScrn->options) */ xf86CollectOptions(pScrn, NULL); - if (!(pNewport->Options = xalloc(sizeof(NewportOptions)))) + if (!(pNewport->Options = malloc(sizeof(NewportOptions)))) return FALSE; memcpy(pNewport->Options, NewportOptions, sizeof(NewportOptions)); xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pNewport->Options); @@ -655,7 +655,7 @@ NewportCloseScreen(int scrnIndex, ScreenPtr pScreen) NewportRestore(pScrn, TRUE); if (pNewport->ShadowPtr) - xfree(pNewport->ShadowPtr); + free(pNewport->ShadowPtr); /* unmap the Newport's registers from memory */ NewportUnmapRegs(pScrn); |