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

	* linux-low.c (linux_nat_xfer_osdata): Rename local variable so
	that it does not shadow a function parameter.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a28925e82a801ec32b5a201ad9bd105da008070d..828994e8587a8f0bdc3780673db5e8fc1ba78667 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,8 @@
 2011-02-26  Michael Snyder  <msnyder@vmware.com>
 
+       * linux-low.c (linux_nat_xfer_osdata): Rename local variable so
+       that it does not shadow a function parameter.
+
        * i386-nat.c (i386_length_and_rw_bits): Document that case
        statement is meant to fall through.
 

diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
index cd88df8a2a9fa8fad6d45c3efe47ba0a5600836d..bb0dd18d12fd88e99efa30ff3527c37e9ebaa19d 100644 (file)
--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -5145,16 +5145,16 @@ linux_nat_xfer_osdata (struct target_ops *ops, enum target_object object,
 
                  if ((f = fopen (pathname, "r")) != NULL)
                    {
-                     size_t len = fread (cmd, 1, sizeof (cmd) - 1, f);
+                     size_t length = fread (cmd, 1, sizeof (cmd) - 1, f);
 
-                     if (len > 0)
+                     if (length > 0)
                        {
                          int i;
 
-                         for (i = 0; i < len; i++)
+                         for (i = 0; i < length; i++)
                            if (cmd[i] == '\0')
                              cmd[i] = ' ';
-                         cmd[len] = '\0';
+                         cmd[length] = '\0';
 
                          obstack_xml_printf (
                            &obstack,