projects
/
cumulus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Byte/string handling fixes for Python 3.
[cumulus.git]
/
hash.cc
diff --git
a/hash.cc
b/hash.cc
index
7e2087a
..
571bc1d
100644
(file)
--- a/
hash.cc
+++ b/
hash.cc
@@
-32,7
+32,6
@@
static map<string, Hash *(*)()> hash_registry;
void Hash::Register(const std::string& name, Hash *(*constructor)())
{
void Hash::Register(const std::string& name, Hash *(*constructor)())
{
- printf("Registered hash algorithm %s\n", name.c_str());
hash_registry.insert(make_pair(name, constructor));
}
hash_registry.insert(make_pair(name, constructor));
}
@@
-50,6
+49,17
@@
Hash *Hash::New(const std::string& name)
return constructor();
}
return constructor();
}
+std::string Hash::hash_file(const char *filename)
+{
+ string result;
+ Hash *hash = Hash::New();
+ if (hash->update_from_file(filename))
+ result = hash->digest_str();
+
+ delete hash;
+ return result;
+}
+
bool Hash::update_from_file(const char *filename)
{
FILE *f = fopen(filename, "rb");
bool Hash::update_from_file(const char *filename)
{
FILE *f = fopen(filename, "rb");