diff options
| author | Andrey Smirnov <ndreys@sourceware.org> | 2011-12-10 00:15:54 +0000 |
|---|---|---|
| committer | Andrey Smirnov <ndreys@sourceware.org> | 2011-12-10 00:15:54 +0000 |
| commit | 80e1d41794eebaa2e094a05a654f3a98367cf0f4 (patch) | |
| tree | f68c2aadc56fc7eb44b71341d784cdeefe5b5085 /gdb | |
| parent | 20d6b87c2b1c6e532efd2b6acbd29ce5220c98a2 (diff) | |
| download | gdb-80e1d41794eebaa2e094a05a654f3a98367cf0f4.zip gdb-80e1d41794eebaa2e094a05a654f3a98367cf0f4.tar.gz gdb-80e1d41794eebaa2e094a05a654f3a98367cf0f4.tar.bz2 | |
* breakpoint.c (update_static_tracepoint): Rename nested `sal' and
`marker' variables to `sal2' and `tpmarker' respectively
(-Wshadow).
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/breakpoint.c | 30 |
2 files changed, 21 insertions, 15 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 6505699..20feacf 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2011-12-09 Andrey Smirnov <andrew.smirnov@gmail.com> + + * breakpoint.c (update_static_tracepoint): Rename nested `sal' and + `marker' variables to `sal2' and `tpmarker' respectively + (-Wshadow). + 2011-12-09 Andrew Pinski <apinski@cavium.com> * linespec.c (hash_address_entry): Use iterative_hash_object on each diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 6f4f2d6..0f25ce1 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -11614,26 +11614,26 @@ update_static_tracepoint (struct breakpoint *b, struct symtab_and_line sal) if (!VEC_empty(static_tracepoint_marker_p, markers)) { - struct symtab_and_line sal; + struct symtab_and_line sal2; struct symbol *sym; - struct static_tracepoint_marker *marker; + struct static_tracepoint_marker *tpmarker; struct ui_out *uiout = current_uiout; - marker = VEC_index (static_tracepoint_marker_p, markers, 0); + tpmarker = VEC_index (static_tracepoint_marker_p, markers, 0); xfree (tp->static_trace_marker_id); - tp->static_trace_marker_id = xstrdup (marker->str_id); + tp->static_trace_marker_id = xstrdup (tpmarker->str_id); warning (_("marker for static tracepoint %d (%s) not " "found at previous line number"), b->number, tp->static_trace_marker_id); - init_sal (&sal); + init_sal (&sal2); - sal.pc = marker->address; + sal2.pc = tpmarker->address; - sal = find_pc_line (marker->address, 0); - sym = find_pc_sect_function (marker->address, NULL); + sal2 = find_pc_line (tpmarker->address, 0); + sym = find_pc_sect_function (tpmarker->address, NULL); ui_out_text (uiout, "Now in "); if (sym) { @@ -11641,37 +11641,37 @@ update_static_tracepoint (struct breakpoint *b, struct symtab_and_line sal) SYMBOL_PRINT_NAME (sym)); ui_out_text (uiout, " at "); } - ui_out_field_string (uiout, "file", sal.symtab->filename); + ui_out_field_string (uiout, "file", sal2.symtab->filename); ui_out_text (uiout, ":"); if (ui_out_is_mi_like_p (uiout)) { - char *fullname = symtab_to_fullname (sal.symtab); + char *fullname = symtab_to_fullname (sal2.symtab); if (fullname) ui_out_field_string (uiout, "fullname", fullname); } - ui_out_field_int (uiout, "line", sal.line); + ui_out_field_int (uiout, "line", sal2.line); ui_out_text (uiout, "\n"); - b->loc->line_number = sal.line; + b->loc->line_number = sal2.line; xfree (b->loc->source_file); if (sym) - b->loc->source_file = xstrdup (sal.symtab->filename); + b->loc->source_file = xstrdup (sal2.symtab->filename); else b->loc->source_file = NULL; xfree (b->addr_string); b->addr_string = xstrprintf ("%s:%d", - sal.symtab->filename, + sal2.symtab->filename, b->loc->line_number); /* Might be nice to check if function changed, and warn if so. */ - release_static_tracepoint_marker (marker); + release_static_tracepoint_marker (tpmarker); } } return sal; |