projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5fcaa78
)
Remove _mesa_strncpy in favor of plain strncpy.
author
Kenneth Graunke
<kenneth@whitecape.org>
Fri, 19 Feb 2010 07:50:54 +0000
(23:50 -0800)
committer
Kristian Høgsberg
<krh@bitplanet.net>
Fri, 19 Feb 2010 12:50:40 +0000
(07:50 -0500)
src/gallium/state_trackers/glx/xlib/glx_api.c
patch
|
blob
|
history
src/mesa/drivers/x11/fakeglx.c
patch
|
blob
|
history
src/mesa/main/dlopen.c
patch
|
blob
|
history
src/mesa/main/imports.c
patch
|
blob
|
history
src/mesa/main/imports.h
patch
|
blob
|
history
diff --git
a/src/gallium/state_trackers/glx/xlib/glx_api.c
b/src/gallium/state_trackers/glx/xlib/glx_api.c
index 3caf56e924b1be701c0f4aa25c9ddbf203551916..7e86e68b682708ea9d81bb7f3cf9be3a9f2afd58 100644
(file)
--- 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;
}
return NULL;
}
-
_mesa_
strncpy( value, _mesa_getenv(varname), 100 );
+ strncpy( value, _mesa_getenv(varname), 100 );
value[99] = 0;
sscanf( value, "%s %d", type, &depth );
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 5c0084f37aae4ac0afb24930101538829f4692f5..3b8c41b91839f65b3aebaca83d6f0171796d09b6 100644
(file)
--- 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;
}
return NULL;
}
-
_mesa_
strncpy( value, _mesa_getenv(varname), 100 );
+ strncpy( value, _mesa_getenv(varname), 100 );
value[99] = 0;
sscanf( value, "%s %d", type, &depth );
value[99] = 0;
sscanf( value, "%s %d", type, &depth );
diff --git
a/src/mesa/main/dlopen.c
b/src/mesa/main/dlopen.c
index 81e032081db451e69167d33f580ccf63e5f8f0e3..658ac9e40cf87d6366c4aeb3ef54d3d98d0de400 100644
(file)
--- 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] = '_';
/* 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)
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 19deef5767966155f71f4184ae04e4867deae6e4..78c5cada753ed361cbe25a66d2d70c4601dc9ab4 100644
(file)
--- a/
src/mesa/main/imports.c
+++ b/
src/mesa/main/imports.c
@@
-841,13
+841,6
@@
_mesa_getenv( const char *var )
/** \name String */
/*@{*/
/** \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 )
/** 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 0143be3ced242898d4b35615d54dedff927cbdef..192dffe8c6f173effd68d975cf1eb4ecc7c65833 100644
(file)
--- 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_getenv( const char *var );
-extern char *
-_mesa_strncpy( char *dest, const char *src, size_t n );
-
extern size_t
_mesa_strlen( const char *s );
extern size_t
_mesa_strlen( const char *s );