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

util/AllocatedString: remove Null(), IsNull()

Browse Source
This commit is contained in:
Max Kellermann
2021-01-21 20:07:14 +01:00
parent 67760f5283
commit dc9103befe
5 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/icu/Compare.cxx
View File

@@ -56,7 +56,7 @@ IcuCompare::operator==(const char *haystack) const noexcept
#ifdef HAVE_ICU_CASE_FOLD
return StringIsEqual(IcuCaseFold(haystack).c_str(), needle.c_str());
#elif defined(_WIN32)
if (needle.IsNull())
if (needle == nullptr)
/* the MultiByteToWideChar() call in the constructor
has failed, so let's always fail the comparison */
return false;
@@ -83,7 +83,7 @@ IcuCompare::IsIn(const char *haystack) const noexcept
return StringFind(IcuCaseFold(haystack).c_str(),
needle.c_str()) != nullptr;
#elif defined(_WIN32)
if (needle.IsNull())
if (needle == nullptr)
/* the MultiByteToWideChar() call in the constructor
has failed, so let's always fail the comparison */
return false;

2
src/lib/icu/Compare.hxx
View File

@@ -65,7 +65,7 @@ public:
gcc_pure
operator bool() const noexcept {
return !needle.IsNull();
return needle != nullptr;
}
gcc_pure