diff options
| author | jade <lix@jade.fyi> | 2024-08-08 22:43:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@localhost> | 2024-08-08 22:43:10 +0000 |
| commit | 757041c3e74787c755b3de826078968119f706d6 (patch) | |
| tree | 9f3ea456c45130fb3a0910f9a9be9f60a74577cc /src/libstore/path.cc | |
| parent | e03cd8b3a6f70c60f359fd683c2b25f8eba4da0d (diff) | |
| parent | 4ed8461cacced97717bf9a7525e12ba69fe168c0 (diff) | |
Merge changes I526cceed,Ia4e2f1fa,I22e66972,I9fbd55a9,Ifca22e44 into main
* changes:
sqlite: add a Use::fromStrNullable
util: implement charptr_cast
tree-wide: fix a pile of lints
refactor: make HashType and Base enum classes for type safety
build: integrate clang-tidy into CI
Diffstat (limited to 'src/libstore/path.cc')
| -rw-r--r-- | src/libstore/path.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstore/path.cc b/src/libstore/path.cc index d029e986b..d4b5fc0dc 100644 --- a/src/libstore/path.cc +++ b/src/libstore/path.cc @@ -46,7 +46,7 @@ StorePath::StorePath(std::string_view _baseName) } StorePath::StorePath(const Hash & hash, std::string_view _name) - : baseName((hash.to_string(Base32, false) + "-").append(std::string(_name))) + : baseName((hash.to_string(Base::Base32, false) + "-").append(std::string(_name))) { checkName(baseName, name()); } @@ -60,7 +60,7 @@ StorePath StorePath::dummy("ffffffffffffffffffffffffffffffff-x"); StorePath StorePath::random(std::string_view name) { - Hash hash(htSHA1); + Hash hash(HashType::SHA1); randombytes_buf(hash.hash, hash.hashSize); return StorePath(hash, name); } |