summaryrefslogtreecommitdiff
path: root/src/glx/clientattrib.c
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/clientattrib.c
parent17a574d7cd8c541c902cc0da40362a32d965e77b (diff)
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/clientattrib.c')
-rw-r--r--src/glx/clientattrib.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/glx/clientattrib.c b/src/glx/clientattrib.c
index 7792fa31f9..4721fe938f 100644
--- a/src/glx/clientattrib.c
+++ b/src/glx/clientattrib.c
@@ -75,7 +75,7 @@ __indirect_glPushClientAttrib(GLuint mask)
if (spp < &gc->attributes.stack[__GL_CLIENT_ATTRIB_STACK_DEPTH]) {
if (!(sp = *spp)) {
- sp = (__GLXattribute *) Xmalloc(sizeof(__GLXattribute));
+ sp = (__GLXattribute *) malloc(sizeof(__GLXattribute));
*spp = sp;
}
sp->mask = mask;
@@ -135,7 +135,7 @@ __glFreeAttributeState(struct glx_context * gc)
spp < &gc->attributes.stack[__GL_CLIENT_ATTRIB_STACK_DEPTH]; spp++) {
sp = *spp;
if (sp) {
- XFree((char *) sp);
+ free((char *) sp);
}
else {
break;