Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-06 16:48:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Change various functions to by-value std::string_view args

Browse source
This commit is contained in:
Jon Siwek 2020-01-31 15:07:24 -08:00
parent b0a5eb27b1
commit cd74d6f392
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/util.cc
View file

@ -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;

4
src/util.h
View file

@ -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);