summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillem Jover <guillem@hadrons.org>2010-10-21 07:07:00 +0200
committerGuillem Jover <guillem@hadrons.org>2010-10-21 07:31:35 +0200
commita30cc5587a71c0cbaedaa06b1d95274f890a1534 (patch)
treecc4354b9343cf8c35b8ed11d9b68aeb8b3f0e902
parent5e09be624bd6c064e425f2aeeb0693285a76cf9a (diff)
Use malloc and free instead of deprecated xalloc and xfree
-rw-r--r--src/glide_driver.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/glide_driver.c b/src/glide_driver.c
index bebbb8f..6357f2f 100644
--- a/src/glide_driver.c
+++ b/src/glide_driver.c
@@ -311,7 +311,7 @@ GLIDEFreeRec(ScrnInfoPtr pScrn)
{
if (pScrn->driverPrivate == NULL)
return;
- xfree(pScrn->driverPrivate);
+ free(pScrn->driverPrivate);
pScrn->driverPrivate = NULL;
}
@@ -404,7 +404,7 @@ GLIDEProbe(DriverPtr drv, int flags)
}
cleanup:
- xfree(devList);
+ free(devList);
return foundScreen;
}
@@ -505,7 +505,8 @@ GLIDEPreInit(ScrnInfoPtr pScrn, int flags)
xf86CollectOptions(pScrn, NULL);
/* Process the options */
- if (!(pGlide->Options = xalloc(sizeof(GLIDEOptions))))
+ pGlide->Options = malloc(sizeof(GLIDEOptions));
+ if (pGlide->Options == NULL)
return FALSE;
memcpy(pGlide->Options, GLIDEOptions, sizeof(GLIDEOptions));
xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pGlide->Options);
@@ -777,7 +778,7 @@ GLIDECloseScreen(int scrnIndex, ScreenPtr pScreen)
if (pScrn->vtSema)
GLIDERestore(pScrn, TRUE);
- xfree(pGlide->ShadowPtr);
+ free(pGlide->ShadowPtr);
pScrn->vtSema = FALSE;
@@ -799,7 +800,7 @@ GLIDEFreeScreen(int scrnIndex, int flags)
* get called routinely at the end of a server generation.
*/
if (pGlide && pGlide->ShadowPtr)
- xfree(pGlide->ShadowPtr);
+ free(pGlide->ShadowPtr);
GLIDEFreeRec(xf86Screens[scrnIndex]);
}