diff options
| -rw-r--r-- | gdb/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/tui/tui-source.c | 6 | ||||
| -rw-r--r-- | gdb/tui/tui-source.h | 2 |
3 files changed, 12 insertions, 4 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 96bf005..3b2fdd2 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,13 @@ 2019-09-20 Tom Tromey <tom@tromey.com> + * tui/tui-source.h (struct tui_source_window) <m_fullname>: Rename + from "fullname". + * tui/tui-source.c (tui_source_window::set_contents) + (tui_source_window::location_matches_p) + (tui_source_window::maybe_update): Update. + +2019-09-20 Tom Tromey <tom@tromey.com> + * tui/tui-regs.h (struct tui_data_window) <get_current_group>: Update. <m_regs_content, m_regs_column_count, m_current_group>: Add "m_" diff --git a/gdb/tui/tui-source.c b/gdb/tui/tui-source.c index e6cc0db..fa6ed78 100644 --- a/gdb/tui/tui-source.c +++ b/gdb/tui/tui-source.c @@ -155,7 +155,7 @@ tui_source_window::set_contents (struct gdbarch *arch, title = s_filename; - fullname = make_unique_xstrdup (symtab_to_fullname (s)); + m_fullname = make_unique_xstrdup (symtab_to_fullname (s)); cur_line = 0; gdbarch = get_objfile_arch (SYMTAB_OBJFILE (s)); @@ -275,7 +275,7 @@ tui_source_window::location_matches_p (struct bp_location *loc, int line_no) return (content[line_no].line_or_addr.loa == LOA_LINE && content[line_no].line_or_addr.u.line_no == loc->line_number && loc->symtab != NULL - && filename_cmp (fullname.get (), + && filename_cmp (m_fullname.get (), symtab_to_fullname (loc->symtab)) == 0); } @@ -307,7 +307,7 @@ tui_source_window::maybe_update (struct frame_info *fi, symtab_and_line sal, start_line = 1; bool source_already_displayed = (sal.symtab != 0 - && showing_source_p (fullname.get ())); + && showing_source_p (m_fullname.get ())); struct tui_line_or_address l; diff --git a/gdb/tui/tui-source.h b/gdb/tui/tui-source.h index 30728e4..3ef737c 100644 --- a/gdb/tui/tui-source.h +++ b/gdb/tui/tui-source.h @@ -77,7 +77,7 @@ private: bool line_is_displayed (int line) const; /* It is the resolved form as returned by symtab_to_fullname. */ - gdb::unique_xmalloc_ptr<char> fullname; + gdb::unique_xmalloc_ptr<char> m_fullname; /* A token used to register and unregister an observer. */ gdb::observers::token m_observable; |