Mesa (master): Remove _mesa_strncat in favor of plain strncat.
Kristian Høgsberg
krh at kemper.freedesktop.org
Fri Feb 19 14:40:59 UTC 2010
Module: Mesa
Branch: master
Commit: 8ff7624653f0e119865cc6c283775832f1bc2903
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8ff7624653f0e119865cc6c283775832f1bc2903
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Thu Feb 18 23:50:52 2010 -0800
Remove _mesa_strncat in favor of plain strncat.
---
src/mesa/main/imports.c | 7 -------
src/mesa/main/imports.h | 3 ---
src/mesa/shader/atifragshader.c | 16 ++++++++--------
3 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index cd19373..1a7535d 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 strncat() */
-char *
-_mesa_strncat( char *dest, const char *src, size_t n )
-{
- return strncat(dest, src, n);
-}
-
/** Wrapper around strcpy() */
char *
_mesa_strcpy( char *dest, const char *src )
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index c487f1d..a3ec0c2 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_strncat( char *dest, const char *src, size_t n );
-
-extern char *
_mesa_strcpy( char *dest, const char *src );
extern char *
diff --git a/src/mesa/shader/atifragshader.c b/src/mesa/shader/atifragshader.c
index ab7b203..28dbf77 100644
--- a/src/mesa/shader/atifragshader.c
+++ b/src/mesa/shader/atifragshader.c
@@ -98,25 +98,25 @@ create_dst_mod_str(GLuint mod)
_mesa_memset(ret_str, 0, 1024);
if (mod & GL_2X_BIT_ATI)
- _mesa_strncat(ret_str, "|2X", 1024);
+ strncat(ret_str, "|2X", 1024);
if (mod & GL_4X_BIT_ATI)
- _mesa_strncat(ret_str, "|4X", 1024);
+ strncat(ret_str, "|4X", 1024);
if (mod & GL_8X_BIT_ATI)
- _mesa_strncat(ret_str, "|8X", 1024);
+ strncat(ret_str, "|8X", 1024);
if (mod & GL_HALF_BIT_ATI)
- _mesa_strncat(ret_str, "|HA", 1024);
+ strncat(ret_str, "|HA", 1024);
if (mod & GL_QUARTER_BIT_ATI)
- _mesa_strncat(ret_str, "|QU", 1024);
+ strncat(ret_str, "|QU", 1024);
if (mod & GL_EIGHTH_BIT_ATI)
- _mesa_strncat(ret_str, "|EI", 1024);
+ strncat(ret_str, "|EI", 1024);
if (mod & GL_SATURATE_BIT_ATI)
- _mesa_strncat(ret_str, "|SAT", 1024);
+ strncat(ret_str, "|SAT", 1024);
if (_mesa_strlen(ret_str) == 0)
- _mesa_strncat(ret_str, "NONE", 1024);
+ strncat(ret_str, "NONE", 1024);
return ret_str;
}
More information about the mesa-commit
mailing list