xorg/vmwgfx: Don't use deprecated x*alloc / xfree functions
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
This commit is contained in:
parent
2ab7a8a3eb
commit
543136d5bd
|
@ -212,7 +212,7 @@ VMwareCtrlDoSetTopology(ScrnInfoPtr pScrn,
|
|||
struct vmw_customizer *vmw = vmw_customizer(xorg_customizer(pScrn));
|
||||
int i;
|
||||
|
||||
rects = xcalloc(number, sizeof(*rects));
|
||||
rects = calloc(number, sizeof(*rects));
|
||||
if (!rects)
|
||||
return FALSE;
|
||||
|
||||
|
@ -225,7 +225,7 @@ VMwareCtrlDoSetTopology(ScrnInfoPtr pScrn,
|
|||
|
||||
vmw_ioctl_update_layout(vmw, number, rects);
|
||||
|
||||
xfree(rects);
|
||||
free(rects);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
|
|
@ -165,7 +165,7 @@ vmw_ioctl_buffer_create(struct vmw_customizer *vmw, uint32_t size, unsigned *han
|
|||
struct drm_vmw_dmabuf_rep *rep = &arg.rep;
|
||||
int ret;
|
||||
|
||||
buf = xcalloc(1, sizeof(*buf));
|
||||
buf = calloc(1, sizeof(*buf));
|
||||
if (!buf)
|
||||
goto err;
|
||||
|
||||
|
@ -192,7 +192,7 @@ vmw_ioctl_buffer_create(struct vmw_customizer *vmw, uint32_t size, unsigned *han
|
|||
return buf;
|
||||
|
||||
err_free:
|
||||
xfree(buf);
|
||||
free(buf);
|
||||
err:
|
||||
return NULL;
|
||||
}
|
||||
|
@ -211,7 +211,7 @@ vmw_ioctl_buffer_destroy(struct vmw_customizer *vmw, struct vmw_dma_buffer *buf)
|
|||
arg.handle = buf->handle;
|
||||
drmCommandWrite(vmw->fd, DRM_VMW_UNREF_DMABUF, &arg, sizeof(arg));
|
||||
|
||||
xfree(buf);
|
||||
free(buf);
|
||||
}
|
||||
|
||||
void *
|
||||
|
|
|
@ -300,7 +300,7 @@ vmw_video_init(struct vmw_customizer *vmw)
|
|||
numAdaptors = 1;
|
||||
overlayAdaptors = &newAdaptor;
|
||||
} else {
|
||||
newAdaptors = xalloc((numAdaptors + 1) *
|
||||
newAdaptors = malloc((numAdaptors + 1) *
|
||||
sizeof(XF86VideoAdaptorPtr*));
|
||||
if (!newAdaptors) {
|
||||
xf86XVFreeVideoAdaptorRec(newAdaptor);
|
||||
|
@ -320,7 +320,7 @@ vmw_video_init(struct vmw_customizer *vmw)
|
|||
}
|
||||
|
||||
if (newAdaptors) {
|
||||
xfree(newAdaptors);
|
||||
free(newAdaptors);
|
||||
}
|
||||
|
||||
debug_printf("Initialized VMware Xv extension successfully\n");
|
||||
|
@ -438,7 +438,7 @@ vmw_video_init_adaptor(ScrnInfoPtr pScrn, struct vmw_customizer *vmw)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
video = xcalloc(1, sizeof(*video));
|
||||
video = calloc(1, sizeof(*video));
|
||||
if (!video) {
|
||||
debug_printf("Not enough memory.\n");
|
||||
xf86XVFreeVideoAdaptorRec(adaptor);
|
||||
|
@ -742,7 +742,7 @@ vmw_video_buffer_alloc(struct vmw_customizer *vmw, int size,
|
|||
}
|
||||
|
||||
out->size = size;
|
||||
out->extra_data = xcalloc(1, size);
|
||||
out->extra_data = calloc(1, size);
|
||||
|
||||
debug_printf("\t\t%s: allocated buffer %p of size %i\n", __func__, out, size);
|
||||
|
||||
|
@ -773,7 +773,7 @@ vmw_video_buffer_free(struct vmw_customizer *vmw,
|
|||
if (out->size == 0)
|
||||
return Success;
|
||||
|
||||
xfree(out->extra_data);
|
||||
free(out->extra_data);
|
||||
vmw_ioctl_buffer_unmap(vmw, out->buf);
|
||||
vmw_ioctl_buffer_destroy(vmw, out->buf);
|
||||
|
||||
|
|
Loading…
Reference in New Issue