aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorMax Horn2006-04-16 12:50:39 +0000
committerMax Horn2006-04-16 12:50:39 +0000
commitba1b25305eb824f89f4dfa153f8022c5c5f4e798 (patch)
treed9890c75367bc3a3e3b77b43a84de47bf2b86abb /common
parent856b1b0bf4864252434b612dec1f01100a2e9c5c (diff)
downloadscummvm-rg350-ba1b25305eb824f89f4dfa153f8022c5c5f4e798.tar.gz
scummvm-rg350-ba1b25305eb824f89f4dfa153f8022c5c5f4e798.tar.bz2
scummvm-rg350-ba1b25305eb824f89f4dfa153f8022c5c5f4e798.zip
Removed the directory parameter from md5_file
svn-id: r21937
Diffstat (limited to 'common')
-rw-r--r--common/file.cpp1
-rw-r--r--common/md5.cpp4
-rw-r--r--common/md5.h2
3 files changed, 3 insertions, 4 deletions
diff --git a/common/file.cpp b/common/file.cpp
index 00707c4f7e..ec4dca0594 100644
--- a/common/file.cpp
+++ b/common/file.cpp
@@ -198,7 +198,6 @@ bool File::open(const String &filename, AccessMode mode, const char *directory)
clearIOFailed();
String fname(filename);
-
fname.toLowercase();
const char *modeStr = (mode == kFileReadMode) ? "rb" : "wb";
diff --git a/common/md5.cpp b/common/md5.cpp
index 9d42c4bd61..78d844a706 100644
--- a/common/md5.cpp
+++ b/common/md5.cpp
@@ -233,7 +233,7 @@ void md5_finish(md5_context *ctx, uint8 digest[16]) {
PUT_UINT32(ctx->state[3], digest, 12);
}
-bool md5_file(const char *name, uint8 digest[16], const char *directory, uint32 length) {
+bool md5_file(const char *name, uint8 digest[16], uint32 length) {
File f;
md5_context ctx;
int i;
@@ -241,7 +241,7 @@ bool md5_file(const char *name, uint8 digest[16], const char *directory, uint32
bool restricted = (length != 0);
int readlen;
- f.open(name, File::kFileReadMode, directory);
+ f.open(name);
if (!f.isOpen()) {
warning("md5_file couldn't open '%s'", name);
return false;
diff --git a/common/md5.h b/common/md5.h
index be1e8214b1..b8e4a95464 100644
--- a/common/md5.h
+++ b/common/md5.h
@@ -36,7 +36,7 @@ void md5_starts(md5_context *ctx);
void md5_update(md5_context *ctx, const uint8 *input, uint32 length);
void md5_finish(md5_context *ctx, uint8 digest[16]);
-bool md5_file(const char *name, uint8 digest[16], const char *directory = NULL, uint32 length = 0);
+bool md5_file(const char *name, uint8 digest[16], uint32 length = 0);
} // End of namespace Common