diff options
| author | Max Horn | 2010-11-07 17:16:59 +0000 |
|---|---|---|
| committer | Max Horn | 2010-11-07 17:16:59 +0000 |
| commit | 4d3a07b4943fa173b8db93d54d89baa24b35e0c5 (patch) | |
| tree | 124287f718ce17d9c6dcafb9331eab7d8d9b405d /engines/scumm/detection.cpp | |
| parent | 036e88d382f653fd8590bb2edec2e45072f9d0be (diff) | |
| download | scummvm-rg350-4d3a07b4943fa173b8db93d54d89baa24b35e0c5.tar.gz scummvm-rg350-4d3a07b4943fa173b8db93d54d89baa24b35e0c5.tar.bz2 scummvm-rg350-4d3a07b4943fa173b8db93d54d89baa24b35e0c5.zip | |
COMMON: Rename and tweak MD5 functions
* names now comply to our naming conventions
* the function computeStreamMD5AsString which computes the MD5
as a hex string now returns it as a Common::String
* add doxygen comments
svn-id: r54121
Diffstat (limited to 'engines/scumm/detection.cpp')
| -rw-r--r-- | engines/scumm/detection.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp index 467282bd43..10224d997d 100644 --- a/engines/scumm/detection.cpp +++ b/engines/scumm/detection.cpp @@ -422,7 +422,6 @@ static void composeFileHashMap(const Common::FSList &fslist, DescMap &fileMD5Map static void detectGames(const Common::FSList &fslist, Common::List<DetectorResult> &results, const char *gameid) { DescMap fileMD5Map; DetectorResult dr; - char md5str[32+1]; // Dive one level down since mac indy3/loom has its files split into directories. See Bug #1438631 composeFileHashMap(fslist, fileMD5Map, 2, directoryGlobs); @@ -479,10 +478,13 @@ static void detectGames(const Common::FSList &fslist, Common::List<DetectorResul tmp->open(d.node); } - if (tmp && tmp->isOpen() && Common::md5_file_string(*tmp, md5str, kMD5FileSizeLimit)) { + Common::String md5str; + if (tmp && tmp->isOpen()) + md5str = computeStreamMD5AsString(*tmp, kMD5FileSizeLimit); + if (!md5str.empty()) { d.md5 = md5str; - d.md5Entry = findInMD5Table(md5str); + d.md5Entry = findInMD5Table(md5str.c_str()); dr.md5 = d.md5; @@ -494,7 +496,7 @@ static void detectGames(const Common::FSList &fslist, Common::List<DetectorResul int filesize = tmp->size(); if (d.md5Entry->filesize != filesize) debug(1, "SCUMM detector found matching file '%s' with MD5 %s, size %d\n", - file.c_str(), md5str, filesize); + file.c_str(), md5str.c_str(), filesize); // Sanity check: We *should* have found a matching gameid / variant at this point. // If not, then there's a bug in our data tables... |