Merge pull request #1469 from TomHarte/AllWarnings

Resolve all current compiler warnings.

Analyser/Static/Commodore/StaticAnalyser.cpp

@@ -299,7 +299,7 @@ std::unique_ptr<Analyser::Static::Target> get_target<TargetPlatform::Plus4>(
 
 	// Attach a 1541 if there are any disks here.
 	target->has_c1541 = !target->media.disks.empty();
-	return std::move(target);
+	return target;
 }
 
 template<>
@@ -392,7 +392,7 @@ std::unique_ptr<Analyser::Static::Target> get_target<TargetPlatform::Vic20>(
 
 	// Attach a 1540 if there are any disks here.
 	target->has_c1540 = !target->media.disks.empty();
-	return std::move(target);
+	return target;
 }
 
 }

Machines/Commodore/Plus4/Plus4.cpp

@@ -730,7 +730,6 @@ class ConcreteMachine:
 	}
 	void read_dipole() {
 		using Register = CPU::MOS6502::Register;
-		using Pulse = Storage::Tape::Pulse;
 		using Flag = CPU::MOS6502::Flag;
 
 		//

Storage/Data/ZX8081.cpp

@@ -44,7 +44,7 @@ static std::optional<File> ZX80FileFromData(const std::vector<uint8_t> &data) {
 	File file;
 	file.data = data;
 	file.isZX81 = false;
-	return std::move(file);
+	return file;
 }
 
 std::optional<File> ZX81FileFromData(const std::vector<uint8_t> &data) {
@@ -87,7 +87,7 @@ std::optional<File> ZX81FileFromData(const std::vector<uint8_t> &data) {
 	file.name = StringFromData(name_data, true);
 	file.data = data;
 	file.isZX81 = true;
-	return std::move(file);
+	return file;
 }
 
 }

Storage/Tape/Formats/CSW.cpp

@@ -34,7 +34,6 @@ CSW::CSW(const std::string &file_name) {
 	if(major_version > 2 || !major_version || minor_version > 1) throw ErrorNotCSW;
 
 	// The header now diverges based on version.
-	uint32_t number_of_waves = 0;
 	CompressionType compression_type;
 	if(major_version == 1) {
 		pulse_.length.clock_rate = file.get16le();
@@ -47,15 +46,15 @@ CSW::CSW(const std::string &file_name) {
 		file.seek(0x20, SEEK_SET);
 	} else {
 		pulse_.length.clock_rate = file.get32le();
-		number_of_waves = file.get32le();	// TODO: is this still useful?
+		file.seek(4, SEEK_CUR);	// Skip number of waves.
 		switch(file.get8()) {
 			case 1: compression_type = CompressionType::RLE;	break;
 			case 2: compression_type = CompressionType::ZRLE;	break;
 			default: throw ErrorNotCSW;
 		}
 
 		pulse_.type = (file.get8() & 1) ? Pulse::High : Pulse::Low;
-		uint8_t extension_length = file.get8();
+		const uint8_t extension_length = file.get8();
 
 		if(file.stats().st_size < 0x34 + extension_length) throw ErrorNotCSW;
 		file.seek(0x34 + extension_length, SEEK_SET);
@@ -66,7 +65,6 @@ CSW::CSW(const std::string &file_name) {
 	const std::size_t remaining_data = size_t(file.stats().st_size) - size_t(file.tell());
 	file_data.resize(remaining_data);
 	file.read(file_data.data(), remaining_data);
-
 	set_data(std::move(file_data), compression_type);
 }
 
@@ -77,24 +75,21 @@ CSW::CSW(std::vector<uint8_t> &&data, CompressionType type, bool initial_level,
 }
 
 void CSW::set_data(std::vector<uint8_t> &&data, CompressionType type) {
-	// TODO: compression types.
-
 	if(type == CompressionType::ZRLE) {
-		// The only clue given by CSW as to the output size in bytes is that there will be
-		// number_of_waves waves. Waves are usually one byte, but may be five. So this code
-		// is pessimistic.
-//		source_data_.resize(size_t(number_of_waves) * 5);
-
-		// uncompress will tell how many compressed bytes there actually were, so use its
-		// modification of output_length to throw away all the memory that isn't actually
-		// needed.
-//		uLongf output_length = uLongf(number_of_waves * 5);
-//		uncompress(source_data_.data(), &output_length, file_data.data(), file_data.size());
-//		source_data_.resize(std::size_t(output_length));
+		// Play a fun game of guessing buffer sizes.
+		source_data_.resize(data.size() * 2);
+
+		do {
+			uLongf output_size = source_data_.size();
+			if(uncompress(source_data_.data(), &output_size, data.data(), data.size()) == Z_BUF_ERROR) {
+				source_data_.resize(source_data_.size() * 2);
+				continue;
+			}
+			source_data_.resize(output_size);
+		} while(false);
 	} else {
 		source_data_ = std::move(data);
 	}
-
 }
 
 std::unique_ptr<FormatSerialiser> CSW::format_serialiser() const {

Storage/Tape/Formats/CommodoreTAP.hpp

@@ -71,7 +71,6 @@ class CommodoreTAP: public Tape, public TargetPlatform::Distinguisher {
 	bool half_waves_;
 	bool updated_layout_;
 	Platform platform_;
-	TargetPlatform::Type target_platforms_;
 };
 
 }