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

lib/icu/{Converter,Collate}: return AllocatedString

Browse Source
This commit is contained in:
Max Kellermann
2015-06-25 22:43:55 +02:00
parent 037d1d9ad1
commit 8d11577ff2
10 changed files with 64 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/SongFilter.cxx
+8 -7
View File
@@ -23,12 +23,12 @@
#include "DetachedSong.hxx"
#include "tag/Tag.hxx"
#include "util/ConstBuffer.hxx"
#include "util/StringAPI.hxx"
#include "util/ASCII.hxx"
#include "util/UriUtil.hxx"
#include "lib/icu/Collate.hxx"
#include <assert.h>
#include <string.h>
#include <stdlib.h>
#define LOCATE_TAG_FILE_KEY "file"
@@ -55,12 +55,12 @@ locate_parse_type(const char *str)
}
gcc_pure
static std::string
static AllocatedString<>
ImportString(const char *p, bool fold_case)
{
return fold_case
? IcuCaseFold(p)
: std::string(p);
: AllocatedString<>::Duplicate(p);
}
SongFilter::Item::Item(unsigned _tag, const char *_value, bool _fold_case)
@@ -70,7 +70,7 @@ SongFilter::Item::Item(unsigned _tag, const char *_value, bool _fold_case)
}
SongFilter::Item::Item(unsigned _tag, time_t _time)
:tag(_tag), time(_time)
:tag(_tag), value(nullptr), time(_time)
{
}
@@ -85,10 +85,11 @@ SongFilter::Item::StringMatch(const char *s) const
assert(tag != LOCATE_TAG_MODIFIED_SINCE);
if (fold_case) {
const std::string folded = IcuCaseFold(s);
return folded.find(value) != folded.npos;
const auto folded = IcuCaseFold(s);
assert(!folded.IsNull());
return StringFind(folded.c_str(), value.c_str()) != nullptr;
} else {
return s == value;
return StringIsEqual(s, value.c_str());
}
}