aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlo Nucera <carlo.nucera@protonmail.com>2020-07-01 18:03:22 -0400
committerCarlo Nucera <carlo.nucera@protonmail.com>2020-07-01 18:03:35 -0400
commitc8c4bcf90e065b47c3ee2984b1f8ff696da889af (patch)
tree921a51a4dd6e09bae2de8bcb266cd7bc67411f8d
parentd63a5ded76079008b09256aa36ef0c222919e8fa (diff)
Inline Hash::init()
-rw-r--r--src/libutil/hash.cc2
-rw-r--r--src/libutil/hash.hh4
2 files changed, 2 insertions, 4 deletions
diff --git a/src/libutil/hash.cc b/src/libutil/hash.cc
index 448eb25f9..2087e3464 100644
--- a/src/libutil/hash.cc
+++ b/src/libutil/hash.cc
@@ -27,7 +27,7 @@ static size_t regularHashSize(HashType type) {
abort();
}
-void Hash::init()
+Hash::Hash(HashType type) : type(type)
{
hashSize = regularHashSize(type);
assert(hashSize <= maxHashSize);
diff --git a/src/libutil/hash.hh b/src/libutil/hash.hh
index 887952ce5..766009438 100644
--- a/src/libutil/hash.hh
+++ b/src/libutil/hash.hh
@@ -32,7 +32,7 @@ struct Hash
HashType type;
/* Create a zero-filled hash object. */
- Hash(HashType type) : type(type) { init(); };
+ Hash(HashType type);
/* Initialize the hash from a string representation, in the format
"[<type>:]<base16|base32|base64>" or "<type>-<base64>" (a
@@ -49,8 +49,6 @@ private:
// type must be provided, s must not include <type> prefix
Hash(std::string_view s, std::pair<HashType, bool> typeAndSRI);
- void init();
-
public:
/* Check whether a hash is set. */
operator bool () const { return (bool) type; }