summaryrefslogtreecommitdiffstats
path: root/src/glx/apple
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gmail.com>2012-09-04 22:52:36 -0700
committerMatt Turner <mattst88@gmail.com>2012-09-05 22:28:49 -0700
commit7c7b7b068b1d0dc8e14b87dab5dbd4108f874f74 (patch)
tree9a6901c4b12cd5b2dbe3c7fce29cfcc7771a84de /src/glx/apple
parent17a574d7cd8c541c902cc0da40362a32d965e77b (diff)
downloadexternal_mesa3d-7c7b7b068b1d0dc8e14b87dab5dbd4108f874f74.zip
external_mesa3d-7c7b7b068b1d0dc8e14b87dab5dbd4108f874f74.tar.gz
external_mesa3d-7c7b7b068b1d0dc8e14b87dab5dbd4108f874f74.tar.bz2
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 <brianp@vmware.com>
Diffstat (limited to 'src/glx/apple')
-rw-r--r--src/glx/apple/glxreply.c4
1 files changed, 2 insertions, 2 deletions
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);
}
}
}