Paranoia changes (shouldn't have any real effect, though...)

svn-id: r26972
This commit is contained in:
Max Horn 2007-05-27 12:43:06 +00:00
parent e2af13a7f6
commit 3144ab58a6
2 changed files with 10 additions and 9 deletions

View File

@ -301,37 +301,37 @@ bool md5_file(ReadStream &stream, uint8 digest[16], uint32 length) {
return true;
}
bool md5_file_string(const FilesystemNode &file, char md5str[32+1], uint32 length) {
bool md5_file_string(const FilesystemNode &file, char *md5str, uint32 length) {
uint8 digest[16];
if (!md5_file(file, digest, length))
return false;
for (int i = 0; i < 16; i++) {
sprintf(md5str + i*2, "%02x", (int)digest[i]);
snprintf(md5str + i*2, 3, "%02x", (int)digest[i]);
}
return true;
}
bool md5_file_string(const char *name, char md5str[32+1], uint32 length) {
bool md5_file_string(const char *name, char *md5str, uint32 length) {
uint8 digest[16];
if (!md5_file(name, digest, length))
return false;
for (int i = 0; i < 16; i++) {
sprintf(md5str + i*2, "%02x", (int)digest[i]);
snprintf(md5str + i*2, 3, "%02x", (int)digest[i]);
}
return true;
}
bool md5_file_string(ReadStream &stream, char md5str[32+1], uint32 length) {
bool md5_file_string(ReadStream &stream, char *md5str, uint32 length) {
uint8 digest[16];
if (!md5_file(stream, digest, length))
return false;
for (int i = 0; i < 16; i++) {
sprintf(md5str + i*2, "%02x", (int)digest[i]);
snprintf(md5str + i*2, 3, "%02x", (int)digest[i]);
}
return true;

View File

@ -35,9 +35,10 @@ bool md5_file(ReadStream &stream, uint8 digest[16], uint32 length = 0);
// The following two methods work similar to the above two, but
// instead of computing the binary MD5 digest, they produce
// a human readable lowercase hexstring representing the digest.
bool md5_file_string(const char *name, char md5str[32+1], uint32 length = 0);
bool md5_file_string(const FilesystemNode &file, char md5str[32+1], uint32 length = 0);
bool md5_file_string(ReadStream &stream, char md5str[32+1], uint32 length = 0);
// The md5str parameter must point to a buffer of 32+1 chars.
bool md5_file_string(const char *name, char *md5str, uint32 length = 0);
bool md5_file_string(const FilesystemNode &file, char *md5str, uint32 length = 0);
bool md5_file_string(ReadStream &stream, char *md5str, uint32 length = 0);
} // End of namespace Common