From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Sun, 1 Jun 2014 14:19:46 +0000 (+0100)
Subject: egl/dri2/x11: use standard strndup function
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c153b1f39b60f7a2ba59262b12b4597cbfbf36ca;p=mesa.git

egl/dri2/x11: use standard strndup function

Using a custom version of the function brings no benefit.

Cc: Chad Versace <chad.versace@linux.intel.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
---

diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c
index 874bcc48fe6..548334e3caa 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);