From 5eee517dae62b3a4ef81aa9536272ff5a7e98d2f Mon Sep 17 00:00:00 2001 From: Michael Snyder Date: Sat, 26 Feb 2011 23:34:44 +0000 Subject: [PATCH] 2011-02-26 Michael Snyder * linux-low.c (linux_nat_xfer_osdata): Rename local variable so that it does not shadow a function parameter. --- gdb/ChangeLog | 3 +++ gdb/linux-nat.c | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a28925e82a8..828994e8587 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,8 @@ 2011-02-26 Michael Snyder + * 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 cd88df8a2a9..bb0dd18d12f 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, -- 2.30.2