thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ENGINES: Pass const strings by reference in AdvancedMetaEngineDetection

Browse source
This commit is contained in:
Orgad Shaneh 2022-10-25 13:54:27 +03:00
parent 2d8e5dfa52
commit aa0c0f494f
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
engines/advancedDetector.cpp
View file

@ -517,9 +517,9 @@ static char flagsToMD5Prefix(uint32 flags) {
return 'f'; 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); Common::String hashname = Common::String::format("%c:%s:%d", flagsToMD5Prefix(game.flags), fname.c_str(), _md5Bytes);
if (MD5Man.contains(hashname)) { if (MD5Man.contains(hashname)) {
@ -538,11 +538,11 @@ bool AdvancedMetaEngineDetection::getFileProperties(const FileMap &allFiles, con
return res; 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); 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) { if (game.flags & ADGF_MACRESFORK) {
FileMapArchive fileMapArchive(allFiles); FileMapArchive fileMapArchive(allFiles);

4
engines/advancedDetector.h
View file

@ -460,7 +460,7 @@ protected:
void composeFileHashMap(FileMap &allFiles, const Common::FSList &fslist, int depth, const Common::String &parentName = Common::String()) const; 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. */ /** 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. */ /** Convert an AD game description into the shared game description format. */
virtual DetectedGame toDetectedGame(const ADDetectedGame &adGame, ADDetectedGameExtraInfo *extraInfo = nullptr) const; virtual DetectedGame toDetectedGame(const ADDetectedGame &adGame, ADDetectedGameExtraInfo *extraInfo = nullptr) const;
@ -529,7 +529,7 @@ public:
* *
* Based on @ref MetaEngine::getFileProperties. * 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;
}; };
/** /**