diff options
author | Frank Huang <frankr.huang@amd.com> | 2010-09-01 10:30:35 +0800 |
---|---|---|
committer | Martin-Éric Racine <q-funk@iki.fi> | 2010-09-01 16:41:51 +0300 |
commit | 5dfe7dbf6ed122fbbb758be7a5b7d78a199583c7 (patch) | |
tree | 997b1647330b8e5b4ba7d4e8cd48685accbd7b1f /src/gx_driver.c | |
parent | fc342655a3d928759467eac8c917effe8f283031 (diff) |
Replace xalloc/xrealloc/xfree/xcalloc with malloc/realloc/free/calloc
* Replace the deprecated functions with new ones
Refer to "/xserver/include/os.h"
Signed-off-by: Frank Huang <frankr.huang@amd.com>
Diffstat (limited to 'src/gx_driver.c')
-rw-r--r-- | src/gx_driver.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/gx_driver.c b/src/gx_driver.c index 1c25e1a..e2ed44b 100644 --- a/src/gx_driver.c +++ b/src/gx_driver.c @@ -447,7 +447,7 @@ GXPreInit(ScrnInfoPtr pScrni, int flags) pGeode->useVGA = FALSE; #if INT10_SUPPORT - pGeode->vesa = xcalloc(sizeof(VESARec), 1); + pGeode->vesa = calloc(sizeof(VESARec), 1); #endif } @@ -960,19 +960,19 @@ GXCloseScreen(int scrnIndex, ScreenPtr pScrn) XAADestroyInfoRec(pGeode->AccelInfoRec); if (pGeode->AccelImageWriteBuffers) { - xfree(pGeode->AccelImageWriteBuffers[0]); - xfree(pGeode->AccelImageWriteBuffers); + free(pGeode->AccelImageWriteBuffers[0]); + free(pGeode->AccelImageWriteBuffers); pGeode->AccelImageWriteBuffers = NULL; } if (pGeode->AccelColorExpandBuffers) { - xfree(pGeode->AccelColorExpandBuffers); + free(pGeode->AccelColorExpandBuffers); pGeode->AccelColorExpandBuffers = NULL; } if (pGeode->pExa) { exaDriverFini(pScrn); - xfree(pGeode->pExa); + free(pGeode->pExa); pGeode->pExa = NULL; } @@ -1259,10 +1259,10 @@ GXScreenInit(int scrnIndex, ScreenPtr pScrn, int argc, char **argv) } } else { pGeode->AccelImageWriteBuffers = - xcalloc(sizeof(pGeode->AccelImageWriteBuffers[0]), + calloc(sizeof(pGeode->AccelImageWriteBuffers[0]), pGeode->NoOfImgBuffers); pGeode->AccelColorExpandBuffers = - xcalloc(sizeof(pGeode->AccelColorExpandBuffers[0]), + calloc(sizeof(pGeode->AccelColorExpandBuffers[0]), pGeode->NoOfColorExpandLines); } } @@ -1535,7 +1535,7 @@ static void GeodeFreeRec(ScrnInfoPtr pScrni) { if (pScrni->driverPrivate != NULL) { - xfree(pScrni->driverPrivate); + free(pScrni->driverPrivate); pScrni->driverPrivate = NULL; } } |