From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [RFA 3/6] Remove cleanup from ppc-linux-nat.c
Date: Mon, 16 Oct 2017 03:04:00 -0000 [thread overview]
Message-ID: <20171016030427.21349-4-tom@tromey.com> (raw)
In-Reply-To: <20171016030427.21349-1-tom@tromey.com>
This removes a cleanup from ppc-linux-nat.c, by using
unique_xmalloc_ptr. It also slightly simplifies the code by using
XDUP rather than XNEW and memcpy.
ChangeLog
2017-10-15 Tom Tromey <tom@tromey.com>
* ppc-linux-nat.c (hwdebug_insert_point): Use
gdb::unique_xmalloc_ptr, XDUP.
---
gdb/ChangeLog | 5 +++++
gdb/ppc-linux-nat.c | 11 +++--------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c
index 45c8903ef6..7c8ab6c67b 100644
--- a/gdb/ppc-linux-nat.c
+++ b/gdb/ppc-linux-nat.c
@@ -1541,16 +1541,13 @@ hwdebug_insert_point (struct ppc_hw_breakpoint *b, int tid)
{
int i;
long slot;
- struct ppc_hw_breakpoint *p = XNEW (struct ppc_hw_breakpoint);
+ gdb::unique_xmalloc_ptr<ppc_hw_breakpoint> p (XDUP (ppc_hw_breakpoint, b));
struct hw_break_tuple *hw_breaks;
- struct cleanup *c = make_cleanup (xfree, p);
struct thread_points *t;
struct hw_break_tuple *tuple;
- memcpy (p, b, sizeof (struct ppc_hw_breakpoint));
-
errno = 0;
- slot = ptrace (PPC_PTRACE_SETHWDEBUG, tid, 0, p);
+ slot = ptrace (PPC_PTRACE_SETHWDEBUG, tid, 0, p.get ());
if (slot < 0)
perror_with_name (_("Unexpected error setting breakpoint or watchpoint"));
@@ -1564,13 +1561,11 @@ hwdebug_insert_point (struct ppc_hw_breakpoint *b, int tid)
if (hw_breaks[i].hw_break == NULL)
{
hw_breaks[i].slot = slot;
- hw_breaks[i].hw_break = p;
+ hw_breaks[i].hw_break = p.release ();
break;
}
gdb_assert (i != max_slots_number);
-
- discard_cleanups (c);
}
/* This function is a generic wrapper that is responsible for removing a
--
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 ` Tom Tromey [this message]
2017-10-16 20:28 ` [RFA 3/6] Remove cleanup from ppc-linux-nat.c 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 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 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 2/6] Remove some cleanups from probe.c Tom Tromey
2017-10-16 20:26 ` Simon Marchi
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
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-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).