From cd74d6f39262c7d1db1ee0daf8f258c4fdc58a0f Mon Sep 17 00:00:00 2001
From: Jon Siwek <jsiwek@corelight.com>
Date: Fri, 31 Jan 2020 15:07:24 -0800
Subject: [PATCH] Change various functions to by-value std::string_view args

---
 src/util.cc | 12 ++++++------
 src/util.h  |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/util.cc b/src/util.cc
index 51bfc8639c..de3bacbe9d 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -63,7 +63,7 @@
 #endif
 #endif
 
-static bool starts_with(const std::string_view& s, const std::string& beginning)
+static bool starts_with(std::string_view s, std::string_view beginning)
 	{
 	if ( beginning.size() > s.size() )
 		return false;
@@ -78,7 +78,7 @@ TEST_CASE("util starts_with")
 	CHECK(starts_with("abcde", "abcedf") == false);
 	}
 
-static bool ends_with(const std::string_view& s, const std::string& ending)
+static bool ends_with(std::string_view s, std::string_view ending)
 	{
 	if ( ending.size() > s.size() )
 		return false;
@@ -1315,7 +1315,7 @@ TEST_CASE("util is_package_loader")
 
 const array<string, 2> script_extensions = {".zeek", ".bro"};
 
-void warn_if_legacy_script(const std::string_view& filename)
+void warn_if_legacy_script(std::string_view filename)
 	{
 	if ( ends_with(filename, ".bro") )
 		{
@@ -1541,7 +1541,7 @@ TEST_CASE("util tokenize_string")
 	CHECK(svs == expect);
 	}
 
-vector<string>* tokenize_string(const std::string_view input, const std::string_view delim,
+vector<string>* tokenize_string(std::string_view input, std::string_view delim,
                                 vector<string>* rval, int limit)
 	{
 	if ( ! rval )
@@ -1565,7 +1565,7 @@ vector<string>* tokenize_string(const std::string_view input, const std::string_
 	return rval;
 	}
 
-vector<std::string_view> tokenize_string(const std::string_view input, const char delim) noexcept
+vector<std::string_view> tokenize_string(std::string_view input, const char delim) noexcept
 	{
 	vector<std::string_view> rval;
 
@@ -1609,7 +1609,7 @@ TEST_CASE("util normalize_path")
 	CHECK(normalize_path("zeek/../..") == "..");
 	}
 
-string normalize_path(const std::string_view path)
+string normalize_path(std::string_view path)
 	{
 	size_t n;
 	vector<std::string_view> final_components;
diff --git a/src/util.h b/src/util.h
index bd2447c23f..a8e23f39ef 100644
--- a/src/util.h
+++ b/src/util.h
@@ -150,7 +150,7 @@ std::vector<std::string>* tokenize_string(std::string_view input,
 					  std::string_view delim,
 					  std::vector<std::string>* rval = 0, int limit = 0);
 
-std::vector<std::string_view> tokenize_string(const std::string_view input, const char delim) noexcept;
+std::vector<std::string_view> tokenize_string(std::string_view input, const char delim) noexcept;
 
 extern char* copy_string(const char* s);
 extern int streq(const char* s1, const char* s2);
@@ -278,7 +278,7 @@ extern std::string bro_prefixes();
 extern const std::array<std::string, 2> script_extensions;
 
 /** Prints a warning if the filename ends in .bro. */
-void warn_if_legacy_script(const std::string_view& filename);
+void warn_if_legacy_script(std::string_view filename);
 
 bool is_package_loader(const std::string& path);