aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarlo Nucera <carlo.nucera@protonmail.com>2020-07-02 11:11:18 -0400
committerCarlo Nucera <carlo.nucera@protonmail.com>2020-07-02 11:11:18 -0400
commit9462d8a50b5443bc2dac616f94ded9ad37020094 (patch)
tree4bed8b3e45d8d1c160ce3f2d9af241b7164bc7a8 /src
parentf61bc45d192809a040a359b22f3dbd0722613af6 (diff)
Rename fromSRI to parseSRI for constistency
Diffstat (limited to 'src')
-rw-r--r--src/libfetchers/fetchers.cc2
-rw-r--r--src/libfetchers/tarball.cc4
-rw-r--r--src/libutil/hash.cc2
-rw-r--r--src/libutil/hash.hh2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/libfetchers/fetchers.cc b/src/libfetchers/fetchers.cc
index 91d0d6a1d..b1782feab 100644
--- a/src/libfetchers/fetchers.cc
+++ b/src/libfetchers/fetchers.cc
@@ -35,7 +35,7 @@ std::unique_ptr<Input> inputFromAttrs(const Attrs & attrs)
auto res = inputScheme->inputFromAttrs(attrs2);
if (res) {
if (auto narHash = maybeGetStrAttr(attrs, "narHash"))
- res->narHash = Hash::fromSRI(*narHash);
+ res->narHash = Hash::parseSRI(*narHash);
return res;
}
}
diff --git a/src/libfetchers/tarball.cc b/src/libfetchers/tarball.cc
index 732fac8c3..6ca51269b 100644
--- a/src/libfetchers/tarball.cc
+++ b/src/libfetchers/tarball.cc
@@ -242,13 +242,13 @@ struct TarballInputScheme : InputScheme
auto hash = input->url.query.find("hash");
if (hash != input->url.query.end()) {
- input->hash = Hash::fromSRI(hash->second);
+ input->hash = Hash::parseSRI(hash->second);
input->url.query.erase(hash);
}
auto narHash = input->url.query.find("narHash");
if (narHash != input->url.query.end()) {
- input->narHash = Hash::fromSRI(narHash->second);
+ input->narHash = Hash::parseSRI(narHash->second);
input->url.query.erase(narHash);
}
diff --git a/src/libutil/hash.cc b/src/libutil/hash.cc
index 2f006ce1e..a077d40a0 100644
--- a/src/libutil/hash.cc
+++ b/src/libutil/hash.cc
@@ -132,7 +132,7 @@ std::string Hash::to_string(Base base, bool includeType) const
return s;
}
-Hash Hash::fromSRI(std::string_view original) {
+Hash Hash::parseSRI(std::string_view original) {
auto rest = original;
// Parse the has type before the separater, if there was one.
diff --git a/src/libutil/hash.hh b/src/libutil/hash.hh
index 4e3591a04..d321cc8e1 100644
--- a/src/libutil/hash.hh
+++ b/src/libutil/hash.hh
@@ -45,7 +45,7 @@ struct Hash
// prefix parsed separately; non SRI hash
static Hash parseAnyUnprefixed(std::string_view s, HashType type);
- static Hash fromSRI(std::string_view original);
+ static Hash parseSRI(std::string_view original);
private:
// type must be provided, s must not include <type> prefix