[Scummvm-git-logs] scummvm master -> aa0c0f494fbaffb29f93bf14297d9e1ac7625f8c
orgads
noreply at scummvm.org
Tue Oct 25 10:55:38 UTC 2022
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:
aa0c0f494f ENGINES: Pass const strings by reference in AdvancedMetaEngineDetection
Commit: aa0c0f494fbaffb29f93bf14297d9e1ac7625f8c
https://github.com/scummvm/scummvm/commit/aa0c0f494fbaffb29f93bf14297d9e1ac7625f8c
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2022-10-25T13:55:13+03:00
Commit Message:
ENGINES: Pass const strings by reference in AdvancedMetaEngineDetection
Changed paths:
engines/advancedDetector.cpp
engines/advancedDetector.h
diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp
index 8e72a9703a1..6f455e0e69e 100644
--- a/engines/advancedDetector.cpp
+++ b/engines/advancedDetector.cpp
@@ -517,9 +517,9 @@ static char flagsToMD5Prefix(uint32 flags) {
return 'f';
}
-static bool getFilePropertiesIntern(uint md5Bytes, const AdvancedMetaEngine::FileMap &allFiles, const ADGameDescription &game, const Common::String fname, FileProperties &fileProps);
+static bool getFilePropertiesIntern(uint md5Bytes, const AdvancedMetaEngine::FileMap &allFiles, const ADGameDescription &game, const Common::String &fname, FileProperties &fileProps);
-bool AdvancedMetaEngineDetection::getFileProperties(const FileMap &allFiles, const ADGameDescription &game, const Common::String fname, FileProperties &fileProps) const {
+bool AdvancedMetaEngineDetection::getFileProperties(const FileMap &allFiles, const ADGameDescription &game, const Common::String &fname, FileProperties &fileProps) const {
Common::String hashname = Common::String::format("%c:%s:%d", flagsToMD5Prefix(game.flags), fname.c_str(), _md5Bytes);
if (MD5Man.contains(hashname)) {
@@ -538,11 +538,11 @@ bool AdvancedMetaEngineDetection::getFileProperties(const FileMap &allFiles, con
return res;
}
-bool AdvancedMetaEngine::getFilePropertiesExtern(uint md5Bytes, const FileMap &allFiles, const ADGameDescription &game, const Common::String fname, FileProperties &fileProps) const {
+bool AdvancedMetaEngine::getFilePropertiesExtern(uint md5Bytes, const FileMap &allFiles, const ADGameDescription &game, const Common::String &fname, FileProperties &fileProps) const {
return getFilePropertiesIntern(md5Bytes, allFiles, game, fname, fileProps);
}
-static bool getFilePropertiesIntern(uint md5Bytes, const AdvancedMetaEngine::FileMap &allFiles, const ADGameDescription &game, const Common::String fname, FileProperties &fileProps) {
+static bool getFilePropertiesIntern(uint md5Bytes, const AdvancedMetaEngine::FileMap &allFiles, const ADGameDescription &game, const Common::String &fname, FileProperties &fileProps) {
if (game.flags & ADGF_MACRESFORK) {
FileMapArchive fileMapArchive(allFiles);
diff --git a/engines/advancedDetector.h b/engines/advancedDetector.h
index 0b74dbb0b34..5aa2e5046de 100644
--- a/engines/advancedDetector.h
+++ b/engines/advancedDetector.h
@@ -460,7 +460,7 @@ protected:
void composeFileHashMap(FileMap &allFiles, const Common::FSList &fslist, int depth, const Common::String &parentName = Common::String()) const;
/** Get the properties (size and MD5) of this file. */
- bool getFileProperties(const FileMap &allFiles, const ADGameDescription &game, const Common::String fname, FileProperties &fileProps) const;
+ bool getFileProperties(const FileMap &allFiles, const ADGameDescription &game, const Common::String &fname, FileProperties &fileProps) const;
/** Convert an AD game description into the shared game description format. */
virtual DetectedGame toDetectedGame(const ADDetectedGame &adGame, ADDetectedGameExtraInfo *extraInfo = nullptr) const;
@@ -529,7 +529,7 @@ public:
*
* Based on @ref MetaEngine::getFileProperties.
*/
- bool getFilePropertiesExtern(uint md5Bytes, const FileMap &allFiles, const ADGameDescription &game, const Common::String fname, FileProperties &fileProps) const;
+ bool getFilePropertiesExtern(uint md5Bytes, const FileMap &allFiles, const ADGameDescription &game, const Common::String &fname, FileProperties &fileProps) const;
};
/**
More information about the Scummvm-git-logs
mailing list