wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 16:51:15 +02:00
Code Activity

treewide: Reference HashFormat members with scope

Browse source 
Base* -> HashFormat::Base*
This commit is contained in:
Yueh-Shun Li 2023-10-13 09:48:15 +08:00
parent 5043e6cf4e
commit e026f3e1ae
37 changed files with 108 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/libutil/hash.cc
View file

@ -111,26 +111,26 @@ static std::string printHash32(const Hash & hash)
std::string printHash16or32(const Hash & hash)
{
assert(hash.type);
return hash.to_string(hash.type == htMD5 ? Base16 : Base32, false);
return hash.to_string(hash.type == htMD5 ? HashFormat::Base16 : HashFormat::Base32, false);
}
std::string Hash::to_string(HashFormat hashFormat, bool includeType) const
{
std::string s;
if (hashFormat == SRI || includeType) {
if (hashFormat == HashFormat::SRI || includeType) {
s += printHashType(type);
s += hashFormat == SRI ? '-' : ':';
s += hashFormat == HashFormat::SRI ? '-' : ':';
}
switch (hashFormat) {
case Base16:
case HashFormat::Base16:
s += printHash16(*this);
break;
case Base32:
case HashFormat::Base32:
s += printHash32(*this);
break;
case Base64:
case SRI:
case HashFormat::Base64:
case HashFormat::SRI:
s += base64Encode(std::string_view((const char *) hash, hashSize));
break;
}
@ -267,7 +267,7 @@ Hash newHashAllowEmpty(std::string_view hashStr, std::optional<HashType> ht)
if (!ht)
throw BadHash("empty hash requires explicit hash type");
Hash h(*ht);
warn("found empty hash, assuming '%s'", h.to_string(SRI, true));
warn("found empty hash, assuming '%s'", h.to_string(HashFormat::SRI, true));
return h;
} else
return Hash::parseAny(hashStr, ht);