From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [RFA 8/8] Use std::string in info_symbol_command
Date: Sun, 01 Oct 2017 04:06:00 -0000 [thread overview]
Message-ID: <20171001040643.25162-9-tom@tromey.com> (raw)
In-Reply-To: <20171001040643.25162-1-tom@tromey.com>
This removes a cleanup by using std::string in info_symbol_command.
2017-09-30 Tom Tromey <tom@tromey.com>
* printcmd.c (info_symbol_command): Use std::string.
---
gdb/ChangeLog | 4 ++++
gdb/printcmd.c | 16 +++++++---------
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 293c796..20fa08c 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@
2017-09-30 Tom Tromey <tom@tromey.com>
+ * printcmd.c (info_symbol_command): Use std::string.
+
+2017-09-30 Tom Tromey <tom@tromey.com>
+
* top.c (gdb_safe_append_history): Use std::string.
2017-09-30 Tom Tromey <tom@tromey.com>
diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index a254e3a..994259d 100644
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -1314,7 +1314,7 @@ info_symbol_command (char *arg, int from_tty)
= lookup_minimal_symbol_by_pc_section (sect_addr, osect).minsym))
{
const char *obj_name, *mapped, *sec_name, *msym_name;
- char *loc_string;
+ const char *loc_string;
struct cleanup *old_chain;
matches = 1;
@@ -1325,14 +1325,14 @@ info_symbol_command (char *arg, int from_tty)
/* Don't print the offset if it is zero.
We assume there's no need to handle i18n of "sym + offset". */
+ std::string string_holder;
if (offset)
- loc_string = xstrprintf ("%s + %u", msym_name, offset);
+ {
+ string_holder = string_printf ("%s + %u", msym_name, offset);
+ loc_string = string_holder.c_str ();
+ }
else
- loc_string = xstrprintf ("%s", msym_name);
-
- /* Use a cleanup to free loc_string in case the user quits
- a pagination request inside printf_filtered. */
- old_chain = make_cleanup (xfree, loc_string);
+ loc_string = msym_name;
gdb_assert (osect->objfile && objfile_name (osect->objfile));
obj_name = objfile_name (osect->objfile);
@@ -1370,8 +1370,6 @@ info_symbol_command (char *arg, int from_tty)
else
printf_filtered (_("%s in section %s\n"),
loc_string, sec_name);
-
- do_cleanups (old_chain);
}
}
if (matches == 0)
--
2.9.5
next prev parent reply other threads:[~2017-10-01 4:06 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-01 4:06 [RFA 0/8] more cleanup removal Tom Tromey
2017-10-01 4:06 ` Tom Tromey [this message]
2017-10-01 4:06 ` [RFA 4/8] Remove unused declarations Tom Tromey
2017-10-01 4:06 ` [RFA 6/8] Remove make_delete_ui_cleanup Tom Tromey
2017-10-01 4:07 ` [RFA 5/8] Use gdb::byte_vector in load_progress Tom Tromey
2017-10-01 4:07 ` [RFA 3/8] Use std::string in utils.c Tom Tromey
2017-10-03 10:50 ` Pedro Alves
2017-10-03 11:26 ` Tom Tromey
2017-10-01 4:07 ` [RFA 1/8] Change record_full_gdb_operation_disable_set not to return a cleanup Tom Tromey
2017-10-01 4:07 ` [RFA 7/8] Use std::string in gdb_safe_append_history Tom Tromey
2017-10-01 4:07 ` [RFA 2/8] Remove set_batch_flag_and_make_cleanup_restore_page_info Tom Tromey
2017-10-03 10:55 ` [RFA 0/8] more cleanup removal Pedro Alves
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=20171001040643.25162-9-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