aboutsummaryrefslogtreecommitdiff
path: root/common/advancedDetector.cpp
diff options
context:
space:
mode:
authorMax Horn2007-02-14 21:59:57 +0000
committerMax Horn2007-02-14 21:59:57 +0000
commit62bd2a1544ef01896ad10565a2a9e96a5a873bfe (patch)
treed5a2977c9d1e53a7d892a5a313e9de4ae495884c /common/advancedDetector.cpp
parent80f799a2b25a5ff353dd572c5aeeb469688102c2 (diff)
downloadscummvm-rg350-62bd2a1544ef01896ad10565a2a9e96a5a873bfe.tar.gz
scummvm-rg350-62bd2a1544ef01896ad10565a2a9e96a5a873bfe.tar.bz2
scummvm-rg350-62bd2a1544ef01896ad10565a2a9e96a5a873bfe.zip
Make use of md5_file_string
svn-id: r25593
Diffstat (limited to 'common/advancedDetector.cpp')
-rw-r--r--common/advancedDetector.cpp17
1 files changed, 5 insertions, 12 deletions
diff --git a/common/advancedDetector.cpp b/common/advancedDetector.cpp
index 6447005c58..9ced59659a 100644
--- a/common/advancedDetector.cpp
+++ b/common/advancedDetector.cpp
@@ -258,7 +258,6 @@ static ADGameDescList detectGame(const FSList *fslist, const Common::ADParams &p
uint i;
char md5str[32+1];
- uint8 md5sum[16];
bool fileMissing;
const ADGameFileDescription *fileDesc;
@@ -295,12 +294,9 @@ static ADGameDescList detectGame(const FSList *fslist, const Common::ADParams &p
if (!filesList.contains(tstr) && !filesList.contains(tstr2)) continue;
- if (!md5_file(*file, md5sum, params.md5Bytes)) continue;
- for (i = 0; i < 16; i++) {
- sprintf(md5str + i*2, "%02x", (int)md5sum[i]);
- }
- filesMD5[tstr] = String(md5str);
- filesMD5[tstr2] = String(md5str);
+ if (!md5_file_string(*file, md5str, params.md5Bytes))
+ continue;
+ filesMD5[tstr] = filesMD5[tstr2] = md5str;
debug(3, "> %s: %s", tstr.c_str(), md5str);
@@ -322,11 +318,8 @@ static ADGameDescList detectGame(const FSList *fslist, const Common::ADParams &p
filesSize[tstr] = filesSize[tstr2] = (int32)testFile.size();
testFile.close();
- if (md5_file(file->_key.c_str(), md5sum, params.md5Bytes)) {
- for (i = 0; i < 16; i++) {
- sprintf(md5str + i*2, "%02x", (int)md5sum[i]);
- }
- filesMD5[tstr] = String(md5str);
+ if (md5_file_string(file->_key.c_str(), md5str, params.md5Bytes)) {
+ filesMD5[tstr] = md5str;
debug(3, "> %s: %s", tstr.c_str(), md5str);
}
}