commit 6a769d97e3ad0c5275f918b9f36519d6c0254da3
author Brian Paul <brian.paul@tungstengraphics.com> Fri Apr 28 15:42:15 2006 +0000
committer Brian Paul <brian.paul@tungstengraphics.com> Fri Apr 28 15:42:15 2006 +0000
tree 7515c441cde6f3fbd1ab9d733c1bcf71531dc13d
parent 49a80ca2bcca1c1d9c341c332c5a4b07b6b3b2fd

fix second memory leak (bug 5557)

src/mesa/shader/arbprogparse.c

diff --git a/src/mesa/shader/arbprogparse.c b/src/mesa/shader/arbprogparse.c
index b52525e..b596b79 100644
--- a/src/mesa/shader/arbprogparse.c
+++ b/src/mesa/shader/arbprogparse.c
@@ -518,7 +518,7 @@
  */
 struct var_cache
 {
-   GLubyte *name;
+   const GLubyte *name;         /* don't free() - no need */
    var_type type;
    GLuint address_binding;      /* The index of the address register we should
                                  * be using                                        */
@@ -641,7 +641,7 @@
 
    *found = 0;
    var_cache_create (&va);
-   va->name = i;
+   va->name = (const GLubyte *) i;
 
    var_cache_append (vc_head, va);
 
@@ -828,6 +828,7 @@
 parse_relative_offset (GLcontext *ctx, GLubyte **inst, struct arb_program *Program,
                         GLint *offset)
 {
+   (void) ctx;
    *offset = parse_integer(inst, Program);
    return 0;
 }
@@ -1936,7 +1937,7 @@
 
    /* First, insert a dummy entry into the var_cache */
    var_cache_create (&param_var);
-   param_var->name = (GLubyte *) _mesa_strdup (" ");
+   param_var->name = (const GLubyte *) " ";
    param_var->type = vt_param;
 
    param_var->param_binding_length = 0;
@@ -2466,7 +2467,7 @@
           */
          var_cache_create(&src);
          src->type = vt_attrib;
-         src->name = (GLubyte *)_mesa_strdup("Dummy Attrib Variable");
+         src->name = (const GLubyte *) "Dummy Attrib Variable";
          src->attrib_binding = binding;
          src->attrib_is_generic = is_generic;
          var_cache_append(vc_head, src);