diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2013-11-15 17:51:29 -0800 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2013-11-15 17:51:29 -0800 |
| commit | f906959a09d58c85d87b445fd1791d91bf278bfa (patch) | |
| tree | b65282b2c731d4eb2157ae719828cddf6b086943 /src/common/md5calc.cpp | |
| parent | 1fb7ce5a604db78c4d02f719053827269705ce13 (diff) | |
| download | tmwa-f906959a09d58c85d87b445fd1791d91bf278bfa.tar.gz tmwa-f906959a09d58c85d87b445fd1791d91bf278bfa.tar.bz2 tmwa-f906959a09d58c85d87b445fd1791d91bf278bfa.tar.xz tmwa-f906959a09d58c85d87b445fd1791d91bf278bfa.zip | |
Use new IO classes
Diffstat (limited to 'src/common/md5calc.cpp')
| -rw-r--r-- | src/common/md5calc.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/common/md5calc.cpp b/src/common/md5calc.cpp index 1961fa6..70b0e1f 100644 --- a/src/common/md5calc.cpp +++ b/src/common/md5calc.cpp @@ -5,6 +5,8 @@ #include "../strings/xstring.hpp" #include "../strings/vstring.hpp" +#include "../io/read.hpp" + #include "cxxstdio.hpp" #include "random.hpp" #include "utils.hpp" @@ -234,7 +236,7 @@ MD5_state MD5_from_string(XString msg) // TODO - refactor MD5 into a stream, and merge the implementations // I once implemented an ostream that does it ... -MD5_state MD5_from_FILE(FILE* in) +MD5_state MD5_from_FILE(io::ReadFile& in) { uint64_t total_len = 0; @@ -248,7 +250,7 @@ MD5_state MD5_from_FILE(FILE* in) while (true) { - size_t rv = fread(buf + block_len, 1, 0x40 - block_len, in); + size_t rv = in.get(sign_cast<char *>(buf + block_len), 0x40 - block_len); if (!rv) break; total_len += 8 * rv; // in bits |