From 0efef6405493c0bf438486819bec70b304276e16 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 29 Sep 2017 22:32:00 -0600 Subject: [PATCH] Use gdb::byte_vector in load_progress This changes load_progress to use gdb::byte_vector, removing a cleanup. 2017-10-03 Tom Tromey * symfile.c (load_progress): Use gdb::byte_vector. --- gdb/ChangeLog | 4 ++++ gdb/symfile.c | 9 ++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 35c7e3c..d5ba398 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,9 @@ 2017-10-03 Tom Tromey + * symfile.c (load_progress): Use gdb::byte_vector. + +2017-10-03 Tom Tromey + * mi/mi-main.c (mi_cmd_trace_frame_collected): Remove unused declaration. * printcmd.c (x_command): Remove unused declaration. diff --git a/gdb/symfile.c b/gdb/symfile.c index f6bc378..a741654 100644 --- a/gdb/symfile.c +++ b/gdb/symfile.c @@ -56,6 +56,7 @@ #include "stack.h" #include "gdb_bfd.h" #include "cli/cli-utils.h" +#include "common/byte-vector.h" #include #include @@ -1942,16 +1943,14 @@ load_progress (ULONGEST bytes, void *untyped_arg) might add a verify_memory() method to the target vector and then use that. remote.c could implement that method using the ``qCRC'' packet. */ - gdb_byte *check = (gdb_byte *) xmalloc (bytes); - struct cleanup *verify_cleanups = make_cleanup (xfree, check); + gdb::byte_vector check (bytes); - if (target_read_memory (args->lma, check, bytes) != 0) + if (target_read_memory (args->lma, check.data (), bytes) != 0) error (_("Download verify read failed at %s"), paddress (target_gdbarch (), args->lma)); - if (memcmp (args->buffer, check, bytes) != 0) + if (memcmp (args->buffer, check.data (), bytes) != 0) error (_("Download verify compare failed at %s"), paddress (target_gdbarch (), args->lma)); - do_cleanups (verify_cleanups); } totals->data_count += bytes; args->lma += bytes; -- 2.7.4