Some text msg file cleanup

Also fixing some memory leaks on it.

Author: marzojr

files/U7obj.cc

@@ -38,7 +38,7 @@ using std::unique_ptr;
  */
 size_t U7object::number_of_objects() {
 	U7file* uf = U7FileManager::get_ptr()->get_file_object(identifier, true);
-	return uf ? uf->number_of_objects() : 0UL;
+	return (uf != nullptr) ? uf->number_of_objects() : 0UL;
 }
 
 /**
@@ -51,7 +51,7 @@ size_t U7object::number_of_objects() {
 unique_ptr<unsigned char[]> U7object::retrieve(size_t& len) const {
 	U7file* uf = U7FileManager::get_ptr()->get_file_object(identifier, true);
 	len        = 0;
-	return uf ? uf->retrieve(objnumber, len) : nullptr;
+	return (uf != nullptr) ? uf->retrieve(objnumber, len) : nullptr;
 }
 
 /**
@@ -63,14 +63,14 @@ unique_ptr<unsigned char[]> U7object::retrieve(size_t& len) const {
  *  @param objects  Vector containing U7objects we will test.
  */
 void U7multiobject::set_object(const std::vector<U7object>& objects) {
-	for (const auto& object : objects) {
+	for (const auto& obj : objects) {
 		size_t len;
 		auto   buf = object.retrieve(len);
 		// Only len > 0 means a valid object.
 		if (buf && len > 0) {
-			buffer     = std::move(buf);    // Gets deleted with class.
-			length     = len;
-			identifier = object.get_identifier();
+			buffer = std::move(buf);    // Gets deleted with class.
+			length = len;
+			object.set_identifier(obj.get_identifier());
 			break;
 		}
 	}
@@ -82,9 +82,9 @@ void U7multiobject::set_object(const std::vector<U7object>& objects) {
  *  @param objnum   Object number we are looking for.
  */
 U7multiobject::U7multiobject(const File_spec& file0, int objnum)
-		: U7object(file0, objnum), buffer(nullptr), length(0) {
+		: buffer(nullptr), length(0), object(file0, objnum) {
 	size_t len;
-	auto   buf = U7object::retrieve(len);
+	auto   buf = object.retrieve(len);
 	// Only len > 0 means a valid object.
 	if (buf && len > 0) {
 		buffer = std::move(buf);    // Gets deleted with class.
@@ -100,10 +100,9 @@ U7multiobject::U7multiobject(const File_spec& file0, int objnum)
  */
 U7multiobject::U7multiobject(
 		const File_spec& file0, const File_spec& file1, int objnum)
-		: U7object(file0, objnum), buffer(nullptr), length(0) {
-	std::vector<U7object> objects;
-	objects.emplace_back(file1, objnum);
-	objects.emplace_back(file0, objnum);
+		: buffer(nullptr), length(0), object(file0, objnum) {
+	std::vector<U7object> objects{
+			U7object(file1, objnum), U7object(file0, objnum)};
 	set_object(objects);
 }
 
@@ -117,11 +116,10 @@ U7multiobject::U7multiobject(
 U7multiobject::U7multiobject(
 		const File_spec& file0, const File_spec& file1, const File_spec& file2,
 		int objnum)
-		: U7object(file0, objnum), buffer(nullptr), length(0) {
-	std::vector<U7object> objects;
-	objects.emplace_back(file2, objnum);
-	objects.emplace_back(file1, objnum);
-	objects.emplace_back(file0, objnum);
+		: buffer(nullptr), length(0), object(file0, objnum) {
+	std::vector<U7object> objects{
+			U7object(file2, objnum), U7object(file1, objnum),
+			U7object(file0, objnum)};
 	set_object(objects);
 }
 
@@ -136,12 +134,10 @@ U7multiobject::U7multiobject(
 U7multiobject::U7multiobject(
 		const File_spec& file0, const File_spec& file1, const File_spec& file2,
 		const File_spec& file3, int objnum)
-		: U7object(file0, objnum), buffer(nullptr), length(0) {
-	std::vector<U7object> objects;
-	objects.emplace_back(file3, objnum);
-	objects.emplace_back(file2, objnum);
-	objects.emplace_back(file1, objnum);
-	objects.emplace_back(file0, objnum);
+		: buffer(nullptr), length(0), object(file0, objnum) {
+	std::vector<U7object> objects{
+			U7object(file3, objnum), U7object(file2, objnum),
+			U7object(file1, objnum), U7object(file0, objnum)};
 	set_object(objects);
 }
 
@@ -151,9 +147,9 @@ U7multiobject::U7multiobject(
  *  @param objnum   Object number we are looking for.
  */
 U7multiobject::U7multiobject(const std::vector<File_spec>& files, int objnum)
-		: U7object("", objnum), buffer(nullptr), length(0) {
+		: buffer(nullptr), length(0), object("", objnum) {
 	if (!files.empty()) {
-		identifier = files[0];
+		object.set_identifier(files[0]);
 		std::vector<U7object> objects;
 		objects.reserve(files.size());
 		for (const auto& file : files) {
@@ -163,6 +159,18 @@ U7multiobject::U7multiobject(const std::vector<File_spec>& files, int objnum)
 	}
 }
 
+U7multiobject::U7multiobject(const U7multiobject& other)
+		: buffer(nullptr), length(0), object(other.object) {
+	buffer = make_unique<unsigned char[]>(other.length);
+	std::copy_n(other.buffer.get(), other.length, buffer.get());
+}
+
+U7multiobject& U7multiobject::operator=(const U7multiobject& rhs) {
+	U7multiobject tmp(rhs);
+	std::swap(*this, tmp);
+	return *this;
+}
+
 /**
  *  Uses U7FileManager to get an U7file for the desired file.
  *  @param len  Receives the size of desired object, if it exists
@@ -175,9 +183,8 @@ unique_ptr<unsigned char[]> U7multiobject::retrieve(size_t& len) const {
 	if (length == 0) {
 		// This means we didn't find the object on construction.
 		return nullptr;
-	} else {
-		auto buf = make_unique<unsigned char[]>(len);
-		std::copy_n(buffer.get(), len, buf.get());
-		return buf;
 	}
+	auto buf = make_unique<unsigned char[]>(len);
+	std::copy_n(buffer.get(), len, buf.get());
+	return buf;
 }

files/U7obj.h

@@ -23,8 +23,6 @@
 #ifndef U7OBJ_H
 #define U7OBJ_H
 
-#include "common_types.h"
-
 #include <memory>
 #include <string>
 #include <utility>
@@ -59,7 +57,7 @@ struct File_spec {
  *  This class loads a file of undefined type and retrieves
  *  a given object contained in said file.
  */
-class U7object {
+class U7object final {
 protected:
 	/// Name of desired file.
 	File_spec identifier;
@@ -70,25 +68,28 @@ class U7object {
 	/// Setups to load an object from a buffer or file.
 	/// @param spec Specification of the data source.
 	/// @param objnum   Index of object in the data object.
-	/// @param p    Optional, defaults to false. If true, indicates
 	/// the object comes from the patch dir.
 	U7object(File_spec spec, int objnum)
 			: identifier(std::move(spec)), objnumber(objnum) {}
 
-	virtual ~U7object() noexcept         = default;
-	U7object(const U7object&)            = delete;
-	U7object& operator=(const U7object&) = delete;
+	~U7object() noexcept                 = default;
+	U7object(const U7object&)            = default;
+	U7object& operator=(const U7object&) = default;
 	U7object(U7object&&)                 = default;
 	U7object& operator=(U7object&&)      = default;
 
 	File_spec get_identifier() const {
 		return identifier;
 	}
 
+	void set_identifier(File_spec spec) {
+		identifier = std::move(spec);
+	}
+
 	// TODO: This may need to be overriden by U7multiobject, in case the
 	// patching files have more objects than the base.
-	size_t                                   number_of_objects();
-	virtual std::unique_ptr<unsigned char[]> retrieve(std::size_t& len) const;
+	size_t                           number_of_objects();
+	std::unique_ptr<unsigned char[]> retrieve(std::size_t& len) const;
 };
 
 /**
@@ -102,10 +103,11 @@ class U7object {
  *  An 'object' it loads may be an object in a file or an object
  *  in a buffer.
  */
-class U7multiobject final : public U7object {
+class U7multiobject final {
 private:
 	std::unique_ptr<unsigned char[]> buffer;
 	size_t                           length;
+	U7object                         object;
 	void set_object(const std::vector<U7object>& objects);
 
 public:
@@ -118,13 +120,13 @@ class U7multiobject final : public U7object {
 			const File_spec& file0, const File_spec& file1,
 			const File_spec& file2, const File_spec& file3, int objnum);
 	U7multiobject(const std::vector<File_spec>& files, int objnum);
-	~U7multiobject() noexcept final                = default;
-	U7multiobject(const U7multiobject&)            = delete;
-	U7multiobject& operator=(const U7multiobject&) = delete;
-	U7multiobject(U7multiobject&&)                 = default;
-	U7multiobject& operator=(U7multiobject&&)      = default;
+	~U7multiobject() noexcept = default;
+	U7multiobject(const U7multiobject&);
+	U7multiobject& operator=(const U7multiobject&);
+	U7multiobject(U7multiobject&&)            = default;
+	U7multiobject& operator=(U7multiobject&&) = default;
 
-	std::unique_ptr<unsigned char[]> retrieve(std::size_t& len) const final;
+	std::unique_ptr<unsigned char[]> retrieve(std::size_t& len) const;
 };
 
 #endif

files/msgfile.cc

@@ -22,6 +22,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include "msgfile.h"
+
 #include "databuf.h"
 #include "ios_state.hpp"
 
@@ -164,17 +166,6 @@ bool Search_text_msg_section(IDataSource* in, const char* section) {
 	return false;
 }
 
-int Read_text_msg_file(
-		istream&        in,
-		vector<string>& strings,    // Strings returned here, each
-		//   allocated on heap.
-		const char* section    // Section name, or nullptr.  If given
-							   //   the section must be next infile.
-) {
-	IStreamDataSource ds(&in);
-	return Read_text_msg_file(&ds, strings, section);
-}
-
 int Read_text_msg_file_sections(
 		IDataSource*            in,
 		vector<vector<string>>& strings,       // Strings returned here
@@ -203,15 +194,6 @@ int Read_text_msg_file_sections(
 	return version;
 }
 
-int Read_text_msg_file_sections(
-		istream&                in,
-		vector<vector<string>>& strings,       // Strings returned here
-		const char*             sections[],    // Section names
-		int                     numsections) {
-	IStreamDataSource ds(&in);
-	return Read_text_msg_file_sections(&ds, strings, sections, numsections);
-}
-
 /*
  *  Write one section.
  */

files/msgfile.h

@@ -36,24 +36,13 @@ int Read_text_msg_file(
 		std::vector<std::string>& strings,    // Strings returned here, each
 		//   allocated on heap.
 		const char* section = nullptr);
-int Read_text_msg_file(
-		std::istream&             in,
-		std::vector<std::string>& strings,    // Strings returned here, each
-		//   allocated on heap.
-		const char* section = nullptr);
 bool Search_text_msg_section(IDataSource* in, const char* section = nullptr);
 int  Read_text_msg_file_sections(
 		 IDataSource* in,
 		 std::vector<std::vector<std::string>>&
 					 strings,       // Strings returned here
 		 const char* sections[],    // Section names
 		 int         numsections);
-int Read_text_msg_file_sections(
-		std::istream& in,
-		std::vector<std::vector<std::string>>&
-					strings,       // Strings returned here
-		const char* sections[],    // Section names
-		int         numsections);
 void Write_msg_file_section(
 		std::ostream& out, const char* section,
 		std::vector<std::string>& items);

gumps/Notebook_gump.cc

@@ -840,19 +840,17 @@ void Notebook_gump::read() {
 void Notebook_gump::read_auto_text_file(const char* filename) {
 	if (gwin->get_allow_autonotes()) {
 		initialized_auto_text = true;
-		std::unique_ptr<std::istream> pNotesfile;
-		if (is_system_path_defined("<PATCH>") && U7exists(PATCH_AUTONOTES)) {
-			cout << "Loading patch autonotes" << endl;
-			pNotesfile = U7open_in(PATCH_AUTONOTES, true);
-		} else {
+		IFileDataSource notesfile = [&]() -> IFileDataSource {
+			if (is_system_path_defined("<PATCH>") && U7exists(PATCH_AUTONOTES)) {
+				cout << "Loading patch autonotes" << endl;
+				return IFileDataSource(PATCH_AUTONOTES, true);
+			}
 			cout << "Loading autonotes from file " << filename << endl;
-			pNotesfile = U7open_in(filename, true);
-		}
-		if (!pNotesfile) {
-			return;
+			return IFileDataSource(filename, true);
+		}();
+		if (notesfile.good()) {
+			Read_text_msg_file(&notesfile, auto_text);
 		}
-		auto& notesfile = *pNotesfile;
-		Read_text_msg_file(notesfile, auto_text);
 	}
 }
 
@@ -862,12 +860,10 @@ void Notebook_gump::read_auto_text() {
 		initialized_auto_text = true;
 		if (is_system_path_defined("<PATCH>") && U7exists(PATCH_AUTONOTES)) {
 			cout << "Loading patch autonotes" << endl;
-			auto pNotesfile = U7open_in(PATCH_AUTONOTES, true);
-			if (!pNotesfile) {
-				return;
+			IFileDataSource notesfile(PATCH_AUTONOTES, true);
+			if (notesfile.good()) {
+				Read_text_msg_file(&notesfile, auto_text);
 			}
-			auto& notesfile = *pNotesfile;
-			Read_text_msg_file(notesfile, auto_text);
 		} else {
 			const str_int_pair& resource
 					= game->get_resource("config/autonotes");