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

lib/icu/Collate: move code to Util.cxx

Browse Source
This commit is contained in:
Max Kellermann
2014-11-30 10:53:05 +01:00
parent 87c88fcb27
commit c641ca90a9
4 changed files with 118 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,6 +21,7 @@
#include "Collate.hxx"
#ifdef HAVE_ICU
#include "Util.hxx"
#include "Error.hxx"
#include "util/WritableBuffer.hxx"
#include "util/ConstBuffer.hxx"
@@ -71,50 +72,6 @@ IcuCollateFinish()
ucol_close(collator);
}
static WritableBuffer<UChar>
UCharFromUTF8(const char *src)
{
assert(src != nullptr);
const size_t src_length = strlen(src);
const size_t dest_capacity = src_length;
UChar *dest = new UChar[dest_capacity];
UErrorCode error_code = U_ZERO_ERROR;
int32_t dest_length;
u_strFromUTF8(dest, dest_capacity, &dest_length,
src, src_length,
&error_code);
if (U_FAILURE(error_code)) {
delete[] dest;
return nullptr;
}
return { dest, size_t(dest_length) };
}
static WritableBuffer<char>
UCharToUTF8(ConstBuffer<UChar> src)
{
assert(!src.IsNull());
/* worst-case estimate */
size_t dest_capacity = 4 * src.size;
char *dest = new char[dest_capacity];
UErrorCode error_code = U_ZERO_ERROR;
int32_t dest_length;
u_strToUTF8(dest, dest_capacity, &dest_length, src.data, src.size,
&error_code);
if (U_FAILURE(error_code)) {
delete[] dest;
return nullptr;
}
return { dest, size_t(dest_length) };
}
#endif
gcc_pure