From 7c7b7b068b1d0dc8e14b87dab5dbd4108f874f74 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Tue, 4 Sep 2012 22:52:36 -0700 Subject: Remove Xcalloc/Xmalloc/Xfree calls These calls allowed Xlib to use a custom memory allocator, but Xlib has used the standard C library functions since at least its initial import into git in 2003. It seems unlikely that it will grow a custom memory allocator. The functions now just add extra overhead. Replacing them will make future Coccinelle patches simpler. This patch has been generated by the following Coccinelle semantic patch: // Remove Xcalloc/Xmalloc/Xfree calls @@ expression E1, E2; @@ - Xcalloc (E1, E2) + calloc (E1, E2) @@ expression E; @@ - Xmalloc (E) + malloc (E) @@ expression E; @@ - Xfree (E) + free (E) @@ expression E; @@ - XFree (E) + free (E) Reviewed-by: Brian Paul --- src/glx/apple/glxreply.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/glx/apple') diff --git a/src/glx/apple/glxreply.c b/src/glx/apple/glxreply.c index f17ebe6..240caa7 100644 --- a/src/glx/apple/glxreply.c +++ b/src/glx/apple/glxreply.c @@ -79,7 +79,7 @@ __glXReadPixelReply(Display * dpy, struct glx_context * gc, unsigned max_dim, size = reply.length * 4; if (size != 0) { - void *buf = Xmalloc(size); + void *buf = malloc(size); if (buf == NULL) { _XEatData(dpy, size); @@ -94,7 +94,7 @@ __glXReadPixelReply(Display * dpy, struct glx_context * gc, unsigned max_dim, } __glEmptyImage(gc, 3, width, height, depth, format, type, buf, dest); - Xfree(buf); + free(buf); } } } -- cgit v1.1