max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-10 08:16:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #8125 from vaci/vaci/hash_to_string_copy

Browse source 
Avoid a string copy during Hash::to_string
This commit is contained in:
Eelco Dolstra 2023-03-29 12:27:35 +02:00 committed by GitHub
commit 10dc2e2e7c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/libutil/hash.cc
View file

@ -71,12 +71,13 @@ const std::string base16Chars = "0123456789abcdef";
static std::string printHash16(const Hash & hash)
{
char buf[hash.hashSize * 2];
std::string buf;
buf.reserve(hash.hashSize * 2);
for (unsigned int i = 0; i < hash.hashSize; i++) {
buf[i * 2] = base16Chars[hash.hash[i] >> 4];
buf[i * 2 + 1] = base16Chars[hash.hash[i] & 0x0f];
buf.push_back(base16Chars[hash.hash[i] >> 4]);
buf.push_back(base16Chars[hash.hash[i] & 0x0f]);
}
return std::string(buf, hash.hashSize * 2);
return buf;
}
@ -130,7 +131,7 @@ std::string Hash::to_string(Base base, bool includeType) const
break;
case Base64:
case SRI:
s += base64Encode(std::string((const char *) hash, hashSize));
s += base64Encode(std::string_view((const char *) hash, hashSize));
break;
}
return s;
@ -403,7 +404,7 @@ HashType parseHashType(std::string_view s)
throw UsageError("unknown hash algorithm '%1%'", s);
}
std::string printHashType(HashType ht)
std::string_view printHashType(HashType ht)
{
switch (ht) {
case htMD5: return "md5";

2
src/libutil/hash.hh
View file

@ -133,7 +133,7 @@ HashType parseHashType(std::string_view s);
std::optional<HashType> parseHashTypeOpt(std::string_view s);
/* And the reverse. */
std::string printHashType(HashType ht);
std::string_view printHashType(HashType ht);
union Ctx;