From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [RFA 2/6] Remove some cleanups from probe.c
Date: Mon, 16 Oct 2017 03:04:00 -0000 [thread overview]
Message-ID: <20171016030427.21349-3-tom@tromey.com> (raw)
In-Reply-To: <20171016030427.21349-1-tom@tromey.com>
This removes some cleanups from parse_probes by using std::string; and
removes some unnecessary cleanups from elsewhere in probe.c.
ChangeLog
2017-10-15 Tom Tromey <tom@tromey.com>
* probe.c (parse_probes): Use std::string.
(info_probes_for_ops, enable_probes_command)
(disable_probes_command): Remove cleanups.
---
gdb/ChangeLog | 6 ++++++
gdb/probe.c | 24 ++++--------------------
2 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/gdb/probe.c b/gdb/probe.c
index b3dbf896b9..e5a09211cb 100644
--- a/gdb/probe.c
+++ b/gdb/probe.c
@@ -98,7 +98,6 @@ parse_probes (const struct event_location *location,
{
char *arg_end, *arg;
char *objfile_namestr = NULL, *provider = NULL, *name, *p;
- struct cleanup *cleanup;
const struct probe_ops *probe_ops;
const char *arg_start, *cs;
@@ -118,8 +117,8 @@ parse_probes (const struct event_location *location,
arg_end = skip_to_space (arg);
/* We make a copy here so we can write over parts with impunity. */
- arg = savestring (arg, arg_end - arg);
- cleanup = make_cleanup (xfree, arg);
+ std::string copy (arg, arg_end - arg);
+ arg = ©[0];
/* Extract each word from the argument, separated by ":"s. */
p = strchr (arg, ':');
@@ -183,17 +182,12 @@ parse_probes (const struct event_location *location,
if (canonical)
{
- char *canon;
-
- canon = savestring (arg_start, arg_end - arg_start);
- make_cleanup (xfree, canon);
+ std::string canon (arg_start, arg_end - arg_start);
canonical->special_display = 1;
canonical->pre_expanded = 1;
- canonical->location = new_probe_location (canon);
+ canonical->location = new_probe_location (canon.c_str ());
}
- do_cleanups (cleanup);
-
return result;
}
@@ -548,7 +542,6 @@ info_probes_for_ops (const char *arg, int from_tty,
const struct probe_ops *pops)
{
std::string provider, probe_name, objname;
- struct cleanup *cleanup = make_cleanup (null_cleanup, NULL);
int any_found;
int ui_out_extra_fields = 0;
size_t size_addr;
@@ -657,7 +650,6 @@ info_probes_for_ops (const char *arg, int from_tty,
any_found = !probes.empty ();
}
- do_cleanups (cleanup);
if (!any_found)
current_uiout->message (_("No probes matched.\n"));
@@ -677,7 +669,6 @@ static void
enable_probes_command (const char *arg, int from_tty)
{
std::string provider, probe_name, objname;
- struct cleanup *cleanup = make_cleanup (null_cleanup, NULL);
parse_probe_linespec ((const char *) arg, &provider, &probe_name, &objname);
@@ -686,7 +677,6 @@ enable_probes_command (const char *arg, int from_tty)
if (probes.empty ())
{
current_uiout->message (_("No probes matched.\n"));
- do_cleanups (cleanup);
return;
}
@@ -706,8 +696,6 @@ enable_probes_command (const char *arg, int from_tty)
current_uiout->message (_("Probe %s:%s cannot be enabled.\n"),
probe.probe->provider, probe.probe->name);
}
-
- do_cleanups (cleanup);
}
/* Implementation of the `disable probes' command. */
@@ -716,7 +704,6 @@ static void
disable_probes_command (const char *arg, int from_tty)
{
std::string provider, probe_name, objname;
- struct cleanup *cleanup = make_cleanup (null_cleanup, NULL);
parse_probe_linespec ((const char *) arg, &provider, &probe_name, &objname);
@@ -725,7 +712,6 @@ disable_probes_command (const char *arg, int from_tty)
if (probes.empty ())
{
current_uiout->message (_("No probes matched.\n"));
- do_cleanups (cleanup);
return;
}
@@ -745,8 +731,6 @@ disable_probes_command (const char *arg, int from_tty)
current_uiout->message (_("Probe %s:%s cannot be disabled.\n"),
probe.probe->provider, probe.probe->name);
}
-
- do_cleanups (cleanup);
}
/* See comments in probe.h. */
--
2.13.6
next prev parent reply other threads:[~2017-10-16 3:04 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-16 3:04 [RFA 0/6] more cleanup removals Tom Tromey
2017-10-16 3:04 ` [RFA 4/6] Simple cleanup removals in remote.c Tom Tromey
2017-10-16 20:43 ` Simon Marchi
2017-10-16 21:14 ` Tom Tromey
2017-10-16 21:37 ` Simon Marchi
2017-10-16 21:50 ` Tom Tromey
2017-10-16 22:35 ` Pedro Alves
2017-10-16 23:00 ` Tom Tromey
2017-10-16 23:34 ` [PATCH 1/2] Introduce string_appendf/string_vappendf (Re: [RFA 4/6] Simple cleanup removals in remote.c) Pedro Alves
2017-10-19 3:11 ` Simon Marchi
2017-10-19 3:13 ` Simon Marchi
2017-10-30 0:16 ` Simon Marchi
2017-10-30 11:48 ` Pedro Alves
2017-10-16 23:38 ` [PATCH 2/2] remote.c, QCatchSyscalls: Build std::string instead of unique_xmalloc_ptr " Pedro Alves
2017-10-19 3:17 ` Simon Marchi
2017-10-30 11:49 ` Pedro Alves
2017-10-16 3:04 ` [RFA 5/6] Return unique_xmalloc_ptr from target_read_stralloc Tom Tromey
2017-10-16 21:02 ` Simon Marchi
2017-10-16 3:04 ` Tom Tromey [this message]
2017-10-16 20:26 ` [RFA 2/6] Remove some cleanups from probe.c Simon Marchi
2017-10-16 3:04 ` [RFA 6/6] Return unique_xmalloc_ptr from target_fileio_read_stralloc Tom Tromey
2017-10-16 21:07 ` Simon Marchi
2017-10-16 3:04 ` [RFA 3/6] Remove cleanup from ppc-linux-nat.c Tom Tromey
2017-10-16 20:28 ` Simon Marchi
2017-10-16 3:04 ` [RFA 1/6] Use std::vector in end_symtab_get_static_block Tom Tromey
2017-10-16 20:18 ` Simon Marchi
2017-10-16 21:59 ` Tom Tromey
2017-10-20 15:33 ` Ulrich Weigand
2017-10-20 16:47 ` Pedro Alves
2017-10-23 16:16 ` Ulrich Weigand
2017-10-24 13:55 ` Tom Tromey
2017-10-24 14:41 ` [pushed] " Ulrich Weigand
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=20171016030427.21349-3-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).