summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2011-05-25 06:05:29 -0400
committerAdam Jackson <ajax@redhat.com>2011-05-25 06:05:29 -0400
commitbdc59411136b16ca3447336f22e95010bf709a53 (patch)
tree8f811085e9bdc3141d387b6dd0e0afa900ebdf79
parent7f57ed6be7c561b83da44a6ecb0562e8f562e48e (diff)
Port away from xalloc/xfree
Signed-off-by: Adam Jackson <ajax@redhat.com>
-rw-r--r--src/dummy_driver.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/dummy_driver.c b/src/dummy_driver.c
index 1ff9f08..e6124e8 100644
--- a/src/dummy_driver.c
+++ b/src/dummy_driver.c
@@ -202,7 +202,7 @@ DUMMYFreeRec(ScrnInfoPtr pScrn)
{
if (pScrn->driverPrivate == NULL)
return;
- xfree(pScrn->driverPrivate);
+ free(pScrn->driverPrivate);
pScrn->driverPrivate = NULL;
}
@@ -357,7 +357,7 @@ DUMMYPreInit(ScrnInfoPtr pScrn, int flags)
xf86CollectOptions(pScrn, device->options);
/* Process the options */
- if (!(dPtr->Options = xalloc(sizeof(DUMMYOptions))))
+ if (!(dPtr->Options = malloc(sizeof(DUMMYOptions))))
return FALSE;
memcpy(dPtr->Options, DUMMYOptions, sizeof(DUMMYOptions));
@@ -535,7 +535,7 @@ DUMMYScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
DUMMYScrn = pScrn;
- if (!(dPtr->FBBase = xalloc(pScrn->videoRam * 1024)))
+ if (!(dPtr->FBBase = malloc(pScrn->videoRam * 1024)))
return FALSE;
/*
@@ -705,7 +705,7 @@ DUMMYCloseScreen(int scrnIndex, ScreenPtr pScreen)
if(pScrn->vtSema){
dummyRestore(pScrn, TRUE);
- xfree(dPtr->FBBase);
+ free(dPtr->FBBase);
}
if (dPtr->CursorInfo)