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/gallium/state_trackers/xvmc/context.c | 2 +- src/gallium/state_trackers/xvmc/subpicture.c | 4 ++-- src/gallium/state_trackers/xvmc/tests/test_subpicture.c | 2 +- src/gallium/state_trackers/xvmc/tests/testlib.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/gallium/state_trackers/xvmc') diff --git a/src/gallium/state_trackers/xvmc/context.c b/src/gallium/state_trackers/xvmc/context.c index 366f29b..23f9d10 100644 --- a/src/gallium/state_trackers/xvmc/context.c +++ b/src/gallium/state_trackers/xvmc/context.c @@ -113,7 +113,7 @@ static Status Validate(Display *dpy, XvPortID port, int surface_type_id, *mc_type, *surface_flags, *subpic_max_w, *subpic_max_h); } - XFree(surface_info); + free(surface_info); } } diff --git a/src/gallium/state_trackers/xvmc/subpicture.c b/src/gallium/state_trackers/xvmc/subpicture.c index b33f16e..f9f646b 100644 --- a/src/gallium/state_trackers/xvmc/subpicture.c +++ b/src/gallium/state_trackers/xvmc/subpicture.c @@ -116,7 +116,7 @@ static Status Validate(Display *dpy, XvPortID port, int surface_type_id, int xvi subpictures = XvMCListSubpictureTypes(dpy, port, surface_type_id, &num_subpics); if (num_subpics < 1) { if (subpictures) - XFree(subpictures); + free(subpictures); return BadMatch; } if (!subpictures) @@ -161,7 +161,7 @@ static Status Validate(Display *dpy, XvPortID port, int surface_type_id, int xvi } } - XFree(subpictures); + free(subpictures); return i < num_subpics ? Success : BadMatch; } diff --git a/src/gallium/state_trackers/xvmc/tests/test_subpicture.c b/src/gallium/state_trackers/xvmc/tests/test_subpicture.c index 9683a1a..9336bfa 100644 --- a/src/gallium/state_trackers/xvmc/tests/test_subpicture.c +++ b/src/gallium/state_trackers/xvmc/tests/test_subpicture.c @@ -174,7 +174,7 @@ int main(int argc, char **argv) assert(XvMCDestroyContext(display, &context) == Success); - XFree(subpics); + free(subpics); XvUngrabPort(display, port_num, CurrentTime); XCloseDisplay(display); diff --git a/src/gallium/state_trackers/xvmc/tests/testlib.c b/src/gallium/state_trackers/xvmc/tests/testlib.c index 86d4b1c..de3b8da 100644 --- a/src/gallium/state_trackers/xvmc/tests/testlib.c +++ b/src/gallium/state_trackers/xvmc/tests/testlib.c @@ -102,7 +102,7 @@ int GetPort } } - XFree(surface_info); + free(surface_info); } } } -- cgit v1.1