[Scummvm-git-logs] scummvm master -> 2fa8200b3333c60cfc3bda57e99a976c6eda41d4

[mduggan]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
2fa8200b33 ULTIMA8: Remove a pointless string copy


Commit: 2fa8200b3333c60cfc3bda57e99a976c6eda41d4
    https://github.com/scummvm/scummvm/commit/2fa8200b3333c60cfc3bda57e99a976c6eda41d4
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-04-01T18:42:16+09:00

Commit Message:
ULTIMA8: Remove a pointless string copy

Changed paths:
    engines/ultima/ultima8/filesys/file_system.cpp


diff --git a/engines/ultima/ultima8/filesys/file_system.cpp b/engines/ultima/ultima8/filesys/file_system.cpp
index 531ef61eba..54881028fc 100644
--- a/engines/ultima/ultima8/filesys/file_system.cpp
+++ b/engines/ultima/ultima8/filesys/file_system.cpp
@@ -52,8 +52,6 @@ FileSystem::~FileSystem() {
 
 // Open a streaming file as readable. Streamed (0 on failure)
 IDataSource *FileSystem::ReadFile(const string &vfn, bool is_text) {
-	string filename = vfn;
-
 	IDataSource *data = checkBuiltinData(vfn, is_text);
 
 	// allow data-override?
@@ -61,7 +59,7 @@ IDataSource *FileSystem::ReadFile(const string &vfn, bool is_text) {
 		return data;
 
 	Common::SeekableReadStream *readStream;
-	if (!rawOpen(readStream, filename))
+	if (!rawOpen(readStream, vfn))
 		return nullptr;
 
 	return new IFileDataSource(readStream);