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

util/StringView: use StringAPI.hxx

Browse Source
This commit is contained in:
Max Kellermann 2017-09-12 16:56:35 +02:00
parent f71e20d0ce
commit 1fda842ee6
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/util/StringView.hxx
View File

@ -31,8 +31,7 @@
#define STRING_VIEW_HXX #define STRING_VIEW_HXX
#include "ConstBuffer.hxx" #include "ConstBuffer.hxx"
#include "StringAPI.hxx"
#include <string.h>
struct StringView : ConstBuffer<char> { struct StringView : ConstBuffer<char> {
StringView() = default; StringView() = default;
@ -45,7 +44,7 @@ struct StringView : ConstBuffer<char> {
StringView(pointer_type _data) noexcept StringView(pointer_type _data) noexcept
:ConstBuffer(_data, :ConstBuffer(_data,
_data != nullptr ? strlen(_data) : 0) {} _data != nullptr ? StringLength(_data) : 0) {}
constexpr StringView(std::nullptr_t n) noexcept constexpr StringView(std::nullptr_t n) noexcept
:ConstBuffer(n) {} :ConstBuffer(n) {}
@ -61,32 +60,32 @@ struct StringView : ConstBuffer<char> {
gcc_pure gcc_pure
pointer_type Find(value_type ch) const noexcept { pointer_type Find(value_type ch) const noexcept {
return (pointer_type)memchr(data, ch, size); return StringFind(data, ch, size);
} }
gcc_pure gcc_pure
bool StartsWith(StringView needle) const noexcept { bool StartsWith(StringView needle) const noexcept {
return size >= needle.size && return size >= needle.size &&
memcmp(data, needle.data, needle.size) == 0; StringIsEqual(data, needle.data, needle.size);
} }
gcc_pure gcc_pure
bool EndsWith(StringView needle) const noexcept { bool EndsWith(StringView needle) const noexcept {
return size >= needle.size && return size >= needle.size &&
memcmp(data + size - needle.size, StringIsEqual(data + size - needle.size,
needle.data, needle.size) == 0; needle.data, needle.size);
} }
gcc_pure gcc_pure
bool Equals(StringView other) const noexcept { bool Equals(StringView other) const noexcept {
return size == other.size && return size == other.size &&
memcmp(data, other.data, size) == 0; StringIsEqual(data, other.data, size);
} }
gcc_pure gcc_pure
bool EqualsIgnoreCase(StringView other) const noexcept { bool EqualsIgnoreCase(StringView other) const noexcept {
return size == other.size && return size == other.size &&
strncasecmp(data, other.data, size) == 0; StringIsEqualIgnoreCase(data, other.data, size);
} }
/** /**