Move `getParsedTypeAndSRI` to a more suitable location

Also mark it static

1 files changed, 21 insertions, 0 deletions

diff --git a/src/libutil/hash.cc b/src/libutil/hash.cc
index 1150e74ed..76fa67086 100644
--- a/src/libutil/hash.cc
+++ b/src/libutil/hash.cc
@@ -144,6 +144,27 @@ Hash Hash::parseSRI(std::string_view original) {
     return Hash(rest, parsedType, true);
 }
 
+// Mutates the string to eliminate the prefixes when found
+static std::pair<std::optional<HashType>, bool> getParsedTypeAndSRI(std::string_view & rest) {
+    bool isSRI = false;
+
+    // Parse the has type before the separater, if there was one.
+    std::optional<HashType> optParsedType;
+    {
+        auto hashRaw = splitPrefix(rest, ':');
+
+        if (!hashRaw) {
+            hashRaw = splitPrefix(rest, '-');
+            if (hashRaw)
+                isSRI = true;
+        }
+        if (hashRaw)
+            optParsedType = parseHashType(*hashRaw);
+    }
+
+    return {optParsedType, isSRI};
+}
+
 Hash Hash::parseAnyPrefixed(std::string_view original)
 {
     auto rest = original;