summaryrefslogtreecommitdiff
path: root/gdb/gcore.c
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2017-11-09 17:15:37 -0700
committerTom Tromey <tom@tromey.com>2017-11-26 10:41:13 -0700
commit44287fd89091a833451e74c79e46404c23fdaf9b (patch)
tree9cdf1ed6924ea1d9ea749bf31d3e56bd950a73d5 /gdb/gcore.c
parent8e2495f2f75120baae14f9dac9d29b043c539b2b (diff)
downloadbinutils-gdb-44287fd89091a833451e74c79e46404c23fdaf9b.tar.gz
Removes a cleanup from gcore.c
This removes a cleanup from gcore.c, replacing it with unique_xmalloc_ptr. Regression tested by the buildbot. ChangeLog 2017-11-26 Tom Tromey <tom@tromey.com> * gcore.c (write_gcore_file_1): Use gdb::unique_xmalloc_ptr.
Diffstat (limited to 'gdb/gcore.c')
-rw-r--r--gdb/gcore.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/gdb/gcore.c b/gdb/gcore.c
index 0d5dccab619..359ec3df84a 100644
--- a/gdb/gcore.c
+++ b/gdb/gcore.c
@@ -68,8 +68,7 @@ create_gcore_bfd (const char *filename)
static void
write_gcore_file_1 (bfd *obfd)
{
- struct cleanup *cleanup;
- void *note_data = NULL;
+ gdb::unique_xmalloc_ptr<char> note_data;
int note_size = 0;
asection *note_sec = NULL;
@@ -78,11 +77,10 @@ write_gcore_file_1 (bfd *obfd)
generation should be converted to gdbarch_make_corefile_notes; at that
point, the target vector method can be removed. */
if (!gdbarch_make_corefile_notes_p (target_gdbarch ()))
- note_data = target_make_corefile_notes (obfd, &note_size);
+ note_data.reset (target_make_corefile_notes (obfd, &note_size));
else
- note_data = gdbarch_make_corefile_notes (target_gdbarch (), obfd, &note_size);
-
- cleanup = make_cleanup (xfree, note_data);
+ note_data.reset (gdbarch_make_corefile_notes (target_gdbarch (), obfd,
+ &note_size));
if (note_data == NULL || note_size == 0)
error (_("Target does not support core file generation."));
@@ -105,10 +103,9 @@ write_gcore_file_1 (bfd *obfd)
error (_("gcore: failed to get corefile memory sections from target."));
/* Write out the contents of the note section. */
- if (!bfd_set_section_contents (obfd, note_sec, note_data, 0, note_size))
+ if (!bfd_set_section_contents (obfd, note_sec, note_data.get (), 0,
+ note_size))
warning (_("writing note section (%s)"), bfd_errmsg (bfd_get_error ()));
-
- do_cleanups (cleanup);
}
/* write_gcore_file -- helper for gcore_command (exported).