2011-02-28 Michael Snyder <msnyder@vmware.com>

	* opencl-lang.c (lval_func_check_validity): Rename inner variables.
	(lval_func_check_synthetic_pointer): Ditto.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d8afa4b477bfbfb0595dcf5ee258cab33f32d7be..6768c11ff8c5682a488950ab6c8929dae29d1cbf 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,6 +1,8 @@
 2011-02-28  Michael Snyder  <msnyder@vmware.com>
 
-       * opencl-lang.c (lval_func_free_closure): Fix use-after-free.
+       * opencl-lang.c (lval_func_check_validity): Rename inner variables.
+       (lval_func_check_synthetic_pointer): Ditto.
+       (lval_func_free_closure): Fix use-after-free.
 
 2011-02-28  Tom Tromey  <tromey@redhat.com>
 

diff --git a/gdb/opencl-lang.c b/gdb/opencl-lang.c
index 1004f083a3d4ab1d2642836c203d0a65dc849eae..bbd95f1022b3887bb82457dba545cdca55b14e93 100644 (file)
--- a/gdb/opencl-lang.c
+++ b/gdb/opencl-lang.c
@@ -263,11 +263,11 @@ lval_func_check_validity (const struct value *v, int offset, int length)
 
   for (i = start; i < end; i++)
     {
-      int startoffset = (i == start) ? startrest : 0;
-      int length = (i == end) ? endrest : elsize;
+      int comp_offset = (i == start) ? startrest : 0;
+      int comp_length = (i == end) ? endrest : elsize;
 
-      if (!value_bits_valid (c->val, c->indices[i] * elsize + startoffset,
-                            length))
+      if (!value_bits_valid (c->val, c->indices[i] * elsize + comp_offset,
+                            comp_length))
        return 0;
     }
 
@@ -317,12 +317,12 @@ lval_func_check_synthetic_pointer (const struct value *v,
 
   for (i = start; i < end; i++)
     {
-      int startoffset = (i == start) ? startrest : 0;
-      int length = (i == end) ? endrest : elsize;
+      int comp_offset = (i == start) ? startrest : 0;
+      int comp_length = (i == end) ? endrest : elsize;
 
       if (!value_bits_synthetic_pointer (c->val,
-                                        c->indices[i] * elsize + startoffset,
-                                        length))
+                                        c->indices[i] * elsize + comp_offset,
+                                        comp_length))
        return 0;
     }