From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH 03/20] Move "fullname" to tui_source_window
Date: Tue, 10 Sep 2019 19:09:00 -0000 [thread overview]
Message-ID: <20190910190857.6562-4-tom@tromey.com> (raw)
In-Reply-To: <20190910190857.6562-1-tom@tromey.com>
The "fullname" field in tui_source_window_base is only used by one
subclass. This patch moves the field to that subclass, and changes it
to be a unique_xmalloc_ptr.
gdb/ChangeLog
2019-09-10 Tom Tromey <tom@tromey.com>
* tui/tui-winsource.h (struct tui_source_window_base)
<~tui_source_window_base>: Don't declare.
<fullname>: Remove.
* tui/tui-winsource.c (~tui_source_window_base): Remove.
* tui/tui-source.h (struct tui_source_window) <fullname>: New
member.
* tui/tui-source.c (tui_source_window::set_contents): Update.
(tui_source_window::location_matches_p)
(tui_source_window::maybe_update): Update.
---
gdb/ChangeLog | 12 ++++++++++++
gdb/tui/tui-source.c | 7 +++----
gdb/tui/tui-source.h | 3 +++
gdb/tui/tui-winsource.c | 5 -----
gdb/tui/tui-winsource.h | 5 +----
5 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/gdb/tui/tui-source.c b/gdb/tui/tui-source.c
index c379173018d..f70e053bdb5 100644
--- a/gdb/tui/tui-source.c
+++ b/gdb/tui/tui-source.c
@@ -155,8 +155,7 @@ tui_source_window::set_contents (struct gdbarch *arch,
title = s_filename;
- xfree (fullname);
- fullname = xstrdup (symtab_to_fullname (s));
+ fullname = make_unique_xstrdup (symtab_to_fullname (s));
cur_line = 0;
gdbarch = get_objfile_arch (SYMTAB_OBJFILE (s));
@@ -276,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,
+ && filename_cmp (fullname.get (),
symtab_to_fullname (loc->symtab)) == 0);
}
@@ -308,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));
+ && showing_source_p (fullname.get ()));
struct tui_line_or_address l;
diff --git a/gdb/tui/tui-source.h b/gdb/tui/tui-source.h
index a7002123c97..30728e4214e 100644
--- a/gdb/tui/tui-source.h
+++ b/gdb/tui/tui-source.h
@@ -76,6 +76,9 @@ private:
in the current source window. */
bool line_is_displayed (int line) const;
+ /* It is the resolved form as returned by symtab_to_fullname. */
+ gdb::unique_xmalloc_ptr<char> fullname;
+
/* A token used to register and unregister an observer. */
gdb::observers::token m_observable;
};
diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c
index d5281193c0e..8b507ed9126 100644
--- a/gdb/tui/tui-winsource.c
+++ b/gdb/tui/tui-winsource.c
@@ -261,11 +261,6 @@ tui_source_window_base::tui_source_window_base (enum tui_win_type type)
}
-tui_source_window_base::~tui_source_window_base ()
-{
- xfree (fullname);
-}
-
/* See tui-data.h. */
void
diff --git a/gdb/tui/tui-winsource.h b/gdb/tui/tui-winsource.h
index 64f0739e536..eca0bde4bb8 100644
--- a/gdb/tui/tui-winsource.h
+++ b/gdb/tui/tui-winsource.h
@@ -78,7 +78,7 @@ struct tui_source_window_base : public tui_win_info
{
protected:
explicit tui_source_window_base (enum tui_win_type type);
- ~tui_source_window_base () override;
+
DISABLE_COPY_AND_ASSIGN (tui_source_window_base);
void do_scroll_horizontal (int num_to_scroll) override;
@@ -137,9 +137,6 @@ public:
int horizontal_offset = 0;
struct tui_line_or_address start_line_or_addr;
- /* It is the resolved form as returned by symtab_to_fullname. */
- char *fullname = nullptr;
-
/* Architecture associated with code at this location. */
struct gdbarch *gdbarch = nullptr;
--
2.17.2
next prev parent reply other threads:[~2019-09-10 19:09 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-10 19:09 [PATCH 00/20] Final round of TUI refactorings Tom Tromey
2019-09-10 19:09 ` [PATCH 09/20] Use "bool" in tui_data_window::show_register_group Tom Tromey
2019-09-10 19:09 ` [PATCH 14/20] Change members of tui_locator_window to std::string Tom Tromey
2019-09-10 19:09 ` [PATCH 02/20] Change tui_source_element::line to be a unique_xmalloc_ptr Tom Tromey
2019-09-10 19:09 ` [PATCH 04/20] Change tui_make_status_line to return std::string Tom Tromey
2019-09-10 19:09 ` [PATCH 19/20] Use make_unique_xstrdup in TUI Tom Tromey
2019-09-10 19:09 ` [PATCH 10/20] Change "win_resized" to bool Tom Tromey
2019-09-10 19:09 ` [PATCH 17/20] Remove strcat_to_buf Tom Tromey
2019-09-10 19:09 ` [PATCH 18/20] Remove separator comments from TUI Tom Tromey
2019-09-10 19:09 ` [PATCH 13/20] Remove a call to tui_locator_win_info_ptr Tom Tromey
2019-09-10 19:09 ` [PATCH 15/20] Rename private data members of tui_data_window Tom Tromey
2019-09-10 19:09 ` [PATCH 16/20] Rename a private data member in tui_source_window Tom Tromey
2019-09-10 19:09 ` [PATCH 12/20] Don't call refresh in tui_resize_all Tom Tromey
2019-09-10 19:09 ` [PATCH 01/20] Remove tui_clear_source_windows_detail Tom Tromey
2019-09-10 19:09 ` [PATCH 08/20] Simplify TUI disassembly Tom Tromey
2019-09-10 19:09 ` [PATCH 11/20] Set TUI locator height to 1 Tom Tromey
2019-09-10 19:09 ` [PATCH 06/20] Remove some explicit re-rendering from the TUI Tom Tromey
2019-09-10 19:09 ` [PATCH 07/20] Simplify tui_source_window_base::show_source_content Tom Tromey
2019-09-10 19:09 ` Tom Tromey [this message]
2019-09-10 19:09 ` [PATCH 20/20] Change TUI window commands to be case-sensitive Tom Tromey
2019-09-11 2:34 ` Eli Zaretskii
2019-09-11 21:57 ` Tom Tromey
2019-09-12 3:29 ` Eli Zaretskii
2019-09-10 19:09 ` [PATCH 05/20] Change tui_make_status_line to be a method Tom Tromey
2019-09-20 19:29 ` [PATCH 00/20] Final round of TUI refactorings Tom Tromey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190910190857.6562-4-tom@tromey.com \
--to=tom@tromey.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).