---
src/mesa/main/imports.c | 11 ++---------
src/mesa/main/imports.h | 3 ---
src/mesa/shader/slang/slang_mem.c | 2 +-
src/mesa/shader/slang/slang_utility.c | 2 +-
src/mesa/shader/slang/slang_utility.h | 2 +-
5 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index 1a7535d..19deef5 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 a3ec0c2..0143be3 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -612,9 +612,6 @@ 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 );
extern size_t
diff --git a/src/mesa/shader/slang/slang_mem.c
b/src/mesa/shader/slang/slang_mem.c
index 9224578..dc5707a 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 3631e32..950fba5 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 032c561..3762cc9 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 *);
--
1.7.0
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Mesa3d-dev mailing list
Mesa3d-dev@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
