This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH 2/6] Code cleanup: dwarf2read.c: Eliminate ::file_write
- From: Pedro Alves <palves at redhat dot com>
- To: gdb-patches at sourceware dot org
- Date: Mon, 12 Jun 2017 17:14:07 +0100
- Subject: [PATCH 2/6] Code cleanup: dwarf2read.c: Eliminate ::file_write
- Authentication-results: sourceware.org; auth=none
- Authentication-results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com
- Authentication-results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=palves at redhat dot com
- Dkim-filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 3A212C01CB7F
- Dmarc-filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 3A212C01CB7F
- References: <1497284051-13795-1-git-send-email-palves@redhat.com>
- References: <8efc0742-1014-4fe0-6948-f40a9c5c4975@redhat.com>
There's no real need for all this indirection.
gdb/ChangeLog:
2017-06-12 Pedro Alves <palves@redhat.com>
* dwarf2read.c (file_write(FILE *, const void *, size_t)): Delete.
(file_write (FILE *, const std::vector<Elem>&)): Delete.
(data_buf::file_write): Call ::fwrite directly.
---
gdb/ChangeLog | 6 ++++++
gdb/dwarf2read.c | 22 ++--------------------
2 files changed, 8 insertions(+), 20 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 316e03a..e3e980d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
2017-06-12 Pedro Alves <palves@redhat.com>
+ * dwarf2read.c (file_write(FILE *, const void *, size_t)): Delete.
+ (file_write (FILE *, const std::vector<Elem>&)): Delete.
+ (data_buf::file_write): Call ::fwrite directly.
+
+2017-06-12 Pedro Alves <palves@redhat.com>
+
* dwarf2read.c (uniquify_cu_indices): Use std::unique and
std::vector::erase.
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 0c9e275..55b3033 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -23195,25 +23195,6 @@ dwarf2_per_objfile_free (struct objfile *objfile, void *d)
/* The "save gdb-index" command. */
-/* Write SIZE bytes from the buffer pointed to by DATA to FILE, with
- error checking. */
-
-static void
-file_write (FILE *file, const void *data, size_t size)
-{
- if (fwrite (data, 1, size, file) != size)
- error (_("couldn't data write to file"));
-}
-
-/* Write the contents of VEC to FILE, with error checking. */
-
-template<class Elem>
-static void
-file_write (FILE *file, const std::vector<Elem> &vec)
-{
- file_write (file, vec.data (), vec.size() * sizeof (vec[0]));
-}
-
/* In-memory buffer to prepare data to be written later to a file. */
class data_buf
{
@@ -23252,7 +23233,8 @@ public:
/* Write the buffer to FILE. */
void file_write (FILE *file) const
{
- ::file_write (file, m_vec);
+ if (::fwrite (m_vec.data (), 1, m_vec.size (), file) != m_vec.size ())
+ error (_("couldn't write data to file"));
}
private:
--
2.5.5