diff options
author | Kenneth Graunke <kenneth@whitecape.org> | 2010-02-18 23:50:53 -0800 |
---|---|---|
committer | Kristian Høgsberg <krh@bitplanet.net> | 2010-02-19 07:50:22 -0500 |
commit | 5fcaa78912bc78a5db410200c5987e2c57fad570 (patch) | |
tree | 37be9f2d07648120c6aad4d422dfca3f42d085d0 /src/mesa | |
parent | 8ff7624653f0e119865cc6c283775832f1bc2903 (diff) |
Remove _mesa_strcpy in favor of plain strcpy.
Diffstat (limited to 'src/mesa')
-rw-r--r-- | src/mesa/main/imports.c | 11 | ||||
-rw-r--r-- | src/mesa/main/imports.h | 3 | ||||
-rw-r--r-- | src/mesa/shader/slang/slang_mem.c | 2 | ||||
-rw-r--r-- | src/mesa/shader/slang/slang_utility.c | 2 | ||||
-rw-r--r-- | 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 1a7535d89e..19deef5767 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 a3ec0c2ed9..0143be3ced 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 9224578edb..dc5707a39b 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 3631e32b3c..950fba5611 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 032c561810..3762cc9679 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 *); |