lib/icu/Collate: move code to Util.cxx
This commit is contained in:
Max Kellermann
parent
87c88fcb27
commit
c641ca90a9
@ -457,6 +457,7 @@ libicu_a_SOURCES = \
|
||||
|
||||
if HAVE_ICU
|
||||
libicu_a_SOURCES += \
|
||||
src/lib/icu/Util.cxx src/lib/icu/Util.hxx \
|
||||
src/lib/icu/Init.cxx src/lib/icu/Init.hxx
|
||||
endif
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
72
src/lib/icu/Util.cxx
Normal file
72
src/lib/icu/Util.cxx
Normal file
@ -0,0 +1,72 @@
|
||||
/*
|
||||
* Copyright (C) 2003-2014 The Music Player Daemon Project
|
||||
* http://www.musicpd.org
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
#include "Util.hxx"
|
||||
#include "util/WritableBuffer.hxx"
|
||||
#include "util/ConstBuffer.hxx"
|
||||
|
||||
#include <unicode/ustring.h>
|
||||
|
||||
#include <assert.h>
|
||||
#include <string.h>
|
||||
|
||||
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) };
|
||||
}
|
||||
|
||||
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) };
|
||||
}
|
||||
44
src/lib/icu/Util.hxx
Normal file
44
src/lib/icu/Util.hxx
Normal file
@ -0,0 +1,44 @@
|
||||
/*
|
||||
* Copyright (C) 2003-2014 The Music Player Daemon Project
|
||||
* http://www.musicpd.org
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#ifndef MPD_ICU_UTIL_HXX
|
||||
#define MPD_ICU_UTIL_HXX
|
||||
|
||||
#include "check.h"
|
||||
|
||||
#include <unicode/utypes.h>
|
||||
|
||||
template<typename T> struct WritableBuffer;
|
||||
template<typename T> struct ConstBuffer;
|
||||
|
||||
/**
|
||||
* Wrapper for u_strFromUTF8(). The returned pointer must be freed
|
||||
* with delete[].
|
||||
*/
|
||||
WritableBuffer<UChar>
|
||||
UCharFromUTF8(const char *src);
|
||||
|
||||
/**
|
||||
* Wrapper for u_strToUTF8(). The returned pointer must be freed with
|
||||
* delete[].
|
||||
*/
|
||||
WritableBuffer<char>
|
||||
UCharToUTF8(ConstBuffer<UChar> src);
|
||||
|
||||
#endif
|
||||
Loading…
Reference in New Issue
Block a user