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

icu/Collate: UCharFromUTF8() returns WritableBuffer<UChar>

Browse Source
This commit is contained in:
Max Kellermann 2014-05-12 14:39:40 +02:00
parent 1395794923
commit 317a98a5a9
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/lib/icu/Collate.cxx
View File

@ -22,6 +22,7 @@
#ifdef HAVE_ICU #ifdef HAVE_ICU
#include "Error.hxx" #include "Error.hxx"
#include "util/WritableBuffer.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"
@ -74,18 +75,18 @@ IcuCollateFinish()
#ifdef HAVE_ICU #ifdef HAVE_ICU
static UChar * static WritableBuffer<UChar>
UCharFromUTF8(const char *src, int32_t *dest_length) UCharFromUTF8(const char *src)
{ {
assert(src != nullptr); assert(src != nullptr);
const size_t src_length = strlen(src); const size_t src_length = strlen(src);
size_t dest_capacity = src_length + 1; const size_t dest_capacity = src_length;
UChar *dest = new UChar[dest_capacity]; UChar *dest = new UChar[dest_capacity];
UErrorCode error_code = U_ZERO_ERROR; UErrorCode error_code = U_ZERO_ERROR;
u_strFromUTF8(dest, dest_capacity, int32_t dest_length;
dest_length, u_strFromUTF8(dest, dest_capacity, &dest_length,
src, src_length, src, src_length,
&error_code); &error_code);
if (U_FAILURE(error_code)) { if (U_FAILURE(error_code)) {
@ -93,7 +94,7 @@ UCharFromUTF8(const char *src, int32_t *dest_length)
return nullptr; return nullptr;
} }
return dest; return { dest, size_t(dest_length) };
} }
#endif #endif
@ -114,15 +115,16 @@ IcuCollate(const char *a, const char *b)
#else #else
/* fall back to ucol_strcoll() */ /* fall back to ucol_strcoll() */
UChar *au = UCharFromUTF8(a, nullptr); const auto au = UCharFromUTF8(a);
UChar *bu = UCharFromUTF8(b, nullptr); const auto bu = UCharFromUTF8(b);
int result = au != nullptr && bu != nullptr int result = !au.IsNull() && !bu.IsNull()
? (int)ucol_strcoll(collator, au, -1, bu, -1) ? (int)ucol_strcoll(collator, au.data, au.size,
bu.data, bu.size)
: strcasecmp(a, b); : strcasecmp(a, b);
delete[] au; delete[] au.data;
delete[] bu; delete[] bu.data;
return result; return result;
#endif #endif
@ -141,22 +143,21 @@ IcuCaseFold(const char *src)
assert(collator != nullptr); assert(collator != nullptr);
assert(src != nullptr); assert(src != nullptr);
int32_t u_length; const auto u = UCharFromUTF8(src);
UChar *u = UCharFromUTF8(src, &u_length); if (u.IsNull())
if (u == nullptr)
return std::string(src); return std::string(src);
size_t dest_length = ucol_getSortKey(collator, u, u_length, size_t dest_length = ucol_getSortKey(collator, u.data, u.size,
nullptr, 0); nullptr, 0);
if (dest_length == 0) { if (dest_length == 0) {
delete[] u; delete[] u.data;
return std::string(src); return std::string(src);
} }
uint8_t *dest = new uint8_t[dest_length]; uint8_t *dest = new uint8_t[dest_length];
ucol_getSortKey(collator, u, u_length, ucol_getSortKey(collator, u.data, u.size,
dest, dest_length); dest, dest_length);
delete[] u; delete[] u.data;
std::string result((const char *)dest); std::string result((const char *)dest);
delete[] dest; delete[] dest;
#elif defined(HAVE_GLIB) #elif defined(HAVE_GLIB)