From: Kenneth Graunke <kenneth@whitecape.org>
Date: Fri, 19 Feb 2010 07:50:53 +0000 (-0800)
Subject: Remove _mesa_strcpy in favor of plain strcpy.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5fcaa78912bc78a5db410200c5987e2c57fad570;p=mesa.git

Remove _mesa_strcpy in favor of plain strcpy.
---

diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index 1a7535d89e9..19deef57679 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -841,13 +841,6 @@ _mesa_getenv( const char *var )
 /** \name String */
 /*@{*/
 
-/** Wrapper around strcpy() */
-char *
-_mesa_strcpy( char *dest, const char *src )
-{
-   return strcpy(dest, src);
-}
-
 /** Wrapper around strncpy() */
 char *
 _mesa_strncpy( char *dest, const char *src, size_t n )
@@ -877,7 +870,7 @@ _mesa_strncmp( const char *s1, const char *s2, size_t n )
 }
 
 /**
- * Implemented using _mesa_malloc() and _mesa_strcpy.
+ * Implemented using _mesa_malloc() and strcpy.
  * Note that NULL is handled accordingly.
  */
 char *
@@ -887,7 +880,7 @@ _mesa_strdup( const char *s )
       size_t l = _mesa_strlen(s);
       char *s2 = (char *) _mesa_malloc(l + 1);
       if (s2)
-         _mesa_strcpy(s2, s);
+         strcpy(s2, s);
       return s2;
    }
    else {
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index a3ec0c2ed9a..0143be3ced2 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -611,9 +611,6 @@ _mesa_bsearch( const void *key, const void *base, size_t nmemb, size_t size,
 extern char *
 _mesa_getenv( const char *var );
 
-extern char *
-_mesa_strcpy( char *dest, const char *src );
-
 extern char *
 _mesa_strncpy( char *dest, const char *src, size_t n );
 
diff --git a/src/mesa/shader/slang/slang_mem.c b/src/mesa/shader/slang/slang_mem.c
index 9224578edb0..dc5707a39b9 100644
--- a/src/mesa/shader/slang/slang_mem.c
+++ b/src/mesa/shader/slang/slang_mem.c
@@ -215,7 +215,7 @@ _slang_strdup(const char *s)
       size_t l = _mesa_strlen(s);
       char *s2 = (char *) _slang_alloc(l + 1);
       if (s2)
-         _mesa_strcpy(s2, s);
+         strcpy(s2, s);
       return s2;
    }
    else {
diff --git a/src/mesa/shader/slang/slang_utility.c b/src/mesa/shader/slang/slang_utility.c
index 3631e32b3c3..950fba5611c 100644
--- a/src/mesa/shader/slang/slang_utility.c
+++ b/src/mesa/shader/slang/slang_utility.c
@@ -35,7 +35,7 @@
 char *
 slang_string_concat (char *dst, const char *src)
 {
-   return _mesa_strcpy (dst + _mesa_strlen (dst), src);
+   return strcpy (dst + _mesa_strlen (dst), src);
 }
 
 
diff --git a/src/mesa/shader/slang/slang_utility.h b/src/mesa/shader/slang/slang_utility.h
index 032c5618107..3762cc96795 100644
--- a/src/mesa/shader/slang/slang_utility.h
+++ b/src/mesa/shader/slang/slang_utility.h
@@ -33,7 +33,7 @@
 
 
 #define slang_string_compare(str1, str2) _mesa_strcmp (str1, str2)
-#define slang_string_copy(dst, src) _mesa_strcpy (dst, src)
+#define slang_string_copy(dst, src) strcpy (dst, src)
 #define slang_string_length(str) _mesa_strlen (str)
 
 char *slang_string_concat (char *, const char *);