[RFA 14/22] Replace two xmallocs with vector

Tom Tromey
2016-09-27T04:51:26Z

This replaces a couple of uses of xmalloc with a std::vector, also
removing a couple of cleanups.

2016-09-26 Tom Tromey <tom@tromey.com>

* cli/cli-dump.c (dump_memory_to_file): Use std::vector.
(restore_binary_file): Likewise.
---
gdb/ChangeLog | 5 +++++
gdb/cli/cli-dump.c | 21 +++++++++------------
2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 476dbb3..42101fc 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
2016-09-26 Tom Tromey <tom@tromey.com>

+ * cli/cli-dump.c (dump_memory_to_file): Use std::vector.
+ (restore_binary_file): Likewise.
+
+2016-09-26 Tom Tromey <tom@tromey.com>
+
* stabsread.c (read_struct_type): Remove unnecessary cleanup.

2016-09-26 Tom Tromey <tom@tromey.com>
diff --git a/gdb/cli/cli-dump.c b/gdb/cli/cli-dump.c
index 611b0c3..2b4d1be 100644
--- a/gdb/cli/cli-dump.c
+++ b/gdb/cli/cli-dump.c
@@ -31,7 +31,7 @@
#include "cli/cli-utils.h"
#include "gdb_bfd.h"
#include "filestuff.h"
-
+#include <vector>

static const char *
scan_expression_with_cleanup (const char **cmd, const char *def)
@@ -212,7 +212,6 @@ dump_memory_to_file (const char *cmd, const char *mode, const char *file_format)
CORE_ADDR hi;
ULONGEST count;
const char *filename;
- gdb_byte *buf;
const char *lo_exp;
const char *hi_exp;

@@ -237,18 +236,17 @@ dump_memory_to_file (const char *cmd, const char *mode, const char *file_format)

/* FIXME: Should use read_memory_partial() and a magic blocking
value. */
- buf = (gdb_byte *) xmalloc (count);
- make_cleanup (xfree, buf);
- read_memory (lo, buf, count);
+ std::vector<gdb_byte> buf (count);
+ read_memory (lo, buf.data (), count);

/* Have everything. Open/write the data. */
if (file_format == NULL || strcmp (file_format, "binary") == 0)
{
- dump_binary_file (filename, mode, buf, count);
+ dump_binary_file (filename, mode, buf.data (), count);
}
else
{
- dump_bfd_file (filename, mode, file_format, lo, buf, count);
+ dump_bfd_file (filename, mode, file_format, lo, buf.data (), count);
}

do_cleanups (old_cleanups);
@@ -518,7 +516,6 @@ restore_binary_file (const char *filename, struct callback_data *data)
{
struct cleanup *cleanup = make_cleanup (null_cleanup, NULL);
FILE *file = fopen_with_cleanup (filename, FOPEN_RB);
- gdb_byte *buf;
long len;

/* Get the file size for reading. */
@@ -553,13 +550,13 @@ restore_binary_file (const char *filename, struct callback_data *data)
perror_with_name (filename);

/* Now allocate a buffer and read the file contents. */
- buf = (gdb_byte *) xmalloc (len);
- make_cleanup (xfree, buf);
- if (fread (buf, 1, len, file) != len)
+ std::vector<gdb_byte> buf (len);
+ if (fread (buf.data (), 1, len, file) != len)
perror_with_name (filename);

/* Now write the buffer into target memory. */
- len = target_write_memory (data->load_start + data->load_offset, buf, len);
+ len = target_write_memory (data->load_start + data->load_offset,
+ buf.data (), len);
if (len != 0)
warning (_("restore: memory write failed (%s)."), safe_strerror (len));
do_cleanups (cleanup);
--
2.7.4