update(userspace/engine): url_is_unix_scheme() util is now is_unix_scheme(string_view)

Also no more custom `starts_with` utility function.

Signed-off-by: Leonardo Di Donato <leodidonato@gmail.com>
This commit is contained in:
Leonardo Di Donato 2020-05-18 14:02:19 +00:00 committed by poiana
parent 75c2275dac
commit 65e069a020
2 changed files with 5 additions and 13 deletions

View File

@ -68,19 +68,11 @@ void readfile(const std::string& filename, std::string& data)
return;
}
bool starts_with(const std::string& text, const std::string& prefix)
{
return prefix.empty() ||
(text.size() >= prefix.size() &&
std::memcmp(text.data(), prefix.data(), prefix.size()) == 0);
}
namespace network
{
bool url_is_unix_scheme(const std::string& url)
bool is_unix_scheme(nonstd::string_view url)
{
return starts_with(url, UNIX_SCHEME);
return url.starts_with(UNIX_SCHEME);
}
} // namespace network
} // namespace utils

View File

@ -21,6 +21,7 @@ limitations under the License.
#include <fstream>
#include <iostream>
#include <string>
#include <nonstd/string_view.hpp>
#pragma once
@ -33,11 +34,10 @@ namespace utils
std::string wrap_text(const std::string& str, uint32_t initial_pos, uint32_t indent, uint32_t line_len);
void readfile(const std::string& filename, std::string& data);
bool starts_with(const std::string& text, const std::string& prefix);
namespace network
{
static const std::string UNIX_SCHEME{"unix://"};
bool url_is_unix_scheme(const std::string& url);
static const std::string UNIX_SCHEME("unix://");
bool is_unix_scheme(nonstd::string_view url);
} // namespace network
} // namespace utils
} // namespace falco