aboutsummaryrefslogtreecommitdiff
path: root/gdb/nat
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2018-04-21 16:16:27 -0600
committerTom Tromey <tom@tromey.com>2018-10-04 22:51:45 -0600
commitb926417afaea99ed17663e06d6654d0048536017 (patch)
treeb26a979c2f74c28f5c8979f55acfdacefdb18cfb /gdb/nat
parent1f88d0c87c37d3a15fa6376335e8b0d1c79d85aa (diff)
downloadgdb-b926417afaea99ed17663e06d6654d0048536017.zip
gdb-b926417afaea99ed17663e06d6654d0048536017.tar.gz
gdb-b926417afaea99ed17663e06d6654d0048536017.tar.bz2
Simple -Wshadow=local fixes
This fixes all the straightforward -Wshadow=local warnings in gdb. A few standard approaches are used here: * Renaming an inner (or outer, but more commonly inner) variable; * Lowering a declaration to avoid a clash; * Moving a declaration into a more inner scope to avoid a clash, including the special case of moving a declaration into a loop header. I did not consider any of the changes in this patch to be particularly noteworthy, though of course they should all still be examined. gdb/ChangeLog 2018-10-04 Tom Tromey <tom@tromey.com> * ctf.c (SET_ARRAY_FIELD): Rename "u32". * p-valprint.c (pascal_val_print): Split inner "i" variable. * xtensa-tdep.c (xtensa_push_dummy_call): Declare "i" in loop header. * xstormy16-tdep.c (xstormy16_push_dummy_call): Declare "val" in more inner scope. * xcoffread.c (read_xcoff_symtab): Rename inner "symbol". * varobj.c (varobj_update): Rename inner "newobj", "type_changed". * valprint.c (generic_emit_char): Rename inner "buf". * valops.c (find_overload_match): Rename inner "temp". (value_struct_elt_for_reference): Declare "v" in more inner scope. * v850-tdep.c (v850_push_dummy_call): Rename "len". * unittests/array-view-selftests.c (run_tests): Rename inner "vec". * tui/tui-stack.c (tui_show_frame_info): Declare "i" in loop header. * tracepoint.c (merge_uploaded_trace_state_variables): Declare "tsv" in more inner scope. (print_one_static_tracepoint_marker): Rename inner "tuple_emitter". * tic6x-tdep.c (tic6x_analyze_prologue): Declare "inst" lower. (tic6x_push_dummy_call): Don't redeclare "addr". * target-float.c: Declare "dto" lower. * symtab.c (lookup_local_symbol): Rename inner "sym". (find_pc_sect_line): Rename inner "pc". * stack.c (print_frame): Don't redeclare "gdbarch". (return_command): Rename inner "gdbarch". * s390-tdep.c (s390_prologue_frame_unwind_cache): Renam inner "sp". * rust-lang.c (rust_internal_print_type): Declare "i" in loop header. * rs6000-tdep.c (ppc_process_record): Rename inner "addr". * riscv-tdep.c (riscv_push_dummy_call): Declare "info" in inner scope. * remote.c (remote_target::update_thread_list): Don't redeclare "tp". (remote_target::process_initial_stop_replies): Rename inner "thread". (remote_target::remote_parse_stop_reply): Don't redeclare "p". (remote_target::wait_as): Don't redeclare "stop_reply". (remote_target::get_thread_local_address): Rename inner "result". (remote_target::get_tib_address): Likewise.
Diffstat (limited to 'gdb/nat')
-rw-r--r--gdb/nat/linux-osdata.c72
1 files changed, 36 insertions, 36 deletions
diff --git a/gdb/nat/linux-osdata.c b/gdb/nat/linux-osdata.c
index 7d603a6..98bded0 100644
--- a/gdb/nat/linux-osdata.c
+++ b/gdb/nat/linux-osdata.c
@@ -644,7 +644,7 @@ static LONGEST
linux_xfer_osdata_cpus (gdb_byte *readbuf,
ULONGEST offset, ULONGEST len)
{
- static const char *buf;
+ static const char *saved_buf;
static LONGEST len_avail = -1;
static struct buffer buffer;
@@ -655,7 +655,7 @@ linux_xfer_osdata_cpus (gdb_byte *readbuf,
if (len_avail != -1 && len_avail != 0)
buffer_free (&buffer);
len_avail = 0;
- buf = NULL;
+ saved_buf = NULL;
buffer_init (&buffer);
buffer_grow_str (&buffer, "<osdata type=\"cpus\">\n");
@@ -713,22 +713,22 @@ linux_xfer_osdata_cpus (gdb_byte *readbuf,
}
buffer_grow_str0 (&buffer, "</osdata>\n");
- buf = buffer_finish (&buffer);
- len_avail = strlen (buf);
+ saved_buf = buffer_finish (&buffer);
+ len_avail = strlen (saved_buf);
}
if (offset >= len_avail)
{
/* Done. Get rid of the buffer. */
buffer_free (&buffer);
- buf = NULL;
+ saved_buf = NULL;
len_avail = 0;
return 0;
}
if (len > len_avail - offset)
len = len_avail - offset;
- memcpy (readbuf, buf + offset, len);
+ memcpy (readbuf, saved_buf + offset, len);
return len;
}
@@ -741,7 +741,7 @@ linux_xfer_osdata_fds (gdb_byte *readbuf,
ULONGEST offset, ULONGEST len)
{
/* We make the process list snapshot when the object starts to be read. */
- static const char *buf;
+ static const char *saved_buf;
static LONGEST len_avail = -1;
static struct buffer buffer;
@@ -752,7 +752,7 @@ linux_xfer_osdata_fds (gdb_byte *readbuf,
if (len_avail != -1 && len_avail != 0)
buffer_free (&buffer);
len_avail = 0;
- buf = NULL;
+ saved_buf = NULL;
buffer_init (&buffer);
buffer_grow_str (&buffer, "<osdata type=\"files\">\n");
@@ -829,22 +829,22 @@ linux_xfer_osdata_fds (gdb_byte *readbuf,
}
buffer_grow_str0 (&buffer, "</osdata>\n");
- buf = buffer_finish (&buffer);
- len_avail = strlen (buf);
+ saved_buf = buffer_finish (&buffer);
+ len_avail = strlen (saved_buf);
}
if (offset >= len_avail)
{
/* Done. Get rid of the buffer. */
buffer_free (&buffer);
- buf = NULL;
+ saved_buf = NULL;
len_avail = 0;
return 0;
}
if (len > len_avail - offset)
len = len_avail - offset;
- memcpy (readbuf, buf + offset, len);
+ memcpy (readbuf, saved_buf + offset, len);
return len;
}
@@ -1126,7 +1126,7 @@ static LONGEST
linux_xfer_osdata_shm (gdb_byte *readbuf,
ULONGEST offset, ULONGEST len)
{
- static const char *buf;
+ static const char *saved_buf;
static LONGEST len_avail = -1;
static struct buffer buffer;
@@ -1135,7 +1135,7 @@ linux_xfer_osdata_shm (gdb_byte *readbuf,
if (len_avail != -1 && len_avail != 0)
buffer_free (&buffer);
len_avail = 0;
- buf = NULL;
+ saved_buf = NULL;
buffer_init (&buffer);
buffer_grow_str (&buffer, "<osdata type=\"shared memory\">\n");
@@ -1223,22 +1223,22 @@ linux_xfer_osdata_shm (gdb_byte *readbuf,
}
buffer_grow_str0 (&buffer, "</osdata>\n");
- buf = buffer_finish (&buffer);
- len_avail = strlen (buf);
+ saved_buf = buffer_finish (&buffer);
+ len_avail = strlen (saved_buf);
}
if (offset >= len_avail)
{
/* Done. Get rid of the buffer. */
buffer_free (&buffer);
- buf = NULL;
+ saved_buf = NULL;
len_avail = 0;
return 0;
}
if (len > len_avail - offset)
len = len_avail - offset;
- memcpy (readbuf, buf + offset, len);
+ memcpy (readbuf, saved_buf + offset, len);
return len;
}
@@ -1250,7 +1250,7 @@ static LONGEST
linux_xfer_osdata_sem (gdb_byte *readbuf,
ULONGEST offset, ULONGEST len)
{
- static const char *buf;
+ static const char *saved_buf;
static LONGEST len_avail = -1;
static struct buffer buffer;
@@ -1259,7 +1259,7 @@ linux_xfer_osdata_sem (gdb_byte *readbuf,
if (len_avail != -1 && len_avail != 0)
buffer_free (&buffer);
len_avail = 0;
- buf = NULL;
+ saved_buf = NULL;
buffer_init (&buffer);
buffer_grow_str (&buffer, "<osdata type=\"semaphores\">\n");
@@ -1331,22 +1331,22 @@ linux_xfer_osdata_sem (gdb_byte *readbuf,
}
buffer_grow_str0 (&buffer, "</osdata>\n");
- buf = buffer_finish (&buffer);
- len_avail = strlen (buf);
+ saved_buf = buffer_finish (&buffer);
+ len_avail = strlen (saved_buf);
}
if (offset >= len_avail)
{
/* Done. Get rid of the buffer. */
buffer_free (&buffer);
- buf = NULL;
+ saved_buf = NULL;
len_avail = 0;
return 0;
}
if (len > len_avail - offset)
len = len_avail - offset;
- memcpy (readbuf, buf + offset, len);
+ memcpy (readbuf, saved_buf + offset, len);
return len;
}
@@ -1358,7 +1358,7 @@ static LONGEST
linux_xfer_osdata_msg (gdb_byte *readbuf,
ULONGEST offset, ULONGEST len)
{
- static const char *buf;
+ static const char *saved_buf;
static LONGEST len_avail = -1;
static struct buffer buffer;
@@ -1367,7 +1367,7 @@ linux_xfer_osdata_msg (gdb_byte *readbuf,
if (len_avail != -1 && len_avail != 0)
buffer_free (&buffer);
len_avail = 0;
- buf = NULL;
+ saved_buf = NULL;
buffer_init (&buffer);
buffer_grow_str (&buffer, "<osdata type=\"message queues\">\n");
@@ -1453,22 +1453,22 @@ linux_xfer_osdata_msg (gdb_byte *readbuf,
}
buffer_grow_str0 (&buffer, "</osdata>\n");
- buf = buffer_finish (&buffer);
- len_avail = strlen (buf);
+ saved_buf = buffer_finish (&buffer);
+ len_avail = strlen (saved_buf);
}
if (offset >= len_avail)
{
/* Done. Get rid of the buffer. */
buffer_free (&buffer);
- buf = NULL;
+ saved_buf = NULL;
len_avail = 0;
return 0;
}
if (len > len_avail - offset)
len = len_avail - offset;
- memcpy (readbuf, buf + offset, len);
+ memcpy (readbuf, saved_buf + offset, len);
return len;
}
@@ -1480,7 +1480,7 @@ static LONGEST
linux_xfer_osdata_modules (gdb_byte *readbuf,
ULONGEST offset, ULONGEST len)
{
- static const char *buf;
+ static const char *saved_buf;
static LONGEST len_avail = -1;
static struct buffer buffer;
@@ -1489,7 +1489,7 @@ linux_xfer_osdata_modules (gdb_byte *readbuf,
if (len_avail != -1 && len_avail != 0)
buffer_free (&buffer);
len_avail = 0;
- buf = NULL;
+ saved_buf = NULL;
buffer_init (&buffer);
buffer_grow_str (&buffer, "<osdata type=\"modules\">\n");
@@ -1559,22 +1559,22 @@ linux_xfer_osdata_modules (gdb_byte *readbuf,
}
buffer_grow_str0 (&buffer, "</osdata>\n");
- buf = buffer_finish (&buffer);
- len_avail = strlen (buf);
+ saved_buf = buffer_finish (&buffer);
+ len_avail = strlen (saved_buf);
}
if (offset >= len_avail)
{
/* Done. Get rid of the buffer. */
buffer_free (&buffer);
- buf = NULL;
+ saved_buf = NULL;
len_avail = 0;
return 0;
}
if (len > len_avail - offset)
len = len_avail - offset;
- memcpy (readbuf, buf + offset, len);
+ memcpy (readbuf, saved_buf + offset, len);
return len;
}