From: Simon Marchi <simon.marchi@polymtl.ca>
To: Pedro Alves <palves@redhat.com>
Cc: Tom Tromey <tom@tromey.com>,
Simon Marchi <simon.marchi@ericsson.com>,
gdb-patches@sourceware.org
Subject: Re: [PATCH 2/2] remote.c, QCatchSyscalls: Build std::string instead of unique_xmalloc_ptr (Re: [RFA 4/6] Simple cleanup removals in remote.c)
Date: Thu, 19 Oct 2017 03:17:00 -0000 [thread overview]
Message-ID: <fde196f8f7f5792aeb4a4e7ebf47dc4c@polymtl.ca> (raw)
In-Reply-To: <474c4998-c732-ad97-18ef-904170a68e53@redhat.com>
On 2017-10-16 19:38, Pedro Alves wrote:
> diff --git a/gdb/remote.c b/gdb/remote.c
> index 6b77a9f..a6cb724 100644
> --- a/gdb/remote.c
> +++ b/gdb/remote.c
> @@ -2086,40 +2086,32 @@ remote_set_syscall_catchpoint (struct
> target_ops *self,
> pid, needed, any_count, n_sysno);
> }
>
> - gdb::unique_xmalloc_ptr<char> built_packet;
> + std::string built_packet;
> if (needed)
> {
> /* Prepare a packet with the sysno list, assuming max 8+1
> characters for a sysno. If the resulting packet size is too
> big, fallback on the non-selective packet. */
> const int maxpktsz = strlen ("QCatchSyscalls:1") + n_sysno * 9 +
> 1;
> -
> - built_packet.reset ((char *) xmalloc (maxpktsz));
> - strcpy (built_packet.get (), "QCatchSyscalls:1");
> + built_packet.reserve (maxpktsz);
> + built_packet = "QCatchSyscalls:1";
> if (!any_count)
> {
> - int i;
> - char *p;
> -
> - p = built_packet.get ();
> - p += strlen (p);
> -
> /* Add in catch_packet each syscall to be caught (table[i] != 0).
> */
> - for (i = 0; i < table_size; i++)
> + for (int i = 0; i < table_size; i++)
> {
> if (table[i] != 0)
> - p += xsnprintf (p, built_packet.get () + maxpktsz - p,
> - ";%x", i);
> + string_appendf (built_packet, ";%x", i);
> }
> }
> - if (strlen (built_packet.get ()) > get_remote_packet_size ())
> + if (built_packet.size () > get_remote_packet_size ())
> {
> /* catch_packet too big. Fallback to less efficient
> non selective mode, with GDB doing the filtering. */
> catch_packet = "QCatchSyscalls:1";
> }
> else
> - catch_packet = built_packet.get ();
> + catch_packet = built_packet.c_str ();
You can get rid of built_packet, and make catch_packet the std::string.
And then this last else branch can be removed.
Simon
next prev parent reply other threads:[~2017-10-19 3:17 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 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 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
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 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 [this message]
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 ` [RFA 2/6] Remove some cleanups from probe.c Tom Tromey
2017-10-16 20:26 ` Simon Marchi
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=fde196f8f7f5792aeb4a4e7ebf47dc4c@polymtl.ca \
--to=simon.marchi@polymtl.ca \
--cc=gdb-patches@sourceware.org \
--cc=palves@redhat.com \
--cc=simon.marchi@ericsson.com \
--cc=tom@tromey.com \
/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).