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

util/StringCompare: use std::string_view instead of StringView

Browse Source
This commit is contained in:
Max Kellermann
2022-05-31 13:18:42 +02:00
parent 759da033fc
commit d256d3dabe
9 changed files with 35 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/StringCompare.hxx
+18 -18
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2013-2021 Max Kellermann <max.kellermann@gmail.com>
* Copyright 2013-2022 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -30,7 +30,6 @@
#ifndef STRING_COMPARE_HXX
#define STRING_COMPARE_HXX
#include "StringView.hxx"
#include "StringAPI.hxx"
#ifdef _UNICODE
@@ -64,9 +63,9 @@ StringIsEqualIgnoreCase(std::string_view a, std::string_view b) noexcept
[[gnu::pure]] [[gnu::nonnull]]
static inline bool
StringStartsWith(const char *haystack, StringView needle) noexcept
StringStartsWith(const char *haystack, std::string_view needle) noexcept
{
return StringIsEqual(haystack, needle.data, needle.size);
return StringIsEqual(haystack, needle.data(), needle.size());
}
[[gnu::pure]] [[gnu::nonnull]]
@@ -84,26 +83,27 @@ StringEndsWithIgnoreCase(const char *haystack, const char *needle) noexcept;
*/
[[gnu::pure]] [[gnu::nonnull]]
static inline const char *
StringAfterPrefix(const char *haystack, StringView needle) noexcept
StringAfterPrefix(const char *haystack, std::string_view needle) noexcept
{
return StringStartsWith(haystack, needle)
? haystack + needle.size
? haystack + needle.size()
: nullptr;
}
[[gnu::pure]] [[gnu::nonnull]]
static inline bool
StringStartsWithIgnoreCase(const char *haystack, StringView needle) noexcept
StringStartsWithIgnoreCase(const char *haystack, std::string_view needle) noexcept
{
return StringIsEqualIgnoreCase(haystack, needle.data, needle.size);
return StringIsEqualIgnoreCase(haystack, needle.data(), needle.size());
}
[[gnu::pure]]
static inline bool
StringStartsWithIgnoreCase(StringView haystack, StringView needle) noexcept
StringStartsWithIgnoreCase(std::string_view haystack, std::string_view needle) noexcept
{
return haystack.size >= needle.size &&
StringIsEqualIgnoreCase(haystack.data, needle.data, needle.size);
return haystack.size() >= needle.size() &&
StringIsEqualIgnoreCase(haystack.data(),
needle.data(), needle.size());
}
/**
@@ -114,21 +114,21 @@ StringStartsWithIgnoreCase(StringView haystack, StringView needle) noexcept
*/
[[gnu::pure]] [[gnu::nonnull]]
static inline const char *
StringAfterPrefixIgnoreCase(const char *haystack, StringView needle) noexcept
StringAfterPrefixIgnoreCase(const char *haystack, std::string_view needle) noexcept
{
return StringStartsWithIgnoreCase(haystack, needle)
? haystack + needle.size
? haystack + needle.size()
: nullptr;
}
[[gnu::pure]]
static inline StringView
StringAfterPrefixIgnoreCase(StringView haystack,
StringView needle) noexcept
static inline std::string_view
StringAfterPrefixIgnoreCase(std::string_view haystack,
std::string_view needle) noexcept
{
return StringStartsWithIgnoreCase(haystack, needle)
? haystack.substr(needle.size)
: nullptr;
? haystack.substr(needle.size())
: std::string_view{};
}
/**