change name and catalog_id in cartridge (and derived types) to return string by value instead of by reference

Author: ChetSimpson

libcommon/include/vcc/core/cartridge.h

@@ -39,8 +39,8 @@ namespace vcc { namespace core
 
 		virtual ~cartridge() = default;
 
-		virtual const name_type& name() const = 0;
-		virtual const catalog_id_type& catalog_id() const = 0;
+		virtual name_type name() const = 0;
+		virtual catalog_id_type catalog_id() const = 0;
 
 		virtual void start() = 0;
 		virtual void reset() = 0;

libcommon/include/vcc/core/cartridges/basic_cartridge.h

@@ -34,8 +34,8 @@ namespace vcc { namespace core { namespace cartridges
 
 		using cartridge::cartridge;
 
-		const name_type& name() const override;
-		const catalog_id_type& catalog_id() const override;
+		name_type name() const override;
+		catalog_id_type catalog_id() const override;
 
 		void start() override;
 		void reset() override;

libcommon/include/vcc/core/cartridges/legacy_cartridge.h

@@ -43,8 +43,8 @@ namespace vcc { namespace core { namespace cartridges
 			AssertInteruptModuleCallback assertCallback,
 			AssertCartridgeLineModuleCallback assertCartCallback);
 
-		LIBCOMMON_EXPORT const name_type& name() const override;
-		LIBCOMMON_EXPORT const catalog_id_type& catalog_id() const override;
+		LIBCOMMON_EXPORT name_type name() const override;
+		LIBCOMMON_EXPORT catalog_id_type catalog_id() const override;
 
 		LIBCOMMON_EXPORT void reset() override;
 		LIBCOMMON_EXPORT void heartbeat() override;

libcommon/include/vcc/core/cartridges/rom_cartridge.h

@@ -44,8 +44,8 @@ namespace vcc { namespace core { namespace cartridges
 			buffer_type buffer,
 			bool enable_bank_switching);
 
-		LIBCOMMON_EXPORT const name_type& name() const override;
-		LIBCOMMON_EXPORT const catalog_id_type& catalog_id() const override;
+		LIBCOMMON_EXPORT name_type name() const override;
+		LIBCOMMON_EXPORT catalog_id_type catalog_id() const override;
 
 		LIBCOMMON_EXPORT void reset() override;
 		LIBCOMMON_EXPORT void write_port(unsigned char port_id, unsigned char value) override;

libcommon/include/vcc/core/utils/critical_section.h

@@ -23,28 +23,28 @@ namespace vcc { namespace core { namespace utils
 		critical_section(const critical_section&) = delete;
 		critical_section& operator=(const critical_section&) = delete;
 
-		void lock()
+		void lock() const
 		{
 			EnterCriticalSection(&section_);
 		}
 
-		void unlock()
+		void unlock() const
 		{
 			LeaveCriticalSection(&section_);
 		}
 
 
 	private:
 
-		CRITICAL_SECTION	section_;
+		mutable CRITICAL_SECTION section_;
 	};
 
 
 	class section_locker
 	{
 	public:
 
-		explicit section_locker(critical_section& section)
+		explicit section_locker(const critical_section& section)
 			: section_(section)
 		{
 			section_.lock();
@@ -61,7 +61,7 @@ namespace vcc { namespace core { namespace utils
 
 	private:
 
-		critical_section& section_;
+		const critical_section& section_;
 	};
 
 } } }

libcommon/src/core/cartridges/basic_cartridge.cpp

@@ -21,18 +21,14 @@
 namespace vcc { namespace core { namespace cartridges
 {
 
-	const basic_cartridge::name_type& basic_cartridge::name() const
+	basic_cartridge::name_type basic_cartridge::name() const
 	{
-		static const name_type local_name;
-
-		return local_name;
+		return {};
 	}
 
-	const basic_cartridge::catalog_id_type& basic_cartridge::catalog_id() const
+	basic_cartridge::catalog_id_type basic_cartridge::catalog_id() const
 	{
-		static const catalog_id_type local_id;
-
-		return local_id;
+		return {};
 	}
 
 
@@ -61,9 +57,9 @@ namespace vcc { namespace core { namespace cartridges
 		return {};
 	}
 
-	void basic_cartridge::status(char* status_text)
+	void basic_cartridge::status(char* status_buffer)
 	{
-		*status_text = 0;
+		*status_buffer = 0;
 	}
 
 	unsigned short basic_cartridge::sample_audio()

libcommon/src/core/cartridges/legacy_cartridge.cpp

@@ -156,12 +156,12 @@ namespace vcc { namespace core { namespace cartridges
 		//		ModuleConfig		==>		PakProcessMenuItem
 	}
 
-	const legacy_cartridge::name_type& legacy_cartridge::name() const
+	legacy_cartridge::name_type legacy_cartridge::name() const
 	{
 		return name_;
 	}
 
-	const legacy_cartridge::catalog_id_type& legacy_cartridge::catalog_id() const
+	legacy_cartridge::catalog_id_type legacy_cartridge::catalog_id() const
 	{
 		return catalog_id_;
 	}
@@ -176,9 +176,9 @@ namespace vcc { namespace core { namespace cartridges
 		heartbeat_();
 	}
 
-	void legacy_cartridge::status(char* status_text)
+	void legacy_cartridge::status(char* status_buffer)
 	{
-		status_(status_text);
+		status_(status_buffer);
 	}
 
 	void legacy_cartridge::write_port(unsigned char port_id, unsigned char value)

libcommon/src/core/cartridges/rom_cartridge.cpp

@@ -37,12 +37,12 @@ namespace vcc { namespace core { namespace cartridges
 	{}
 
 
-	const rom_cartridge::name_type& rom_cartridge::name() const
+	rom_cartridge::name_type rom_cartridge::name() const
 	{
 		return name_;
 	}
 
-	const rom_cartridge::catalog_id_type& rom_cartridge::catalog_id() const
+	rom_cartridge::catalog_id_type rom_cartridge::catalog_id() const
 	{
 		return catalog_id_;
 	}