---
src/gallium/state_trackers/glx/xlib/glx_api.c | 2 +-
src/mesa/drivers/x11/fakeglx.c | 2 +-
src/mesa/main/dlopen.c | 2 +-
src/mesa/main/imports.c | 7 -------
src/mesa/main/imports.h | 3 ---
5 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/src/gallium/state_trackers/glx/xlib/glx_api.c
b/src/gallium/state_trackers/glx/xlib/glx_api.c
index 3caf56e..7e86e68 100644
--- a/src/gallium/state_trackers/glx/xlib/glx_api.c
+++ b/src/gallium/state_trackers/glx/xlib/glx_api.c
@@ -442,7 +442,7 @@ get_env_visual(Display *dpy, int scr, const char *varname)
return NULL;
}
- _mesa_strncpy( value, _mesa_getenv(varname), 100 );
+ strncpy( value, _mesa_getenv(varname), 100 );
value[99] = 0;
sscanf( value, "%s %d", type, &depth );
diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c
index 5c0084f..3b8c41b 100644
--- a/src/mesa/drivers/x11/fakeglx.c
+++ b/src/mesa/drivers/x11/fakeglx.c
@@ -616,7 +616,7 @@ get_env_visual(Display *dpy, int scr, const char *varname)
return NULL;
}
- _mesa_strncpy( value, _mesa_getenv(varname), 100 );
+ strncpy( value, _mesa_getenv(varname), 100 );
value[99] = 0;
sscanf( value, "%s %d", type, &depth );
diff --git a/src/mesa/main/dlopen.c b/src/mesa/main/dlopen.c
index 81e0320..658ac9e 100644
--- a/src/mesa/main/dlopen.c
+++ b/src/mesa/main/dlopen.c
@@ -73,7 +73,7 @@ _mesa_dlsym(void *handle, const char *fname)
/* need '_' prefix on symbol names */
char fname2[1000];
fname2[0] = '_';
- _mesa_strncpy(fname2 + 1, fname, 998);
+ strncpy(fname2 + 1, fname, 998);
fname2[999] = 0;
return (GenericFunc) dlsym(handle, fname2);
#elif defined(_GNU_SOURCE)
diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index 19deef5..78c5cad 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 strncpy() */
-char *
-_mesa_strncpy( char *dest, const char *src, size_t n )
-{
- return strncpy(dest, src, n);
-}
-
/** Wrapper around strlen() */
size_t
_mesa_strlen( const char *s )
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index 0143be3..192dffe 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_strncpy( char *dest, const char *src, size_t n );
-
extern size_t
_mesa_strlen( const char *s );
--
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
