Mesa (master): egl/dri2/x11: use standard strndup function
Emil Velikov
evelikov at kemper.freedesktop.org
Mon Jun 9 21:59:35 UTC 2014
Module: Mesa
Branch: master
Commit: c153b1f39b60f7a2ba59262b12b4597cbfbf36ca
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c153b1f39b60f7a2ba59262b12b4597cbfbf36ca
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Sun Jun 1 15:19:46 2014 +0100
egl/dri2/x11: use standard strndup function
Using a custom version of the function brings no benefit.
Cc: Chad Versace <chad.versace at linux.intel.com>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
src/egl/drivers/dri2/platform_x11.c | 23 ++++-------------------
1 file changed, 4 insertions(+), 19 deletions(-)
diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c
index 874bcc4..548334e 100644
--- a/src/egl/drivers/dri2/platform_x11.c
+++ b/src/egl/drivers/dri2/platform_x11.c
@@ -481,21 +481,6 @@ dri2_x11_flush_front_buffer(__DRIdrawable * driDrawable, void *loaderPrivate)
#endif
}
-static char *
-dri2_x11_strndup(const char *s, int length)
-{
- char *d;
-
- d = malloc(length + 1);
- if (d == NULL)
- return NULL;
-
- memcpy(d, s, length);
- d[length] = '\0';
-
- return d;
-}
-
static EGLBoolean
dri2_x11_connect(struct dri2_egl_display *dri2_dpy)
{
@@ -565,14 +550,14 @@ dri2_x11_connect(struct dri2_egl_display *dri2_dpy)
driver_name = xcb_dri2_connect_driver_name (connect);
dri2_dpy->driver_name =
- dri2_x11_strndup(driver_name,
- xcb_dri2_connect_driver_name_length(connect));
+ strndup(driver_name,
+ xcb_dri2_connect_driver_name_length(connect));
device_name = xcb_dri2_connect_device_name (connect);
dri2_dpy->device_name =
- dri2_x11_strndup(device_name,
- xcb_dri2_connect_device_name_length(connect));
+ strndup(device_name,
+ xcb_dri2_connect_device_name_length(connect));
if (dri2_dpy->device_name == NULL || dri2_dpy->driver_name == NULL) {
free(dri2_dpy->device_name);
More information about the mesa-commit
mailing list