summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBartosz Kosiorek <gang65@poczta.onet.pl>2010-11-10 21:55:58 +0000
committerBartosz Kosiorek <gang65@poczta.onet.pl>2010-11-10 21:55:58 +0000
commit7618ddffba7f8e1f5c5deeaa5559b76e085b4488 (patch)
tree1ba870b0eeb7fc23486c12356550a7eccfd94554
parent15b896eac9708996eaefeeb3c500bc03826c2013 (diff)
Replace remaining xalloc to malloc
-rw-r--r--src/via_driver.c2
-rw-r--r--src/via_vbe.c2
-rw-r--r--src/via_video.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/via_driver.c b/src/via_driver.c
index 847edd3..70cbd6b 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -2940,7 +2940,7 @@ VIAInternalScreenInit(int scrnIndex, ScreenPtr pScreen)
if (pVia->shadowFB) {
pVia->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width);
- pVia->ShadowPtr = xalloc(pVia->ShadowPitch * shadowHeight);
+ pVia->ShadowPtr = malloc(pVia->ShadowPitch * shadowHeight);
displayWidth = pVia->ShadowPitch / (pScrn->bitsPerPixel >> 3);
FBStart = pVia->ShadowPtr;
} else {
diff --git a/src/via_vbe.c b/src/via_vbe.c
index db1f27e..b945f41 100644
--- a/src/via_vbe.c
+++ b/src/via_vbe.c
@@ -322,7 +322,7 @@ ViaVbeSaveRestore(ScrnInfoPtr pScrn, vbeSaveRestoreFunction function)
&& (function == MODE_SAVE)) {
/* Do not rely on the memory not being touched. */
if (pVia->vbeMode.pstate == NULL)
- pVia->vbeMode.pstate = xalloc(pVia->vbeMode.stateSize);
+ pVia->vbeMode.pstate = malloc(pVia->vbeMode.stateSize);
memcpy(pVia->vbeMode.pstate, pVia->vbeMode.state,
pVia->vbeMode.stateSize);
}
diff --git a/src/via_video.c b/src/via_video.c
index aa1a1e7..94c5a77 100644
--- a/src/via_video.c
+++ b/src/via_video.c
@@ -660,7 +660,7 @@ viaInitVideo(ScreenPtr pScreen)
DBG_DD(ErrorF(" via_video.c : num_adaptors : %d\n", num_adaptors));
if (newAdaptors) {
- allAdaptors = xalloc((num_adaptors + num_new) *
+ allAdaptors = malloc((num_adaptors + num_new) *
sizeof(XF86VideoAdaptorPtr *));
if (allAdaptors) {
if (num_adaptors)