From 4d3a07b4943fa173b8db93d54d89baa24b35e0c5 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Sun, 7 Nov 2010 17:16:59 +0000 Subject: 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 --- engines/scumm/detection.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'engines/scumm/detection.cpp') 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 &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::Listopen(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::Listsize(); 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... -- cgit v1.2.3