diff options
Diffstat (limited to 'src/i740_video.c')
| -rw-r--r-- | src/i740_video.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/i740_video.c b/src/i740_video.c index 8cfe09a..2a26f21 100644 --- a/src/i740_video.c +++ b/src/i740_video.c @@ -912,18 +912,18 @@ static int I740AllocateSurface( surface->width = w; surface->height = h; - if(!(surface->pitches = xalloc(sizeof(int)))) { + if(!(surface->pitches = malloc(sizeof(int)))) { xf86FreeOffscreenLinear(linear); return BadAlloc; } - if(!(surface->offsets = xalloc(sizeof(int)))) { - xfree(surface->pitches); + if(!(surface->offsets = malloc(sizeof(int)))) { + free(surface->pitches); xf86FreeOffscreenLinear(linear); return BadAlloc; } - if(!(pPriv = xalloc(sizeof(OffscreenPrivRec)))) { - xfree(surface->pitches); - xfree(surface->offsets); + if(!(pPriv = malloc(sizeof(OffscreenPrivRec)))) { + free(surface->pitches); + free(surface->offsets); xf86FreeOffscreenLinear(linear); return BadAlloc; } @@ -967,9 +967,9 @@ static int I740FreeSurface(XF86SurfacePtr surface) } xf86FreeOffscreenLinear(pPriv->linear); - xfree(surface->pitches); - xfree(surface->offsets); - xfree(surface->devPrivate.ptr); + free(surface->pitches); + free(surface->offsets); + free(surface->devPrivate.ptr); return Success; } @@ -1128,7 +1128,7 @@ static void I740InitOffscreenImages(ScreenPtr pScreen) } /* need to free this someplace */ - if(!(offscreenImages = xalloc(sizeof(XF86OffscreenImageRec)))) + if(!(offscreenImages = malloc(sizeof(XF86OffscreenImageRec)))) { return; } @@ -1179,7 +1179,7 @@ static XF86VideoAdaptorPtr I740SetupImageVideo(ScreenPtr pScreen) { const int n=sizeof(XF86VideoAdaptorRec)+sizeof(I740PortPrivRec)+sizeof(DevUnion); - if(!(adapt = xcalloc(1, n))) + if(!(adapt = calloc(1, n))) return NULL; /*//memset(adapt,0,n);*/ @@ -1276,7 +1276,7 @@ void I740InitVideo(ScreenPtr pScreen) } else { - if((adaptors_newptrs = xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr)))) + if((adaptors_newptrs = malloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr)))) { memcpy(adaptors_newptrs, adaptors_oldptrs, num_adaptors * sizeof(XF86VideoAdaptorPtr)); adaptors_newptrs[num_adaptors] = newAdaptor; @@ -1286,7 +1286,7 @@ void I740InitVideo(ScreenPtr pScreen) xf86XVScreenInit(pScreen, adaptors_newptrs, num_adaptors+1); - xfree(adaptors_newptrs); + free(adaptors_newptrs); } } } |