oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

util/StringUtil: pass std::string_view to StringArrayContainsCase()

Browse Source
This commit is contained in:
Max Kellermann 2020-03-13 20:38:40 +01:00
parent 85b072b3d3
commit b5d1a09010
2 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/util/StringUtil.cxx
View File

@ -18,35 +18,19 @@
*/ */
#include "StringUtil.hxx" #include "StringUtil.hxx"
#include "StringView.hxx" #include "StringCompare.hxx"
#include "CharUtil.hxx" #include "CharUtil.hxx"
#include "ASCII.hxx"
#include <cassert> #include <cassert>
bool bool
StringArrayContainsCase(const char *const*haystack, StringArrayContainsCase(const char *const*haystack,
const char *needle) noexcept std::string_view needle) noexcept
{ {
assert(haystack != nullptr); assert(haystack != nullptr);
assert(needle != nullptr);
for (; *haystack != nullptr; ++haystack) for (; *haystack != nullptr; ++haystack)
if (StringEqualsCaseASCII(*haystack, needle)) if (StringIsEqualIgnoreCase(*haystack, needle))
return true;
return false;
}
bool
StringArrayContainsCase(const char *const*haystack,
StringView needle) noexcept
{
assert(haystack != nullptr);
assert(needle != nullptr);
for (; *haystack != nullptr; ++haystack)
if (needle.EqualsIgnoreCase(*haystack))
return true; return true;
return false; return false;

10
src/util/StringUtil.hxx
View File

@ -23,8 +23,7 @@
#include "Compiler.h" #include "Compiler.h"
#include <cstddef> #include <cstddef>
#include <string_view>
struct StringView;
/** /**
* Checks whether a string array contains the specified string. * Checks whether a string array contains the specified string.
@ -37,12 +36,7 @@ struct StringView;
gcc_pure gcc_pure
bool bool
StringArrayContainsCase(const char *const*haystack, StringArrayContainsCase(const char *const*haystack,
const char *needle) noexcept; std::string_view needle) noexcept;
gcc_pure
bool
StringArrayContainsCase(const char *const*haystack,
StringView needle) noexcept;
/** /**
* Convert the specified ASCII string (0x00..0x7f) to upper case. * Convert the specified ASCII string (0x00..0x7f) to upper case.