From e43cf499d0df41eb6ca2a1a7c21af71e31207635 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 22 Jun 2010 17:26:49 +0200 Subject: Remove x*alloc/xfree calls deprecated in xserver 1.9 RC1 --- src/glamo-driver.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/glamo-driver.c') diff --git a/src/glamo-driver.c b/src/glamo-driver.c index 283825e..a9005b9 100644 --- a/src/glamo-driver.c +++ b/src/glamo-driver.c @@ -195,7 +195,7 @@ GlamoFreeRec(ScrnInfoPtr pScrn) { if (pScrn->driverPrivate == NULL) return; - xfree(pScrn->driverPrivate); + free(pScrn->driverPrivate); pScrn->driverPrivate = NULL; } @@ -398,7 +398,7 @@ GlamoProbe(DriverPtr drv, int flags) foundScreen = GlamoFbdevProbe(drv, devSections, numDevSections); #endif /* ENABLE_KMS */ - xfree(devSections); + free(devSections); TRACE("probe done"); return foundScreen; } @@ -487,7 +487,7 @@ GlamoPreInit(ScrnInfoPtr pScrn, int flags) /* handle options */ xf86CollectOptions(pScrn, NULL); - if (!(pGlamo->Options = xalloc(sizeof(GlamoOptions)))) + if (!(pGlamo->Options = malloc(sizeof(GlamoOptions)))) return FALSE; memcpy(pGlamo->Options, GlamoOptions, sizeof(GlamoOptions)); xf86ProcessOptions(pScrn->scrnIndex, pGlamo->pEnt->device->options, pGlamo->Options); @@ -667,7 +667,7 @@ GlamoCloseScreen(int scrnIndex, ScreenPtr pScreen) GlamoUnmapMMIO(pScrn); if (pGlamo->colormap) { - xfree(pGlamo->colormap); + free(pGlamo->colormap); pGlamo->colormap = NULL; } @@ -860,10 +860,10 @@ GlamoLoadColormap(ScrnInfoPtr pScrn, int numColors, int *indices, ErrorF("%s:%s[%d]\n", __FILE__, __func__, __LINE__); if (pGlamo->colormap) { - xfree (pGlamo->colormap); + free (pGlamo->colormap); } - pGlamo->colormap = xalloc (sizeof(uint16_t) * numColors); + pGlamo->colormap = malloc (sizeof(uint16_t) * numColors); for (i = 0; i < numColors; ++i) { pGlamo->colormap[i] = -- cgit v1.2.3