From a5b08de8ea07ea98db5ee32b790376b4744263e8 Mon Sep 17 00:00:00 2001
From: Vas Crabb <vas@vastheman.com>
Date: Mon, 25 Mar 2024 03:17:46 +1100
Subject: Various metadata fixes.

---
 hash/megadriv.xml              | 4 ++--
 src/mame/roland/roland_d70.cpp | 2 +-
 src/mame/sega/system1.cpp      | 4 ++--
 src/mame/yamaha/ympsr2000.cpp  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/hash/megadriv.xml b/hash/megadriv.xml
index 571dab78323..d5be28f6e4f 100644
--- a/hash/megadriv.xml
+++ b/hash/megadriv.xml
@@ -6324,9 +6324,9 @@ Unsupported [Menacer] peripheral
 	</software>
 
 	<software name="pga2hb" cloneof="pga2" supported="no">
-		<description>HeartBeat PGA Tour Golf II</description>
+		<description>PGA Tour Golf II for use with the Personal Trainer</description>
 		<year>1995</year>
-		<publisher>Polar Technology</publisher> <!-- box art shows Polar Technology branding, but cartridge label says "HEARTBEAT CORP." -->
+		<publisher>HeartBeat Corp</publisher>
 		<info name="usage" value="Requires HeartBeat Personal Trainer activity tracker"/>
 		<part name="cart" interface="megadriv_cart">
 			<feature name="slot" value="rom"/>
diff --git a/src/mame/roland/roland_d70.cpp b/src/mame/roland/roland_d70.cpp
index fd941d9a423..05b03e2db17 100755
--- a/src/mame/roland/roland_d70.cpp
+++ b/src/mame/roland/roland_d70.cpp
@@ -530,4 +530,4 @@ ROM_END
 
 } // anonymous namespace
 
-SYST(1991, d70, 0, 0, d70, d70, roland_d70_state, init_d70, "Roland", "D-70 Super LA Synthetizer", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+SYST(1991, d70, 0, 0, d70, d70, roland_d70_state, init_d70, "Roland", "D-70 Super LA Synthesizer", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
diff --git a/src/mame/sega/system1.cpp b/src/mame/sega/system1.cpp
index b3e30ed188d..471a29206cf 100644
--- a/src/mame/sega/system1.cpp
+++ b/src/mame/sega/system1.cpp
@@ -5739,8 +5739,8 @@ GAME( 1986, raflesiau,  raflesia, sys1ppi,           raflesia,  system1_state, e
 
 /* PIO-based System 1 */
 GAME( 1984, flicky,     0,        sys1piox_315_5051, flicky,    system1_state, empty_init,        ROT0,   "Sega", "Flicky (128k Version, 315-5051)", MACHINE_SUPPORTS_SAVE ) // 1984/05/24
-GAME( 1984, flickya,    flicky,   sys1piox_315_5051, flicky,    system1_state, empty_init,        ROT0,   "Sega", "Flicky (128k Version, 315-5051, larger roms)", MACHINE_SUPPORTS_SAVE ) // 1984/05/24
-GAME( 1984, flickyb,    flicky,   sys1piox_315_5051, flickyb,   system1_state, empty_init,        ROT0,   "Sega", "Flicky (128k Version, 315-5051, larger roms, newer)", MACHINE_SUPPORTS_SAVE ) // 1984/10/07
+GAME( 1984, flickya,    flicky,   sys1piox_315_5051, flicky,    system1_state, empty_init,        ROT0,   "Sega", "Flicky (128k Version, 315-5051, larger ROMs)", MACHINE_SUPPORTS_SAVE ) // 1984/05/24
+GAME( 1984, flickyb,    flicky,   sys1piox_315_5051, flickyb,   system1_state, empty_init,        ROT0,   "Sega", "Flicky (128k Version, 315-5051, larger ROMs, newer)", MACHINE_SUPPORTS_SAVE ) // 1984/10/07
 GAME( 1984, flickys2,   flicky,   sys1pio,           flickys2,  system1_state, empty_init,        ROT0,   "Sega", "Flicky (128k Version, not encrypted)", MACHINE_SUPPORTS_SAVE )
 GAME( 1984, thetogyu,   bullfgt,  sys1piox_315_5065, bullfgt,   system1_state, empty_init,        ROT0,   "Coreland / Sega", "The Togyu (315-5065, Japan)", MACHINE_SUPPORTS_SAVE )
 GAME( 1984, spatter,    0,        sys1piosx_315_5096,spatter,   system1_state, empty_init,        ROT0,   "Sega", "Spatter (315-5096)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/yamaha/ympsr2000.cpp b/src/mame/yamaha/ympsr2000.cpp
index 4d7b90977f8..f6e4c87d3c0 100644
--- a/src/mame/yamaha/ympsr2000.cpp
+++ b/src/mame/yamaha/ympsr2000.cpp
@@ -103,4 +103,4 @@ ROM_END
 
 } // anonymous namespace
 
-SYST( 2001, psr2000, 0, 0, psr2000, psr2000, psr2000_state, empty_init, "Yamaha", "PSR2000", MACHINE_IS_SKELETON )
+SYST( 2001, psr2000, 0, 0, psr2000, psr2000, psr2000_state, empty_init, "Yamaha", "PSR-2000", MACHINE_IS_SKELETON )
-- 
cgit v1.2.3


From bd3084ca2efad7e8643b70970fda817ecf01acfb Mon Sep 17 00:00:00 2001
From: Vas Crabb <vas@vastheman.com>
Date: Mon, 25 Mar 2024 04:31:36 +1100
Subject: util/unzip.cpp: Work around spurious maybe uninitialised warning with
 certain GCC versions.

---
 src/lib/util/unzip.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/util/unzip.cpp b/src/lib/util/unzip.cpp
index 281b5f06664..2ca8e722d25 100644
--- a/src/lib/util/unzip.cpp
+++ b/src/lib/util/unzip.cpp
@@ -913,7 +913,7 @@ std::error_condition zip_file_impl::decompress(void *buffer, std::size_t length)
 	}
 
 	// get the compressed data offset
-	std::uint64_t offset;
+	std::uint64_t offset = 0;
 	auto const ziperr = get_compressed_data_offset(offset);
 	if (ziperr)
 		return ziperr;
-- 
cgit v1.2.3