Remove _mesa_strcmp in favor of plain strcmp.

20 files changed, 39 insertions, 53 deletions

diff --git a/src/gallium/state_trackers/glx/xlib/glx_api.c b/src/gallium/state_trackers/glx/xlib/glx_api.c
index 7e86e68b68..971b6e71cb 100644
--- a/src/gallium/state_trackers/glx/xlib/glx_api.c
+++ b/src/gallium/state_trackers/glx/xlib/glx_api.c
@@ -447,12 +447,12 @@ get_env_visual(Display *dpy, int scr, const char *varname)
 
    sscanf( value, "%s %d", type, &depth );
 
-   if (_mesa_strcmp(type,"TrueColor")==0)          xclass = TrueColor;
-   else if (_mesa_strcmp(type,"DirectColor")==0)   xclass = DirectColor;
-   else if (_mesa_strcmp(type,"PseudoColor")==0)   xclass = PseudoColor;
-   else if (_mesa_strcmp(type,"StaticColor")==0)   xclass = StaticColor;
-   else if (_mesa_strcmp(type,"GrayScale")==0)     xclass = GrayScale;
-   else if (_mesa_strcmp(type,"StaticGray")==0)    xclass = StaticGray;
+   if (strcmp(type,"TrueColor")==0)          xclass = TrueColor;
+   else if (strcmp(type,"DirectColor")==0)   xclass = DirectColor;
+   else if (strcmp(type,"PseudoColor")==0)   xclass = PseudoColor;
+   else if (strcmp(type,"StaticColor")==0)   xclass = StaticColor;
+   else if (strcmp(type,"GrayScale")==0)     xclass = GrayScale;
+   else if (strcmp(type,"StaticGray")==0)    xclass = StaticGray;
 
    if (xclass>-1 && depth>0) {
       vis = get_visual( dpy, scr, depth, xclass );
diff --git a/src/mesa/drivers/fbdev/glfbdev.c b/src/mesa/drivers/fbdev/glfbdev.c
index 1a56b2395f..51bd23575f 100644
--- a/src/mesa/drivers/fbdev/glfbdev.c
+++ b/src/mesa/drivers/fbdev/glfbdev.c
@@ -330,7 +330,7 @@ glFBDevGetProcAddress( const char *procName )
    };
    const struct name_address *entry;
    for (entry = functions; entry->name; entry++) {
-      if (_mesa_strcmp(entry->name, procName) == 0) {
+      if (strcmp(entry->name, procName) == 0) {
          return entry->func;
       }
    }
diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c
index bac8a9ef14..1c469b15bf 100644
--- a/src/mesa/drivers/osmesa/osmesa.c
+++ b/src/mesa/drivers/osmesa/osmesa.c
@@ -1579,7 +1579,7 @@ OSMesaGetProcAddress( const char *funcName )
 {
    int i;
    for (i = 0; functions[i].Name; i++) {
-      if (_mesa_strcmp(functions[i].Name, funcName) == 0)
+      if (strcmp(functions[i].Name, funcName) == 0)
          return functions[i].Function;
    }
    return _glapi_get_proc_address(funcName);
diff --git a/src/mesa/drivers/windows/gdi/mesa.def b/src/mesa/drivers/windows/gdi/mesa.def
index a31dc55e3f..10e4c4a9c7 100644
--- a/src/mesa/drivers/windows/gdi/mesa.def
+++ b/src/mesa/drivers/windows/gdi/mesa.def
@@ -926,7 +926,6 @@ EXPORTS
 	_mesa_store_texsubimage1d
 	_mesa_store_texsubimage2d
 	_mesa_store_texsubimage3d
-	_mesa_strcmp
 	_mesa_test_proxy_teximage
 	_mesa_reference_framebuffer
 	_mesa_update_framebuffer_visual
@@ -966,4 +965,4 @@ EXPORTS
 	_tnl_InvalidateState
 	_tnl_run_pipeline
 	_tnl_program_string
-	_tnl_RasterPos
\ No newline at end of file
+	_tnl_RasterPos
diff --git a/src/mesa/drivers/windows/icd/mesa.def b/src/mesa/drivers/windows/icd/mesa.def
index 25ac08a2f0..c4b9bff30d 100644
--- a/src/mesa/drivers/windows/icd/mesa.def
+++ b/src/mesa/drivers/windows/icd/mesa.def
@@ -72,7 +72,6 @@ EXPORTS
 	_mesa_store_texsubimage1d
 	_mesa_store_texsubimage2d
 	_mesa_store_texsubimage3d
-	_mesa_strcmp
 	_mesa_test_proxy_teximage
 	_mesa_Viewport
 	_mesa_meta_CopyColorSubTable
diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c
index 3b8c41b918..fd6d71317b 100644
--- a/src/mesa/drivers/x11/fakeglx.c
+++ b/src/mesa/drivers/x11/fakeglx.c
@@ -621,12 +621,12 @@ get_env_visual(Display *dpy, int scr, const char *varname)
 
    sscanf( value, "%s %d", type, &depth );
 
-   if (_mesa_strcmp(type,"TrueColor")==0)          xclass = TrueColor;
-   else if (_mesa_strcmp(type,"DirectColor")==0)   xclass = DirectColor;
-   else if (_mesa_strcmp(type,"PseudoColor")==0)   xclass = PseudoColor;
-   else if (_mesa_strcmp(type,"StaticColor")==0)   xclass = StaticColor;
-   else if (_mesa_strcmp(type,"GrayScale")==0)     xclass = GrayScale;
-   else if (_mesa_strcmp(type,"StaticGray")==0)    xclass = StaticGray;
+   if (strcmp(type,"TrueColor")==0)          xclass = TrueColor;
+   else if (strcmp(type,"DirectColor")==0)   xclass = DirectColor;
+   else if (strcmp(type,"PseudoColor")==0)   xclass = PseudoColor;
+   else if (strcmp(type,"StaticColor")==0)   xclass = StaticColor;
+   else if (strcmp(type,"GrayScale")==0)     xclass = GrayScale;
+   else if (strcmp(type,"StaticGray")==0)    xclass = StaticGray;
 
    if (xclass>-1 && depth>0) {
       vis = get_visual( dpy, scr, depth, xclass );
diff --git a/src/mesa/glapi/gl_enums.py b/src/mesa/glapi/gl_enums.py
index acaa06ab37..adb0ca526c 100644
--- a/src/mesa/glapi/gl_enums.py
+++ b/src/mesa/glapi/gl_enums.py
@@ -70,7 +70,7 @@ typedef int (*cfunc)(const void *, const void *);
  */
 static int compar_name( const char *a, const enum_elt *b )
 {
-   return _mesa_strcmp( a, & enum_string_table[ b->offset ] );
+   return strcmp( a, & enum_string_table[ b->offset ] );
 }
 
 /**
diff --git a/src/mesa/glapi/mesadef.py b/src/mesa/glapi/mesadef.py
index 342c9cde46..8df04143f3 100644
--- a/src/mesa/glapi/mesadef.py
+++ b/src/mesa/glapi/mesadef.py
@@ -152,7 +152,6 @@ def PrintTail():
 	print '\t_mesa_store_texsubimage1d'
 	print '\t_mesa_store_texsubimage2d'
 	print '\t_mesa_store_texsubimage3d'
-	print '\t_mesa_strcmp'
 	print '\t_mesa_test_proxy_teximage'
 	print '\t_mesa_Viewport'
 	print '\t_mesa_meta_CopyColorSubTable'
diff --git a/src/mesa/main/enums.c b/src/mesa/main/enums.c
index 1d495b7ae5..fc7f8beb50 100644
--- a/src/mesa/main/enums.c
+++ b/src/mesa/main/enums.c
@@ -5181,7 +5181,7 @@ typedef int (*cfunc)(const void *, const void *);
  */
 static int compar_name( const char *a, const enum_elt *b )
 {
-   return _mesa_strcmp( a, & enum_string_table[ b->offset ] );
+   return strcmp( a, & enum_string_table[ b->offset ] );
 }
 
 /**
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 6449f39c7f..9b0b5f06fc 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -498,7 +498,7 @@ set_extension( GLcontext *ctx, const char *name, GLboolean state )
    }
 
    for (i = 0 ; i < Elements(default_extensions) ; i++) {
-      if (_mesa_strcmp(default_extensions[i].name, name) == 0) {
+      if (strcmp(default_extensions[i].name, name) == 0) {
          if (default_extensions[i].flag_offset) {
             GLboolean *enabled = base + default_extensions[i].flag_offset;
             *enabled = state;
@@ -560,7 +560,7 @@ _mesa_extension_is_enabled( GLcontext *ctx, const char *name )
    GLuint i;
 
    for (i = 0 ; i < Elements(default_extensions) ; i++) {
-      if (_mesa_strcmp(default_extensions[i].name, name) == 0) {
+      if (strcmp(default_extensions[i].name, name) == 0) {
          return extension_enabled(ctx, i);
       }
    }
diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index dc24ea0740..a48f05c536 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 strcmp() */
-int
-_mesa_strcmp( const char *s1, const char *s2 )
-{
-   return strcmp(s1, s2);
-}
-
 /** Wrapper around strncmp() */
 int
 _mesa_strncmp( const char *s1, const char *s2, size_t n )
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index f66cf0d6f9..867bce763c 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 int
-_mesa_strcmp( const char *s1, const char *s2 );
-
-extern int
 _mesa_strncmp( const char *s1, const char *s2, size_t n );
 
 extern char *
diff --git a/src/mesa/shader/nvfragparse.c b/src/mesa/shader/nvfragparse.c
index b219dfa6e7..661e7a2a7e 100644
--- a/src/mesa/shader/nvfragparse.c
+++ b/src/mesa/shader/nvfragparse.c
@@ -802,7 +802,7 @@ Parse_FragReg(struct parse_state *parseState, GLint *tempRegNum)
       RETURN_ERROR;
    }
    for (j = 0; InputRegisters[j]; j++) {
-      if (_mesa_strcmp((const char *) token, InputRegisters[j]) == 0) {
+      if (strcmp((const char *) token, InputRegisters[j]) == 0) {
          *tempRegNum = j;
          parseState->inputsRead |= (1 << j);
          break;
@@ -835,13 +835,13 @@ Parse_OutputReg(struct parse_state *parseState, GLint *outputRegNum)
       RETURN_ERROR;
 
    /* try to match an output register name */
-   if (_mesa_strcmp((char *) token, "COLR") == 0 ||
-       _mesa_strcmp((char *) token, "COLH") == 0) {
+   if (strcmp((char *) token, "COLR") == 0 ||
+       strcmp((char *) token, "COLH") == 0) {
       /* note that we don't distinguish between COLR and COLH */
       *outputRegNum = FRAG_RESULT_COLOR;
       parseState->outputsWritten |= (1 << FRAG_RESULT_COLOR);
    }
-   else if (_mesa_strcmp((char *) token, "DEPR") == 0) {
+   else if (strcmp((char *) token, "DEPR") == 0) {
       *outputRegNum = FRAG_RESULT_DEPTH;
       parseState->outputsWritten |= (1 << FRAG_RESULT_DEPTH);
    }
@@ -868,8 +868,8 @@ Parse_MaskedDstReg(struct parse_state *parseState,
    if (!Peek_Token(parseState, token))
       RETURN_ERROR;
 
-   if (_mesa_strcmp((const char *) token, "RC") == 0 ||
-       _mesa_strcmp((const char *) token, "HC") == 0) {
+   if (strcmp((const char *) token, "RC") == 0 ||
+       strcmp((const char *) token, "HC") == 0) {
       /* a write-only register */
       dstReg->File = PROGRAM_WRITE_ONLY;
       if (!Parse_DummyReg(parseState, &idx))
diff --git a/src/mesa/shader/nvvertparse.c b/src/mesa/shader/nvvertparse.c
index 90f795ab16..a983c3ddcf 100644
--- a/src/mesa/shader/nvvertparse.c
+++ b/src/mesa/shader/nvvertparse.c
@@ -403,7 +403,7 @@ Parse_ParamReg(struct parse_state *parseState, struct prog_src_register *srcReg)
       srcReg->File = PROGRAM_ENV_PARAM;
       srcReg->Index = reg;
    }
-   else if (_mesa_strcmp((const char *) token, "A0") == 0) {
+   else if (strcmp((const char *) token, "A0") == 0) {
       /* address register "A0.x" */
       if (!Parse_AddrReg(parseState))
          RETURN_ERROR;
@@ -487,7 +487,7 @@ Parse_AttribReg(struct parse_state *parseState, GLint *tempRegNum)
    }
    else {
       for (j = 0; InputRegisters[j]; j++) {
-         if (_mesa_strcmp((const char *) token, InputRegisters[j]) == 0) {
+         if (strcmp((const char *) token, InputRegisters[j]) == 0) {
             *tempRegNum = j;
             break;
          }
@@ -531,7 +531,7 @@ Parse_OutputReg(struct parse_state *parseState, GLint *outputRegNum)
 
    /* try to match an output register name */
    for (j = start; OutputRegisters[j]; j++) {
-      if (_mesa_strcmp((const char *) token, OutputRegisters[j]) == 0) {
+      if (strcmp((const char *) token, OutputRegisters[j]) == 0) {
          *outputRegNum = j;
          break;
       }
diff --git a/src/mesa/shader/prog_parameter.c b/src/mesa/shader/prog_parameter.c
index 0c52c254b5..b0ccf7bd8a 100644
--- a/src/mesa/shader/prog_parameter.c
+++ b/src/mesa/shader/prog_parameter.c
@@ -215,7 +215,7 @@ _mesa_add_named_constant(struct gl_program_parameter_list *paramList,
           pvals[1] == values[1] &&
           pvals[2] == values[2] &&
           pvals[3] == values[3] &&
-          _mesa_strcmp(paramList->Parameters[pos].Name, name) == 0) {
+          strcmp(paramList->Parameters[pos].Name, name) == 0) {
          /* Same name and value is already in the param list - reuse it */
          return pos;
       }
@@ -325,7 +325,7 @@ _mesa_use_uniform(struct gl_program_parameter_list *paramList,
    for (i = 0; i < paramList->NumParameters; i++) {
       struct gl_program_parameter *p = paramList->Parameters + i;
       if ((p->Type == PROGRAM_UNIFORM || p->Type == PROGRAM_SAMPLER) &&
-          _mesa_strcmp(p->Name, name) == 0) {
+          strcmp(p->Name, name) == 0) {
          p->Used = GL_TRUE;
          /* Note that large uniforms may occupy several slots so we're
           * not done searching yet.
@@ -529,7 +529,7 @@ _mesa_lookup_parameter_index(const struct gl_program_parameter_list *paramList,
       /* name is null-terminated */
       for (i = 0; i < (GLint) paramList->NumParameters; i++) {
          if (paramList->Parameters[i].Name &&
-	     _mesa_strcmp(paramList->Parameters[i].Name, name) == 0)
+	     strcmp(paramList->Parameters[i].Name, name) == 0)
             return i;
       }
    }
diff --git a/src/mesa/shader/prog_uniform.c b/src/mesa/shader/prog_uniform.c
index cdfe158deb..a831ce8cb6 100644
--- a/src/mesa/shader/prog_uniform.c
+++ b/src/mesa/shader/prog_uniform.c
@@ -128,7 +128,7 @@ _mesa_lookup_uniform(const struct gl_uniform_list *list, const char *name)
 {
    GLuint i;
    for (i = 0; list && i < list->NumUniforms; i++) {
-      if (!_mesa_strcmp(list->Uniforms[i].Name, name)) {
+      if (!strcmp(list->Uniforms[i].Name, name)) {
          return i;
       }
    }
diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/shader/slang/slang_codegen.c
index fe4bddf9ad..2280ceb9ee 100644
--- a/src/mesa/shader/slang/slang_codegen.c
+++ b/src/mesa/shader/slang/slang_codegen.c
@@ -1020,7 +1020,7 @@ slang_substitute(slang_assemble_ctx *A, slang_operation *oper,
 	 GLuint i;
          v = _slang_variable_locate(oper->locals, id, GL_TRUE);
 	 if (!v) {
-            if (_mesa_strcmp((char *) oper->a_id, "__notRetFlag"))
+            if (strcmp((char *) oper->a_id, "__notRetFlag"))
                _mesa_problem(NULL, "var %s not found!\n", (char *) oper->a_id);
             return;
 	 }
@@ -1658,7 +1658,7 @@ slang_find_asm_info(const char *name)
 {
    GLuint i;
    for (i = 0; AsmInfo[i].Name; i++) {
-      if (_mesa_strcmp(AsmInfo[i].Name, name) == 0) {
+      if (strcmp(AsmInfo[i].Name, name) == 0) {
          return AsmInfo + i;
       }
    }
@@ -2317,7 +2317,7 @@ _slang_is_vec_mat_type(const char *name)
    };
    int i;
    for (i = 0; vecmat_types[i]; i++)
-      if (_mesa_strcmp(name, vecmat_types[i]) == 0)
+      if (strcmp(name, vecmat_types[i]) == 0)
          return GL_TRUE;
    return GL_FALSE;
 }
@@ -5224,7 +5224,7 @@ _slang_codegen_function(slang_assemble_ctx * A, slang_function * fun)
    slang_ir_node *n;
    GLboolean success = GL_TRUE;
 
-   if (_mesa_strcmp((char *) fun->header.a_name, "main") != 0) {
+   if (strcmp((char *) fun->header.a_name, "main") != 0) {
       /* we only really generate code for main, all other functions get
        * inlined or codegen'd upon an actual call.
        */
diff --git a/src/mesa/shader/slang/slang_compile.c b/src/mesa/shader/slang/slang_compile.c
index 65842ac0c8..1a2c39104b 100644
--- a/src/mesa/shader/slang/slang_compile.c
+++ b/src/mesa/shader/slang/slang_compile.c
@@ -2563,8 +2563,7 @@ parse_code_unit(slang_parse_ctx * C, slang_code_unit * unit,
          {
             slang_function *func;
             success = parse_function(C, &o, 1, &func);
-            if (success &&
-                _mesa_strcmp((char *) func->header.a_name, "main") == 0) {
+            if (success && strcmp((char *) func->header.a_name, "main") == 0) {
                /* found main() */
                mainFunc = func;
             }
diff --git a/src/mesa/shader/slang/slang_print.c b/src/mesa/shader/slang/slang_print.c
index 98c7877534..6efc5b7826 100644
--- a/src/mesa/shader/slang/slang_print.c
+++ b/src/mesa/shader/slang/slang_print.c
@@ -698,7 +698,7 @@ slang_print_function(const slang_function *f, GLboolean body)
    GLuint i;
 
 #if 0
-   if (_mesa_strcmp((char *) f->header.a_name, "main") != 0)
+   if (strcmp((char *) f->header.a_name, "main") != 0)
      return;
 #endif
 
diff --git a/src/mesa/shader/slang/slang_utility.h b/src/mesa/shader/slang/slang_utility.h
index 10071f2c17..2c0d0bcbb2 100644
--- a/src/mesa/shader/slang/slang_utility.h
+++ b/src/mesa/shader/slang/slang_utility.h
@@ -32,7 +32,7 @@
 #define static_assert(expr) do { int _array[(expr) ? 1 : -1]; (void) _array[0]; } while (0)
 
 
-#define slang_string_compare(str1, str2) _mesa_strcmp (str1, str2)
+#define slang_string_compare(str1, str2) strcmp (str1, str2)
 #define slang_string_copy(dst, src) strcpy (dst, src)
 #define slang_string_length(str) strlen (str)