aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Snyder <msnyder@vmware.com>2011-02-26 23:34:44 +0000
committerMichael Snyder <msnyder@vmware.com>2011-02-26 23:34:44 +0000
commit5eee517dae62b3a4ef81aa9536272ff5a7e98d2f (patch)
tree601567e2f42f421cc69514b93d88eafa75f28811
parentc24bea2f473f5bb5d6640a1174aaf2bc47c79989 (diff)
downloadfsf-binutils-gdb-5eee517dae62b3a4ef81aa9536272ff5a7e98d2f.zip
fsf-binutils-gdb-5eee517dae62b3a4ef81aa9536272ff5a7e98d2f.tar.gz
fsf-binutils-gdb-5eee517dae62b3a4ef81aa9536272ff5a7e98d2f.tar.bz2
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.
-rw-r--r--gdb/ChangeLog3
-rw-r--r--gdb/linux-nat.c8
2 files changed, 7 insertions, 4 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a28925e..828994e 100644
--- 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 cd88df8..bb0dd18 100644
--- 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,