From a7cd7425d9341cf8a2c3af80b84cc55e874515c6 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 2 Jul 2020 23:10:11 +0000
Subject: [PATCH] Move `getParsedTypeAndSRI` to a more suitable location

Also mark it static
---
 src/libutil/hash.cc   | 21 +++++++++++++++++++++
 src/libutil/parser.hh | 21 ---------------------
 2 files changed, 21 insertions(+), 21 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;
diff --git a/src/libutil/parser.hh b/src/libutil/parser.hh
index d20e4dfc6..a6a83ce89 100644
--- a/src/libutil/parser.hh
+++ b/src/libutil/parser.hh
@@ -21,26 +21,5 @@ static inline std::optional<std::string_view> splitPrefix(std::string_view & str
     return std::nullopt;
 }
 
-// Mutates the string to eliminate the prefixes when found
-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 std::make_pair(optParsedType, isSRI);
-}
-
 
 }