diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2010-02-18 23:50:51 -0800 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2010-02-19 07:47:48 -0500 |
| commit | 0aecdb638322c81ce30f201f12e1f268acd1a64c (patch) | |
| tree | 54f85ea6c8ea24ce5bb5f8b98a82eef46c26df50 /src/mesa/main | |
| parent | 71214c640c8b20020ead13897c76b9b6773126ba (diff) | |
Remove _mesa_strstr in favor of plain strstr.
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/debug.c | 6 | ||||
| -rw-r--r-- | src/mesa/main/imports.c | 9 | ||||
| -rw-r--r-- | src/mesa/main/imports.h | 3 |
3 files changed, 4 insertions, 14 deletions
diff --git a/src/mesa/main/debug.c b/src/mesa/main/debug.c index 9bad83487f..f2182c0577 100644 --- a/src/mesa/main/debug.c +++ b/src/mesa/main/debug.c @@ -206,17 +206,17 @@ static void add_debug_flags( const char *debug ) MESA_VERBOSE = 0x0; for (i = 0; i < Elements(debug_opt); i++) { - if (_mesa_strstr(debug, debug_opt[i].name)) + if (strstr(debug, debug_opt[i].name)) MESA_VERBOSE |= debug_opt[i].flag; } /* Debug flag: */ - if (_mesa_strstr(debug, "flush")) + if (strstr(debug, "flush")) MESA_DEBUG_FLAGS |= DEBUG_ALWAYS_FLUSH; #if defined(_FPU_GETCW) && defined(_FPU_SETCW) - if (_mesa_strstr(debug, "fpexceptions")) { + if (strstr(debug, "fpexceptions")) { /* raise FP exceptions */ fpu_control_t mask; _FPU_GETCW(mask); diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c index def045269c..cd19373fc5 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 strstr() */ -char * -_mesa_strstr( const char *haystack, const char *needle ) -{ - return strstr(haystack, needle); -} - /** Wrapper around strncat() */ char * _mesa_strncat( char *dest, const char *src, size_t n ) @@ -1177,7 +1170,7 @@ _mesa_error( GLcontext *ctx, GLenum error, const char *fmtString, ... ) const char *debugEnv = _mesa_getenv("MESA_DEBUG"); #ifdef DEBUG - if (debugEnv && _mesa_strstr(debugEnv, "silent")) + if (debugEnv && strstr(debugEnv, "silent")) debug = GL_FALSE; else debug = GL_TRUE; diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h index e3d2ac9b42..c487f1dab6 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_strstr( const char *haystack, const char *needle ); - -extern char * _mesa_strncat( char *dest, const char *src, size_t n ); extern char * |