From 35826157aea4ef1e2a9d47d73e1f5a4ab8704dc2 Mon Sep 17 00:00:00 2001 From: "Adam C. Emerson" Date: Tue, 27 Apr 2021 19:31:15 -0400 Subject: [PATCH] common: get_str_vec takes std::string_view Signed-off-by: Adam C. Emerson --- src/common/str_list.cc | 6 +++--- src/include/str_list.h | 11 +++++------ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/common/str_list.cc b/src/common/str_list.cc index 09e00b6702013..6904e8d131f9a 100644 --- a/src/common/str_list.cc +++ b/src/common/str_list.cc @@ -40,7 +40,7 @@ list get_str_list(const string& str, const char *delims) return result; } -void get_str_vec(const string& str, const char *delims, vector& str_vec) +void get_str_vec(std::string_view str, const char *delims, vector& 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& str_vec) }); } -void get_str_vec(const string& str, vector& str_vec) +void get_str_vec(std::string_view str, vector& str_vec) { const char *delims = ";,= \t"; get_str_vec(str, delims, str_vec); } -vector get_str_vec(const string& str, const char *delims) +vector get_str_vec(std::string_view str, const char *delims) { vector result; for_each_substr(str, delims, [&result] (auto token) { diff --git a/src/include/str_list.h b/src/include/str_list.h index 1ca61099a247b..cad76c1d6f551 100644 --- a/src/include/str_list.h +++ b/src/include/str_list.h @@ -54,8 +54,7 @@ std::list 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& str_vec); +void get_str_vec(std::string_view str, std::vector& 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& str_vec); +void get_str_vec(std::string_view str, + const char *delims, + std::vector& str_vec); -std::vector get_str_vec(const std::string& str, +std::vector get_str_vec(std::string_view str, const char *delims = ";,= \t"); /** -- 2.39.5