From: Adam C. Emerson <aemerson@redhat.com>
Date: Tue, 27 Apr 2021 23:31:15 +0000 (-0400)
Subject: common: get_str_vec takes std::string_view
X-Git-Tag: v18.0.0~787^2~97
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=826fe361fb2642567cf4c1fbc881926d9ef4a4c8;p=ceph.git

common: get_str_vec takes std::string_view

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
---

diff --git a/src/common/str_list.cc b/src/common/str_list.cc
index 09e00b670201..6904e8d131f9 100644
--- a/src/common/str_list.cc
+++ b/src/common/str_list.cc
@@ -40,7 +40,7 @@ list<string> get_str_list(const string& str, const char *delims)
   return result;
 }
 
-void get_str_vec(const string& str, const char *delims, vector<string>& str_vec)
+void get_str_vec(std::string_view str, const char *delims, vector<string>& str_vec)
 {
   str_vec.clear();
   for_each_substr(str, delims, [&str_vec] (auto token) {
@@ -48,13 +48,13 @@ void get_str_vec(const string& str, const char *delims, vector<string>& str_vec)
     });
 }
 
-void get_str_vec(const string& str, vector<string>& str_vec)
+void get_str_vec(std::string_view str, vector<string>& str_vec)
 {
   const char *delims = ";,= \t";
   get_str_vec(str, delims, str_vec);
 }
 
-vector<string> get_str_vec(const string& str, const char *delims)
+vector<string> get_str_vec(std::string_view str, const char *delims)
 {
   vector<string> result;
   for_each_substr(str, delims, [&result] (auto token) {
diff --git a/src/include/str_list.h b/src/include/str_list.h
index 1ca61099a247..cad76c1d6f55 100644
--- a/src/include/str_list.h
+++ b/src/include/str_list.h
@@ -54,8 +54,7 @@ std::list<std::string> get_str_list(const std::string& str,
  * @param [in] str String to split and save as Vector
  * @param [out] str_vec Vector modified containing str after it has been split
 **/
-extern void get_str_vec(const std::string& str,
-			 std::vector<std::string>& str_vec);
+void get_str_vec(std::string_view str, std::vector<std::string>& str_vec);
 
 /**
  * Split **str** into a vector of strings, using the **delims** delimiters and output the result in **str_vec**.
@@ -64,11 +63,11 @@ extern void get_str_vec(const std::string& str,
  * @param [in] delims characters used to split **str**
  * @param [out] str_vec Vector modified containing str after it has been split
 **/
-extern void get_str_vec(const std::string& str,
-                         const char *delims,
-			 std::vector<std::string>& str_vec);
+void get_str_vec(std::string_view str,
+                 const char *delims,
+                 std::vector<std::string>& str_vec);
 
-std::vector<std::string> get_str_vec(const std::string& str,
+std::vector<std::string> get_str_vec(std::string_view str,
                                      const char *delims = ";,= \t");
 
 /**